From 879ac8e8a5f676e168391caa98c14964ceeb4550 Mon Sep 17 00:00:00 2001
From: lishiwei <3230787218@qq.com>
Date: Mon, 29 Jun 2026 11:45:35 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E5=A4=84=E7=BD=9A=E5=8A=9F=E8=83=BD=E7=9A=84=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=92=8C=E8=AF=A6=E6=83=85=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/hidden/HiddenPenaltyAddExe.java   |  4 +-
 .../resources/mapper/HiddenPenaltyMapper.xml  | 25 +++++++++-
 .../resources/mapper/KeyProjectMapper.xml     | 48 +++++++++----------
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java
index 32811ba..397ac07 100644
--- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java
+++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java
@@ -44,8 +44,8 @@ public class HiddenPenaltyAddExe {
                     && Integer.valueOf(0).equals(target.getFeedbackStatus())
                     && Integer.valueOf(0).equals(target.getEditFlag())) {
                 HiddenPenaltyE e = new HiddenPenaltyE();
-                e.setHiddenPenaltyId(target.getHiddenPenaltyId());
                 BeanUtils.copyProperties(cmd, e);
+                e.setHiddenPenaltyId(target.getHiddenPenaltyId());
                 if (e.getPenaltyTime() == null) {
                     e.setPenaltyTime(LocalDateTime.now());
                 }
@@ -61,8 +61,8 @@ public class HiddenPenaltyAddExe {
         }
 
         HiddenPenaltyE e = new HiddenPenaltyE();
-        e.setHiddenPenaltyId(Tools.get32UUID());
         BeanUtils.copyProperties(cmd, e);
+        e.setHiddenPenaltyId(Tools.get32UUID());
         if (e.getPenaltyTime() == null) {
             e.setPenaltyTime(LocalDateTime.now());
         }
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
index 5515305..cf2676a 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
@@ -98,8 +98,29 @@
     </select>
 
     <select id="getByPenaltyId" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyDO">
-        SELECT * FROM hidden_penalty
-        WHERE hidden_penalty_id = #{hiddenPenaltyId} AND delete_enum = 'FALSE'
+        SELECT hp.*,
+               pci.corp_name AS penalized_corp_name,
+               pu.name AS penalized_user_name,
+               xci.corp_name AS xgf_corpinfo_name,
+               IFNULL(kp.project_name, kp2.project_name) AS project_name,
+               IFNULL(xmu.name, xmu2.name) AS xgf_master_user_name,
+               h.source AS hidden_source,
+               h.hidden_desc AS hidden_desc,
+               h.create_name AS find_user_name,
+               h.id AS hidden_table_id,
+               h.foreign_key AS foreign_key
+        FROM hidden_penalty hp
+        LEFT JOIN hidden h ON hp.hidden_id = h.hidden_id AND h.delete_enum = 'FALSE'
+        LEFT JOIN safety_environmental_inspection i ON i.inspection_id = h.foreign_key AND h.source IN (2, 3)
+        LEFT JOIN key_project kp ON kp.key_project_id = i.key_project_id
+        LEFT JOIN ai_alarm aa ON h.foreign_key = aa.ai_alarm_id AND h.source = 1
+        LEFT JOIN key_project kp2 ON kp2.key_project_id = aa.key_project_id
+        LEFT JOIN corp_info pci ON pci.id = hp.penalized_corp_id
+        LEFT JOIN user pu ON pu.id = hp.penalized_user_id
+        LEFT JOIN corp_info xci ON xci.id = IFNULL(kp.xgf_corpinfo_id, kp2.xgf_corpinfo_id)
+        LEFT JOIN user xmu ON xmu.id = kp.xgf_master_user_id
+        LEFT JOIN user xmu2 ON xmu2.id = kp2.xgf_master_user_id
+        WHERE hp.hidden_penalty_id = #{hiddenPenaltyId} AND hp.delete_enum = 'FALSE'
     </select>
 
     <select id="feedbackListPage" resultType="com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyFeedbackDO">
diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
index 2c04b75..3e9c209 100644
--- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
@@ -13,13 +13,13 @@
         xgfci.corp_name   AS xgfCorpinfoName,
         xgfuser.name      as xgfUserName
         FROM key_project kp
-        LEFT JOIN department fpd ON kp.master_department_id = fpd.id
-        LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id
-        left join corp_info jurcorp on jurcorp.id = kp.jurisdiction_corpinfo_id
-        left join user juruser on juruser.id = kp.jurisdiction_user_id
-        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id
-        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id
-        LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id
+        LEFT JOIN department fpd ON kp.master_department_id = fpd.id AND fpd.delete_enum = 'FALSE'
+        LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id AND ci.delete_enum = 'FALSE'
+        left join corp_info jurcorp on jurcorp.id = kp.jurisdiction_corpinfo_id AND jurcorp.delete_enum = 'FALSE'
+        left join user juruser on juruser.id = kp.jurisdiction_user_id AND juruser.delete_enum = 'FALSE'
+        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id AND xgfci.delete_enum = 'FALSE'
+        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id AND xgfuser.delete_enum = 'FALSE'
+        LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id AND cp.delete_enum = 'FALSE'
         <where>
             kp.delete_enum = 'FALSE'
             <!-- projectName 模糊查询判空 -->
@@ -103,13 +103,13 @@
         count(h.hidden_id) AS uncheckHiddenCount,
         count(sei.inspection_id) AS unFinishInspectionCount
         FROM key_project kp
-        LEFT JOIN department fpd ON kp.master_department_id = fpd.id
-        LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id
-        left join corp_info jurcorp on jurcorp.id = kp.jurisdiction_corpinfo_id
-        left join user juruser on juruser.id = kp.jurisdiction_user_id
-        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id
-        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id
-        LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id
+        LEFT JOIN department fpd ON kp.master_department_id = fpd.id AND fpd.delete_enum = 'FALSE'
+        LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id AND ci.delete_enum = 'FALSE'
+        left join corp_info jurcorp on jurcorp.id = kp.jurisdiction_corpinfo_id AND jurcorp.delete_enum = 'FALSE'
+        left join user juruser on juruser.id = kp.jurisdiction_user_id AND juruser.delete_enum = 'FALSE'
+        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id AND xgfci.delete_enum = 'FALSE'
+        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id AND xgfuser.delete_enum = 'FALSE'
+        LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id AND cp.delete_enum = 'FALSE'
         left join safety_environmental_inspection sei ON kp.key_project_id = sei.key_project_id and sei.delete_enum = 'FALSE' and sei.status not in (0 ,5)
         left join hidden h on h.foreign_key = sei.inspection_id and h.delete_enum = 'FALSE' and h.state != 3
         <where>
@@ -381,13 +381,13 @@
         xgfci.corp_name   AS xgfCorpinfoName,
         xgfuser.name      as xgfUserName
         FROM key_project kp
-        LEFT JOIN department fpd ON kp.master_department_id = fpd.id
-        LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id
-        left join corp_info jurcorp on jurcorp.id = kp.jurisdiction_corpinfo_id
-        left join user juruser on juruser.id = kp.jurisdiction_user_id
-        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id
-        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id
-        LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id
+        LEFT JOIN department fpd ON kp.master_department_id = fpd.id AND fpd.delete_enum = 'FALSE'
+        LEFT JOIN department ci ON kp.jurisdiction_department_id = ci.id AND ci.delete_enum = 'FALSE'
+        left join corp_info jurcorp on jurcorp.id = kp.jurisdiction_corpinfo_id AND jurcorp.delete_enum = 'FALSE'
+        left join user juruser on juruser.id = kp.jurisdiction_user_id AND juruser.delete_enum = 'FALSE'
+        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id AND xgfci.delete_enum = 'FALSE'
+        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id AND xgfuser.delete_enum = 'FALSE'
+        LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id AND cp.delete_enum = 'FALSE'
         <where>
             kp.delete_enum = 'FALSE'
             and kp.apply_status != 0
@@ -456,7 +456,7 @@
                 AND FIND_IN_SET(#{projectType}, kp.project_type)
             </if>
         </where>
-        GROUP BY kp.key_project_id
+        GROUP BY kp.project_name
         ORDER BY kp.apply_status asc, kp.create_time DESC
     </select>
 
@@ -465,8 +465,8 @@
         kp.xgf_corpinfo_id AS xgfCorpinfoId,
         xgfuser.name       as xgfUserName
         FROM key_project kp
-        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id
-        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id
+        LEFT JOIN corp_info xgfci ON kp.xgf_corpinfo_id = xgfci.id AND xgfci.delete_enum = 'FALSE'
+        left join user xgfuser ON kp.xgf_master_user_id = xgfuser.id AND xgfuser.delete_enum = 'FALSE'
 
         <where>
             kp.delete_enum = 'FALSE'