Переглянути джерело

fix bill

release_toaliyun_real
lin 3 роки тому
джерело
коміт
3d3272c5a7
3 змінених файлів з 18 додано та 7 видалено
  1. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +10
    -5
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java Переглянути файл

@@ -152,10 +152,14 @@ public class WxBillRent extends TenantEntity {
@Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4") @Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4")
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime")
private Date starttime; private Date starttime;
@Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5") @Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime")
private Date endtime; private Date endtime;
@TableField(exist = false)
private Date endtimeBegin;
@TableField(exist = false)
private Date endtimeEnd;


@io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType")
private Integer rentShopType; private Integer rentShopType;


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Переглянути файл

@@ -3243,7 +3243,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bq.updateTenantInfo(wxRentContract); bq.updateTenantInfo(wxRentContract);
bq.setRentContractId(wxRentContract.getId()); bq.setRentContractId(wxRentContract.getId());
bq.setIsPreview(EnumIsPreview.NO.getCode()); bq.setIsPreview(EnumIsPreview.NO.getCode());
bq.setEndtime(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(-1, new Date())));
Date current = new Date();
bq.setEndtimeBegin(DateUtils.getDayBegin(DateUtils.getTimeAfterDays(-30, current)));
bq.setEndtimeEnd(current);
bq.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bq.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<WxBillRent> billList = wxBillRentMapper.findList(bq); List<WxBillRent> billList = wxBillRentMapper.findList(bq);
if (null != billList && billList.size() > 0 ) { if (null != billList && billList.size() > 0 ) {


+ 10
- 5
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Переглянути файл

@@ -97,7 +97,12 @@
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if> <if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>
<if test=" null != starttime ">and `starttime` = #{starttime}</if> <if test=" null != starttime ">and `starttime` = #{starttime}</if>
<if test=" null != endtime ">and `endtime` = #{endtime}</if> <if test=" null != endtime ">and `endtime` = #{endtime}</if>

<if test=" null != endtimeBegin ">
and endtime &gt;= #{endtimeBegin}
</if>
<if test=" null != endtimeEnd">
and endtime &lt; #{endtimeEnd}
</if>
<if test=" null != ids "> <if test=" null != ids ">
and id in and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -177,10 +182,10 @@
and `parent_tenant_id` = #{parentTenantId} and `parent_tenant_id` = #{parentTenantId}
</if> </if>
<if test=" null != startTime "> <if test=" null != startTime ">
and receive_date &gt;= #{startdate}
and receive_date &gt;= #{startTime}
</if> </if>
<if test=" null != endTime"> <if test=" null != endTime">
and receive_date &lt; #{enddate}
and receive_date &lt; #{endTime}
</if> </if>


</select> </select>
@@ -195,10 +200,10 @@
and `parent_tenant_id` = #{parentTenantId} and `parent_tenant_id` = #{parentTenantId}
</if> </if>
<if test=" null != startTime "> <if test=" null != startTime ">
and receive_date &gt;= #{startdate}
and receive_date &gt;= #{startTime}
</if> </if>
<if test=" null != endTime"> <if test=" null != endTime">
and receive_date &lt; #{enddate}
and receive_date &lt; #{endTime}
</if> </if>
</select> </select>




Завантаження…
Відмінити
Зберегти