| @@ -862,8 +862,8 @@ public class WxFinanceController extends BaseController { | |||||
| private boolean isValidPayTime(Date date,TenantEntity tenantEntity) { | private boolean isValidPayTime(Date date,TenantEntity tenantEntity) { | ||||
| WxFinanceCheckOut periodFindq = new WxFinanceCheckOut(); | WxFinanceCheckOut periodFindq = new WxFinanceCheckOut(); | ||||
| periodFindq.updateTenantInfo(tenantEntity); | periodFindq.updateTenantInfo(tenantEntity); | ||||
| periodFindq.setStartDate(date); | |||||
| periodFindq.setEndDate(date); | |||||
| periodFindq.setStartDateGt(date); | |||||
| periodFindq.setEndDateLt(date); | |||||
| List<WxFinanceCheckOut> list = wxFinanceService.getCheckOutList(periodFindq); | List<WxFinanceCheckOut> list = wxFinanceService.getCheckOutList(periodFindq); | ||||
| if (null != list && list.size() > 0 ) { | if (null != list && list.size() > 0 ) { | ||||
| return false; | return false; | ||||
| @@ -54,7 +54,11 @@ public class WxFinanceCheckOut extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "交款开始日期", name = "startDate") | @io.swagger.annotations.ApiModelProperty(value = "交款开始日期", name = "startDate") | ||||
| private Date startDate; | private Date startDate; | ||||
| @TableField(exist = false) | |||||
| private Date startDateGt; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "交款结束日期", name = "endDate") | @io.swagger.annotations.ApiModelProperty(value = "交款结束日期", name = "endDate") | ||||
| private Date endDate; | private Date endDate; | ||||
| @TableField(exist = false) | |||||
| private Date endDateLt; | |||||
| } | } | ||||
| @@ -41,7 +41,9 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != createBy ">and `create_by` = #{createBy}</if> | <if test=" null != createBy ">and `create_by` = #{createBy}</if> | ||||
| <if test=" null != startDate ">and `start_date` >= #{startDate}</if> | <if test=" null != startDate ">and `start_date` >= #{startDate}</if> | ||||
| <if test=" null != startDateGt ">and `start_date` <= #{startDateGt}</if> | |||||
| <if test=" null != endDate ">and `end_date` <= #{endDate}</if> | <if test=" null != endDate ">and `end_date` <= #{endDate}</if> | ||||
| <if test=" null != endDateLt ">and `end_date` >= #{endDateLt}</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=")"> | ||||