diff --git a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java
index 2830a09d..5f102579 100644
--- a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java
@@ -113,6 +113,12 @@ public class GFBlindBoardController 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 = GFblindboardService.list(page);	//列出BlindBoard列表
 		map.put("varList", varList);
diff --git a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java
index 2feedaee..fa52aa34 100644
--- a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java
@@ -110,6 +110,12 @@ public class GFBreakGroundController 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 = GFbreakgroundService.list(page);	//列出BreakGround列表
 		map.put("varList", varList);
diff --git a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java
index e522fb8c..26fbf7b7 100644
--- a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java
@@ -126,6 +126,12 @@ public class GFConfinedSpaceController 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 = GFconfinedspaceService.list(page);	//列出ConfinedSpace列表
 		map.put("varList", varList);
diff --git a/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java
index 8da9ce89..6c675744 100644
--- a/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFCutRoadController.java
@@ -118,6 +118,12 @@ public class GFCutRoadController 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 = GFcutroadService.list(page);    //列出CutRoad列表
         map.put("varList", varList);
diff --git a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java
index d1a3cc5f..b476b36a 100644
--- a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java
@@ -110,6 +110,12 @@ public class GFHighWorkController 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 = GFhighworkService.list(page);	//列出HighWork列表
 		map.put("varList", varList);
diff --git a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java
index 8ac0d335..c9e46ce9 100644
--- a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java
+++ b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java
@@ -110,6 +110,12 @@ public class GFHoistingController 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 = GFhoistingService.list(page);	//列出Hoisting列表
 		map.put("varList", varList);
diff --git a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
index da5034b2..bcd78ef3 100644
--- a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml
@@ -608,6 +608,15 @@
 		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
 			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
 		</if>
+		<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+			and f.CONSTRUCTION_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 != ''">
diff --git a/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml b/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml
index 39018c32..b2ceb15d 100644
--- a/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml
@@ -617,6 +617,15 @@
 		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
 			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
 		</if>
+		<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+			and f.CONSTRUCTION_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 != ''">
diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml
index fe3e59d0..3947cd27 100644
--- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml
@@ -746,6 +746,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 != ''">
diff --git a/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml b/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml
index fa60e7f9..f40ebade 100644
--- a/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml
@@ -629,6 +629,15 @@
 		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
 			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
 		</if>
+		<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+			and f.CONSTRUCTION_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 != ''">
diff --git a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
index bb0f4711..2b582fc0 100644
--- a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
@@ -641,6 +641,15 @@
         <if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
             and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
         </if>
+        <if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+            and f.CONSTRUCTION_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 != ''">
diff --git a/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml b/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml
index 4a4658d6..a121d338 100644
--- a/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml
@@ -616,6 +616,15 @@
 		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
 			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
 		</if>
+		<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+			and f.CONSTRUCTION_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 != ''">