From 9dd0fa9b078052b6df604ca8f0af0e557cb70744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 2 Jul 2024 00:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jh/trouble/domain/vo/SmzSspProblemmodifyExport.java   | 8 ++++----
 .../mapper/trouble/SmzSspProblemmodifyMapper.xml          | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
index ef41ea26..f4d0532f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
@@ -31,19 +31,19 @@ public class SmzSspProblemmodifyExport {
     @Excel(name = "整改截至时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss")
     private Date nickedTime;
 
-    @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =30)
+    @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =20)
     private String lordSent;
 
-    @Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =30)
+    @Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =20)
     private String lordSentDeptType;
 
     @Excel(name = "流程状态")
     private String checkState;
 
-    @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =30)
+    @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =20)
     private String recheckSend;
 
-    @Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =30)
+    @Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =20)
     private String recheckSendDeptType;
 
     @Excel(name = "抄送人",align= HorizontalAlignment.LEFT,width =30)
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index aa614e45..e90b4bb5 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -788,7 +788,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSmzSspProblemmodifyListAndUnitName" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
         select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type,
         ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.createBy, ssp.problemType,
-        sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel
+        sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel,
+        zgd.type_flag as zgDeptType,
+        fjd.type_flag as fjDeptType
         from (
         SELECT c.*,a.dict_label dangerLabel,b.dict_label chkLabel FROM
         vw_smz_ssp_problemmodify_audit c,sys_dict_data a,sys_dict_data b WHERE c.danger_Type=a.dict_value
@@ -801,6 +803,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT p.dept_Name,p.dept_id,u.phonenumber
         FROM sys_user u,sur_project_userinfo p WHERE p.is_del=0 and u.user_id=p.user_id AND p.dept_type=2
         ) sp on ssp.lordSentUser = sp.phonenumber
+        left join sys_user zgu on zgu.phonenumber = ssp.lordSentUser
+        left join sys_dept zgd on zgd.dept_id = zgu.dept_id
+        left join sys_user fju on fju.phonenumber = ssp.recheckSendUser
+        left join sys_dept fjd on fjd.dept_id = fju.dept_id
         <!--监理单位/总包公司/分包单位-->
         <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = ssp.projectId</if>
         <where>