From a4e65f049f9acc4da3252551614babf3040e27dd Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Wed, 22 Nov 2023 14:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E5=8F=B0=E8=B4=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/HotWorkApplicationController.java         |  2 ++
 .../highriskwork/HotWorkApplicationMapper.xml     | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
index 9622785c..49fedbd9 100644
--- a/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
+++ b/src/main/java/com/zcloud/controller/bus/HotWorkApplicationController.java
@@ -1311,6 +1311,8 @@ public class HotWorkApplicationController extends BaseController {
 					hot.put("PROJECT_UNIT_LEADER_NAME",userPageData.getString("userName"));
 					hot.put("PROJECT_UNIT_LEADER_ID",userPageData.getString("USER_ID"));
 				}else if("4".equals(type)){ // 现场管辖单位负责人
+					hot.put("UNIT_LEADER_DEPARTMENT_ID",userPageData.getString("DEPARTMENT_ID"));
+					hot.put("UNIT_LEADER_DEPARTMENT_NAME",userPageData.getString("deptName"));
 					hot.put("UNIT_LEADER_NAME",userPageData.getString("userName"));
 					hot.put("UNIT_LEADER_ID",userPageData.getString("USER_ID"));
 				}else if("5".equals(type)){ // 动火前 负责人
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
index bbdcd6ca..65fe920e 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
@@ -321,6 +321,9 @@
 		left join vi_user_all ua on ua.USER_ID = f.OPERATOR
 		LEFT JOIN bus_hotworkapplicationuser bhu ON bhu.FOREIGN_KEY = f.HOTWORKAPPLICATION_ID
 		LEFT JOIN vi_user_all bhuuser ON bhuuser.USER_ID = bhu.USER_ID
+		left join bus_hotworkapplicationuser hot on f.HOTWORKAPPLICATION_ID = hot.FOREIGN_KEY and hot.ISDELETE ='0' and hot.state='4'
+		left join sys_user hu on hot.USER_ID = hu.USER_ID
+		left join oa_department hd on hd.DEPARTMENT_ID = hu.DEPARTMENT_ID
 		where f.ISDELETE = '0'
 		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
 			and	f.CORPINFO_ID = #{pd.CORPINFO_ID}
@@ -342,6 +345,18 @@
 		<if test="pd.keyJobNumber != null and pd.keyJobNumber != ''">
 			and (f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.keyJobNumber}),'%'))
 		</if>
+		<if test="pd.JOB_CONTENT != null and pd.JOB_CONTENT != ''">
+			and f.JOB_CONTENT LIKE CONCAT(CONCAT('%', #{pd.JOB_CONTENT}),'%')
+		</if>
+		<if test="pd.HOT_WORK_POSITION != null and pd.HOT_WORK_POSITION != ''">
+			and f.HOT_WORK_POSITION LIKE CONCAT(CONCAT('%', #{pd.HOT_WORK_POSITION}),'%')
+		</if>
+		<if test="pd.HOT_WORK_LEVEL_INDEX != null and pd.HOT_WORK_LEVEL_INDEX != ''">
+			and f.HOT_WORK_LEVEL_INDEX =  #{pd.HOT_WORK_LEVEL_INDEX}
+		</if>
+		<if test="pd.UNIT_LEADER_DEPARTMENT_ID != null and pd.UNIT_LEADER_DEPARTMENT_ID != ''">
+			and hd.DEPARTMENT_ID =  #{pd.UNIT_LEADER_DEPARTMENT_ID}
+		</if>
 		<if test="pd.keyState != null and pd.keyState != ''">
 			and	f.STATE = #{pd.keyState}
 		</if>