Просмотр исходного кода

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
e3953e7761
3 измененных файлов: 16 добавлений и 1 удалений
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java
  3. +10
    -0
      mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java Просмотреть файл

@@ -77,4 +77,10 @@ public class WxBillSettle extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "结单记录", name = "settleRecordList")
private List<WxBillSettleRecord> settleRecordList;

@Transient
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime;
@Transient
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime;
}

+ 0
- 1
mallinkService/src/main/java/com/iformall/service/WxBillSettleService.java Просмотреть файл

@@ -14,7 +14,6 @@ import java.util.List;
* @author luozukai
*/
public interface WxBillSettleService {

/**
* 根据实体查询分页列表
*


+ 10
- 0
mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml Просмотреть файл

@@ -26,6 +26,16 @@
where 1=1
<if test=" null != id ">and s.`id` = #{id}</if>
<if test=" null != tenantId ">and s.`tenant_id` = #{tenantId}</if>
<if test=" null != merchantName ">and m.name like concat('%', #{merchantName},'%')</if>
<if test="startTime != null">
and day_date &gt;= #{startTime}
</if>
<if test="endTime != null">
and day_date &lt;= #{endTime}
</if>
<if test=" null != settleNumber ">and s.`settle_number` = #{settleNumber}</if>
<if test=" null != status ">and s.`status` = #{status}</if>
<if test=" null != apply_status ">and s.`apply_status` = #{applyStatus}</if>

<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>


Загрузка…
Отмена
Сохранить