diff --git a/src/main/java/cn/palmte/work/service/MonthlySettleService.java b/src/main/java/cn/palmte/work/service/MonthlySettleService.java index e7fa14d..5489750 100644 --- a/src/main/java/cn/palmte/work/service/MonthlySettleService.java +++ b/src/main/java/cn/palmte/work/service/MonthlySettleService.java @@ -351,11 +351,11 @@ public class MonthlySettleService { } if(StrUtil.isNotEmpty(searchInfo.get("contractStartTime"))){ String time = searchInfo.get("contractStartTime") + " 00:00:00"; - queryHelper.addCondition("s.contract_time>=?", time); + queryHelper.addCondition("s.contract_sign_time>=?", time); } if(StrUtil.isNotEmpty(searchInfo.get("contractEndTime"))){ String time = searchInfo.get("contractEndTime") + " 23:59:59"; - queryHelper.addCondition("s.contract_time<=?", time); + queryHelper.addCondition("s.contract_sign_time<=?", time); } queryHelper.addDescOrderProperty("s.id"); diff --git a/src/main/resources/templates/admin/monthly_settle_list.ftl b/src/main/resources/templates/admin/monthly_settle_list.ftl index 4850281..1872525 100644 --- a/src/main/resources/templates/admin/monthly_settle_list.ftl +++ b/src/main/resources/templates/admin/monthly_settle_list.ftl @@ -125,7 +125,7 @@