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

---
 .../zcloud/controller/gf/GFElectricityController.java    | 6 ++++++
 .../mybatis/datasource/gf/ElectricityMapper.xml          | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java
index f72adb57..ecd5f58b 100644
--- a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java
@@ -112,6 +112,12 @@ public class GFElectricityController extends BaseController {
 			String DEPT_IDS[] = DEPTIDS.split(",");
 			pd.put("DEPT_IDS", DEPT_IDS);
 		}
+		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 = GFelectricityService.list(page);	//列出Electricity列表
 		map.put("varList", varList);
diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
index ab53bbf7..02033e98 100644
--- a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml
@@ -744,6 +744,15 @@
 		<if test="pd.ANALYZE_USER_ID != null and pd.ANALYZE_USER_ID != ''">
 			and f.ANALYZE_USER_ID = #{pd.ANALYZE_USER_ID}
 		</if>
+		<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+			and f.APPLY_DEPARTMENT_ID = #{pd.UNIT_LEADER_DEPARTMENT_ID}
+		</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>
 		<choose>
 			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
 				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">