From acb1c9a5a2794f05fda3fdeb1ff3730a39187500 Mon Sep 17 00:00:00 2001
From: zhangqihang <zhangqihang>
Date: Fri, 23 Feb 2024 18:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/controller/hidden/HiddenController.java  |  3 +++
 .../app/AppKeyprojectCheckController.java           |  1 +
 .../controller/system/AppImgFilesController.java    |  2 +-
 .../com/zcloud/entity/hotWorkApplication/Node.java  |  6 +++++-
 .../mybatis/datasource/hidden/HiddenMapper.xml      |  3 +++
 .../keyProjects/KeyprojectHiddenMapper.xml          | 13 ++++++-------
 .../keyProjects/KeyprojectPunishMapper.xml          |  6 ++++--
 .../mybatis/datasource/relatedparty/UnitsMapper.xml |  2 +-
 .../safetyMeeting/SafetyMeetingMapper.xml           |  6 +++---
 .../specialoperation/PersonnelManagementMapper.xml  |  4 ++--
 10 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/hidden/HiddenController.java b/src/main/java/com/zcloud/controller/hidden/HiddenController.java
index 826e2e7..80fc098 100644
--- a/src/main/java/com/zcloud/controller/hidden/HiddenController.java
+++ b/src/main/java/com/zcloud/controller/hidden/HiddenController.java
@@ -1969,6 +1969,9 @@ public class HiddenController extends BaseController {
         if ("-2".equals(pd.getString("HIDDEN_STATUS"))) {
             pd.put("ISCONFIRM", "0"); //
             pd.put("CONFIRM_TIME", DateUtil.date2Str(new Date()));
+			pd.put("CONFIRM_USER", Jurisdiction.getUSER_ID());
+			pd.put("STATE","1");
+			pd.put("RECTIFICATIONTYPE","2");
             if (list.size() == 0) {
                 inspection.put("INSPECTION_STATUS", "5");    // 指派完成
             } else {
diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
index 454fc5a..b909250 100644
--- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
+++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
@@ -132,6 +132,7 @@ public class AppKeyprojectCheckController extends BaseController {
 				hidden.put("RECTIFYDESCR", json.getString("RECTIFYDESCR"));    //整改描述
 				hidden.put("RECTIFICATIONDEPT", json.getString("RECTIFICATIONDEPT"));    //整改部门
 				hidden.put("RECTIFICATIONOR", json.getString("RECTIFICATIONOR"));    //整改人
+				hidden.put("HIDDENTYPE_NAME", json.getString("HIDDENTYPE_NAME"));    //整改人
 				hidden.put("CREATOR", pd.getString("CREATOR"));    //发现人（隐患责任人）
 				hidden.put("SOURCE", json.getString("SOURCE"));    //隐患来源
 				hidden.put("STATE", "1");    //隐患状态 100-安全环保检查暂存的隐患（流程完转0）
diff --git a/src/main/java/com/zcloud/controller/system/AppImgFilesController.java b/src/main/java/com/zcloud/controller/system/AppImgFilesController.java
index a01384c..b1ff3f6 100644
--- a/src/main/java/com/zcloud/controller/system/AppImgFilesController.java
+++ b/src/main/java/com/zcloud/controller/system/AppImgFilesController.java
@@ -88,7 +88,7 @@ public class AppImgFilesController extends BaseController {
         		String  ffile = DateUtil.getDays();
 //        		String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile;	//文件上传路径
 //        		String fileName = FileUpload.fileUp(file, filePath, this.get32UUID());				//执行上传
-        		String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+        		String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
         		smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
 
         		pd.put("IMGFILES_ID",  this.get32UUID());
diff --git a/src/main/java/com/zcloud/entity/hotWorkApplication/Node.java b/src/main/java/com/zcloud/entity/hotWorkApplication/Node.java
index 24abed2..56226f3 100644
--- a/src/main/java/com/zcloud/entity/hotWorkApplication/Node.java
+++ b/src/main/java/com/zcloud/entity/hotWorkApplication/Node.java
@@ -51,7 +51,11 @@ public class Node {
             case "2":
                 break;
             case "3":
-                this.text = this.text + "<br>被检查人:" + information.getString("INSPECTED_SITEUSER_NAME") + "<br/>(" + information.getString("INSPECTED_SITEUSER_SIGN_TIME") + ")";
+                if (StringUtils.isNotBlank(information.getString("INSPECTED_SITEUSER_SIGN_TIME"))) {
+                    this.text = this.text + "<br>被检查人:" + information.getString("INSPECTED_SITEUSER_NAME") + "<br/>(" + information.getString("INSPECTED_SITEUSER_SIGN_TIME") + ")";
+                } else {
+                    this.text = this.text + "<br>被检查人:" + information.getString("INSPECTED_SITEUSER_NAME");
+                }
                 break;
             case "4":
                 break;
diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
index ad73e84..1c8eb8e 100644
--- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
@@ -2557,6 +2557,9 @@
 		CHECKDEPT = #{CHECKDEPT},
 		CHECKOR = #{CHECKOR},
 		HIDDEN_ID = HIDDEN_ID
+		<if test="RECTIFICATIONTYPE != null and RECTIFICATIONTYPE != ''">
+			,RECTIFICATIONTYPE = #{RECTIFICATIONTYPE}
+		</if>
 		where
 		HIDDEN_ID = #{HIDDEN_ID}
 	</update>
diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
index 6ac38f8..e55fdc4 100644
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml
@@ -65,7 +65,8 @@
 		f.FINAL_CHECKDESCR,
 		f.ISRELEVANT,
 		f.ISPUNISH,
-		f.POSITIONDESC
+		f.POSITIONDESC,
+		f.HIDDENTYPE_NAME
 	</sql>
 
 	<!-- 字段用于新增 -->
@@ -121,7 +122,8 @@
 		FINAL_CHECKOR,
 		FINAL_CHECKTIME,
 		FINAL_CHECKDESCR,
-		POSITIONDESC
+		POSITIONDESC,
+		HIDDENTYPE_NAME
 	</sql>
 
 	<!-- 字段值 -->
@@ -177,7 +179,8 @@
 		#{FINAL_CHECKOR},
 		#{FINAL_CHECKTIME},
 		#{FINAL_CHECKDESCR},
-		#{POSITIONDESC}
+		#{POSITIONDESC},
+		#{HIDDENTYPE_NAME}
 	</sql>
 
 	<!-- 新增-->
@@ -287,7 +290,6 @@
 		f.*,
 		hr.HIDDENREGION HIDDENPART_NAME,
 		lv.NAME HIDDENLEVEL_NAME,
-		ht.NAME HIDDENTYPE_NAME,
 		ht2.NAME HIDDENTYPE2_NAME,
 		crd.NAME HIDDENFINDDEPT_NAME,
 		cr.NAME CREATOR_NAME,
@@ -313,7 +315,6 @@
 		f.*,
 		hr.HIDDENREGION HIDDENPART_NAME,
 		lv.NAME HIDDENLEVEL_NAME,
-		ht.NAME HIDDENTYPE_NAME,
 		ht2.NAME HIDDENTYPE2_NAME,
 		crd.NAME HIDDENFINDDEPT_NAME,
 		cr.NAME CREATOR_NAME,
@@ -1123,7 +1124,6 @@
 		f.*,
 		hr.HIDDENREGION HIDDENPART_NAME,
 		lv.NAME HIDDENLEVEL_NAME,
-		ht.NAME HIDDENTYPE_NAME,
 		ht2.NAME HIDDENTYPE2_NAME,
 		crd.NAME HIDDENFINDDEPT_NAME,
 		cr.NAME CREATOR_NAME,
@@ -1637,7 +1637,6 @@
 		f.*,
 		hr.HIDDENREGION HIDDENPART_NAME,
 		lv.NAME HIDDENLEVEL_NAME,
-		ht.NAME HIDDENTYPE_NAME,
 		ht2.NAME HIDDENTYPE2_NAME,
 		crd.NAME HIDDENFINDDEPT_NAME,
 		cr.NAME CREATOR_NAME,
diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
index 6b1d2fa..b600351 100644
--- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
+++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml
@@ -137,7 +137,7 @@
 		<include refid="Field"></include>,
 		cr.NAME CREATOR_NAME,
 		cre.NAME CREATOR_NAMES,
-		o.OUTSOURCED_NAME,
+		bo.OUTSOURCED_NAME,
 		u.UNITS_NAME,
 		p.NAME AS PERSON_NAME
 		from
@@ -145,7 +145,9 @@
 		left join vi_user_all cr on cr.USER_ID = f.CREATOR
 		left join sys_user cre on cre.USER_ID = f.CREATOR
 		left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
-		left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
+		left join bus_keyproject_hidden h on f.HIDDEN_ID = h.HIDDEN_ID
+		LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = h.FOREIGN_ID or  h.FOREIGN_ID = ch.KEYPROJECTCHECK_ID
+		LEFT JOIN BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
 		left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
 		where
 		<if test="KEYPROJECTPUNISH_ID != null and KEYPROJECTPUNISH_ID != ''"><!-- 关键词检索 -->
diff --git a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml
index 30d1958..d03b723 100644
--- a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml
+++ b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml
@@ -218,7 +218,7 @@
 		<include refid="tableName"></include> f
 		LEFT JOIN sys_user u on f.CREATOR = u.USERNAME
 		LEFT JOIN bus_corp_info c on u.CORPINFO_ID = c.CORPINFO_ID
-		where f.ISDELETE = '0'
+		where f.ISDELETE = '0' and u.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 				(
diff --git a/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml b/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml
index 974f354..dba26be 100644
--- a/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml
+++ b/src/main/resources/mybatis/datasource/safetyMeeting/SafetyMeetingMapper.xml
@@ -88,7 +88,7 @@
     <select id="datalistPage" resultType="com.zcloud.entity.PageData">
         SELECT
         t.*,
-        COUNT(distinct p.SAFETY_MEETING_ID) ALL_SIGNATURES,
+        (select count(*) from safety_meeting_people m where m.SAFETY_MEETING_ID = t.SAFETY_MEETING_ID and m.ISDELETE = 0) ALL_SIGNATURES,
         COUNT(distinct p.FEED_BACK) SIGNATURES,
         GROUP_CONCAT( distinct i.FILEPATH ) imgs
         FROM
@@ -96,8 +96,8 @@
         LEFT JOIN bus_imgfiles i ON t.SAFETY_MEETING_ID = i.FOREIGN_KEY
         LEFT JOIN safety_meeting_people p ON t.SAFETY_MEETING_ID = p.SAFETY_MEETING_ID and p.ISDELETE = 0
         where t.ISDELETE = '0' and t.CORPINFO_ID = #{pd.CORPINFO_ID}
-        <if test="pd.SAFETY_MEETING_TITLE != null and pd.SAFETY_MEETING_TITLE != ''">
-            and t.SAFETY_MEETING_TITLE like '%${pd.SAFETY_MEETING_TITLE}%'
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
+            and t.SAFETY_MEETING_TITLE like '%${pd.KEYWORDS}%'
         </if>
         GROUP BY
         t.SAFETY_MEETING_ID
diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
index 12a7b04..8c9df27 100644
--- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
+++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
@@ -189,9 +189,9 @@
 		left join sys_dictionaries o on o.DICTIONARIES_ID = f.OPERATIONITEM
 		left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
 		left join bus_units r on r.UNITS_ID = f.UNITS_ID
-		LEFT JOIN sys_user u on f.CREATOR = u.USERNAME
+		LEFT JOIN sys_user u on f.CREATOR = u.USERNAME and u.ISDELETE = '0'
 		LEFT JOIN bus_corp_info c on u.CORPINFO_ID = c.CORPINFO_ID
-		where f.ISDELETE = '0'
+		where f.ISDELETE = '0' and u.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
 				(