From d1945601d71ecef0a84cfc6710f5633650c86891 Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Thu, 16 Jul 2026 10:18:58 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E9=87=8D=E7=82=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E7=9B=B8=E5=85=B3=E6=96=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2,=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BE=85=E9=AA=8C=E6=94=B6=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91,=E8=A1=A5=E5=85=85=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E4=B8=8E=E7=99=BB=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/hidden/HiddenAcceptRecordUpdateExe.java | 7 +++++-- .../command/query/project/KeyProjectQueryExe.java | 2 +- .../src/main/resources/mapper/HiddenPenaltyMapper.xml | 9 +++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java index 79dee9c..11e2ddf 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java @@ -90,10 +90,13 @@ public class HiddenAcceptRecordUpdateExe { stateList.add(4); Long count = hiddenRepository.countByForeignKey(cmd.getForeignKey(), stateList); if (count == 0) { - // 修改安全环保检查隐患验收操作记录为完成 + // 修改安全环保检查隐患验收操作记录为完成（使用发起人user_id，因为type=8记录是按发起人创建的） + List initiatorList = + safetyEnvironmentalInspectionUserRepository.listAllByInspectionId(cmd.getForeignKey(), 1); SafetyEnvironmentalInspectionUserDO inspectionUserDO = new SafetyEnvironmentalInspectionUserDO(); inspectionUserDO.setInspectionId(cmd.getForeignKey()); - inspectionUserDO.setUserId(ssoUser.getUserId()); + inspectionUserDO.setUserId(initiatorList != null && !initiatorList.isEmpty() + ? initiatorList.get(0).getUserId() : ssoUser.getUserId()); inspectionUserDO.setType(8); inspectionUserDO.setStatus(1); inspectionUserDO.setSignatureTime(LocalDateTime.now()); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index 31b51b0..67eca11 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -251,7 +251,7 @@ public class KeyProjectQueryExe { queryWrapper.eq("delete_enum", "FALSE"); queryWrapper.in("state",2); queryWrapper.inSql("hidden_id", "SELECT hidden_id FROM hidden_find_user WHERE find_user_id = " + id + " AND delete_enum = 'FALSE'"); - queryWrapper.apply("(source NOT IN (2, 3) OR EXISTS (SELECT 1 FROM safety_environmental_inspection sei WHERE sei.inspection_id = hidden.foreign_key AND sei.status = 3))"); + queryWrapper.apply("(source NOT IN (2, 3) OR EXISTS (SELECT 1 FROM safety_environmental_inspection sei WHERE sei.inspection_id = hidden.foreign_key AND sei.delete_enum = 'FALSE' AND sei.status != 0))"); Long yhdysCount = hiddenRepository.count(queryWrapper); diff --git a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml index 909ee34..0a39c00 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml @@ -22,6 +22,15 @@ 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 + AND kp.id = ( + SELECT id + FROM key_project kp_inner + WHERE kp_inner.key_project_id = i.key_project_id + AND kp_inner.delete_enum = 'FALSE' + AND kp_inner.xgf_corpinfo_id IS NOT NULL + ORDER BY apply_status DESC, update_time DESC + LIMIT 1 + ) 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