Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

2024/12/13 增加筛选条件
2024-12-17 09:10:36 +08:00 · 2024-12-13 17:56:17 +08:00 · 2024-12-13 17:53:34 +08:00 · 2024-12-13 16:29:48 +08:00 · 2024-12-13 15:41:12 +08:00 · 2024-12-13 15:10:34 +08:00
19 changed files with 130 additions and 1 deletions
--- 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<>();
--- a/src/main/java/com/zcloud/controller/bus/ListManagerController.java
+++ b/src/main/java/com/zcloud/controller/bus/ListManagerController.java
@ -937,14 +937,20 @@ public class ListManagerController extends BaseController {
 		pd = this.getPageData();
 		String NAME = "";
 		String KEYWORDS = "";
+		String LEVELID = "";
 		if(Tools.notEmpty(pd.getString("USERNAME"))){
 			NAME = pd.getString("USERNAME");
-		}if(Tools.notEmpty(pd.getString("KEYWORDS"))){
+		}
+		if(Tools.notEmpty(pd.getString("KEYWORDS"))){
 			KEYWORDS = pd.getString("KEYWORDS");
 		}
+		if(Tools.notEmpty(pd.getString("LEVELID"))){
+			LEVELID = pd.getString("LEVELID");
+		}
 		pd = listmanagerService.findById(pd);	//根据ID读取
 		pd.put("USERNAME",NAME); //用于清单编辑时查询功能
 		pd.put("KEYWORDS",KEYWORDS);
+		pd.put("LEVELID",LEVELID);
 		List<PageData>	varList = listcheckitemService.listAll(pd);
 		for (PageData item : varList) {
 			item.put("RECORDITEM_ID", this.get32UUID());	//主键
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- 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);
--- a/src/main/resources/mybatis/datasource/bus/ListCheckItemMapper.xml
+++ b/src/main/resources/mybatis/datasource/bus/ListCheckItemMapper.xml
@ -188,6 +188,9 @@
 			chi.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
 			)
 		</if>
+		<if test="LEVELID != null and LEVELID != ''"><!-- 风险级别 -->
+			and d5.BIANMA LIKE CONCAT(CONCAT('%', #{LEVELID}),'%')
+		</if>
 		ORDER by   un.RISKUNITNAME ,id.PARTSNAME,f.CREATTIME desc
 -- 		order by f.LISTMANAGER_ID desc
 	</select>
--- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
@ -126,6 +126,9 @@
        <if test="pd.FIRE_POINT_NAME != null and pd.FIRE_POINT_NAME !='' ">
            and fp.FIRE_POINT_NAME like concat('%',#{pd.FIRE_POINT_NAME},'%')
        </if>
+        <if test="pd.DEPARTMENTNAME != null and pd.DEPARTMENTNAME !='' ">
+            and d.`NAME` like concat('%',#{pd.DEPARTMENTNAME},'%')
+        </if>
        ORDER BY
        fr.FIRE_REGION_ID,fr.CREATTIME,fp.FIRE_POINT_ID,fp.CREATTIME,fd.FIRE_DEVICE_TYPE_ID,fd.CREATTIME, fd.OPERATTIME
        DESC
--- 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 != ''">
--- 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 != ''">
--- 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 != ''">
--- 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 != ''">
--- 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 != ''">
--- 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 != ''">
--- 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 != ''">
--- 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，起别名叫排序时间 -->
Author	SHA1	Message	Date
zhaohongyu	f41ce2512e	Merge remote-tracking branch 'origin/0205cmt' into 0205cmt	2024-12-17 09:10:36 +08:00
zhaohongyu	a9e8d3b090	2024/12/13 增加筛选条件	2024-12-13 17:56:17 +08:00
zhaohongyu	1f0083d851	2024/12/13 增加筛选条件	2024-12-13 17:53:34 +08:00
zhaohongyu	ef22ca6c04	2024/12/13 动火增加时间筛选	2024-12-13 16:29:48 +08:00
zhaohongyu	82e9cd2d33	2024/12/13 在添加消防设备栏添加负责部门选项或者搜索部门关键词	2024-12-13 15:41:12 +08:00
zhaohongyu	e4aaa14a6a	2024/12/13 曹煤炭清单管理增加隐患级别搜索条件	2024-12-13 15:10:34 +08:00