From d033ccfa6a82f76940d2b5be30667fa9e5aa5793 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 19 Aug 2022 18:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E7=BB=93=E7=AE=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/service/MonthlySettleService.java     | 4 ++--
 src/main/resources/templates/admin/monthly_settle_list.ftl    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@
                                 <div align='right'>
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn" onclick="sub_function('query')">搜索
-                                    </button>F
+                                    </button>
                                     <@shiro.hasPermission name="MONTHLY_SETTLE_EXPORT">
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn-export" onclick="sub_function('export')">导出