From ef22ca6c04157cce0588932daf13b671fe5c444a Mon Sep 17 00:00:00 2001
From: zhaohongyu <aosodo_4812@163.com>
Date: Fri, 13 Dec 2024 16:29:48 +0800
Subject: [PATCH] =?UTF-8?q?2024/12/13=20=E5=8A=A8=E7=81=AB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/controller/bus/HotWorkApplicationController.java | 6 ++++++
 .../datasource/highriskwork/HotWorkApplicationMapper.xml    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
index e8c88f59..8ead4ce7 100644
--- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
+++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
@@ -2243,6 +2243,12 @@ public class HotWorkApplicationController extends BaseController {
 		pd.put("CREATOR", Jurisdiction.getUSER_ID());
 		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//企业ID
 		pd = Jurisdiction.getUserDataJurisdiction(pd);
+		String STARTTIME = pd.getString("STARTTIME"); // 关键词检索条件
+		if (Tools.notEmpty(STARTTIME))
+			pd.put("STARTTIME", STARTTIME.trim());
+		String ENDTIME = pd.getString("ENDTIME"); // 关键词检索条件
+		if (Tools.notEmpty(ENDTIME))
+			pd.put("ENDTIME", ENDTIME + " 23:59:59");
 		page.setPd(pd);
 		List<PageData>	varList = hotworkapplicationService.hotworkdatalistPage(page);	//列出HotWorkApplication列表
 		Map<String,Integer> hotIdKeyMap = new HashMap<>();
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
index 3a445f73..a469d803 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
@@ -393,6 +393,12 @@
 		<if test="pd.keyState != null and pd.keyState != ''">
 			and	f.STATE = #{pd.keyState}
 		</if>
+		<if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 关键词检索 -->
+			and f.CREATTIME >= #{pd.STARTTIME}
+		</if>
+		<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
+			and f.CREATTIME &lt;= #{pd.ENDTIME}
+		</if>
 		GROUP BY HOTWORKAPPLICATION_ID
 		ORDER BY
 		fu.OPERATTIME DESC <!-- 前台的排序时间查的是hotuser表里的OPERATTIME，起别名叫排序时间 -->