ソースを参照

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

release_toaliyun_real
luozukai 6年前
コミット
0ce0c24184
2個のファイルの変更9行の追加8行の削除
  1. +5
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java
  2. +4
    -4
      mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml

+ 5
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java ファイルの表示

@@ -77,12 +77,13 @@ 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;
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
private Date starttime;
@Transient
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endTime;
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
private Date endtime;

@Transient
@io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay")


+ 4
- 4
mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml ファイルの表示

@@ -27,11 +27,11 @@
<if test=" null != id ">and tt.`id` = #{id}</if>
<if test=" null != tenantId ">and tt.`tenant_id` = #{tenantId}</if>
<if test=" null != merchantName and merchantName !='' ">and tt.merchantName like concat('%', #{merchantName},'%')</if>
<if test="startTime != null and startTime !=''">
and tt.createtime &gt;= #{startTime}
<if test="starttime != null and starttime !=''">
and tt.createtime &gt;= #{starttime}
</if>
<if test="endTime != null and endTime !=''">
and tt.createtime &lt;= #{endTime}
<if test="endtime != null and endtime !=''">
and tt.createtime &lt;= #{endtime}
</if>
<if test=" null != settleNumber and settleNumber !='' ">and tt.`settle_number` = #{settleNumber}</if>
<if test=" null != status and status !=''">and tt.`status` = #{status}</if>


読み込み中…
キャンセル
保存