From 34431d72f1f5f84dddf674e4f376d842a2653d1b Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 26 Oct 2024 23:22:10 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/market/WxFinanceController.java | 4 ++-- .../main/java/com/iformall/domain/po/WxFinanceCheckOut.java | 4 ++++ .../src/main/resources/mapper/WxFinanceCheckOutMapper.xml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 296ad3ded..691933346 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -862,8 +862,8 @@ public class WxFinanceController extends BaseController { private boolean isValidPayTime(Date date,TenantEntity tenantEntity) { WxFinanceCheckOut periodFindq = new WxFinanceCheckOut(); periodFindq.updateTenantInfo(tenantEntity); - periodFindq.setStartDate(date); - periodFindq.setEndDate(date); + periodFindq.setStartDateGt(date); + periodFindq.setEndDateLt(date); List list = wxFinanceService.getCheckOutList(periodFindq); if (null != list && list.size() > 0 ) { return false; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceCheckOut.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceCheckOut.java index 0ee759650..cf47667c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceCheckOut.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceCheckOut.java @@ -54,7 +54,11 @@ public class WxFinanceCheckOut extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "交款开始日期", name = "startDate") private Date startDate; + @TableField(exist = false) + private Date startDateGt; @io.swagger.annotations.ApiModelProperty(value = "交款结束日期", name = "endDate") private Date endDate; + @TableField(exist = false) + private Date endDateLt; } diff --git a/mallinkService/src/main/resources/mapper/WxFinanceCheckOutMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceCheckOutMapper.xml index 746fd7135..50528f449 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceCheckOutMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceCheckOutMapper.xml @@ -41,7 +41,9 @@ and `create_by` = #{createBy} and `start_date` >= #{startDate} + and `start_date` <= #{startDateGt} and `end_date` <= #{endDate} + and `end_date` >= #{endDateLt} and id in