From 4a7f1229d98288c84f6922cb93cc947d6c4c3cd9 Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Fri, 24 Jul 2026 11:09:48 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E9=87=8D=E7=82=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=AB=AF=E7=94=B3=E8=AF=B7=E5=92=8C?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=A0=B8=E6=9F=A5=E6=A0=B8=E5=AE=9E?= =?UTF-8?q?=E8=A7=92=E6=A0=87=E4=B8=8E=E5=88=97=E8=A1=A8=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/project/KeyProjectQueryExe.java | 14 +++++++----- ...fetyEnvironmentalInspectionUserMapper.java | 2 ++ ...ronmentalInspectionUserRepositoryImpl.java | 5 +++++ ...EnvironmentalInspectionUserRepository.java | 2 ++ ...afetyEnvironmentalInspectionUserMapper.xml | 22 +++++++++++++++++++ 5 files changed, 39 insertions(+), 6 deletions(-) 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 c8708fe..e881f02 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 @@ -215,27 +215,29 @@ public class KeyProjectQueryExe { } public KeyProjectCountCO count(Long id) { + // 与列表一致：同一 key_project_id 只统计最新一条 + String latestVersionNotExists = "NOT EXISTS (SELECT 1 FROM key_project kp_latest WHERE kp_latest.delete_enum = 'FALSE' AND kp_latest.key_project_id = key_project.key_project_id AND kp_latest.id > key_project.id)"; QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("jurisdiction_user_id", id); queryWrapper.eq("delete_enum", "FALSE"); queryWrapper.in("apply_status",2,5); + queryWrapper.apply(latestVersionNotExists); // 重点作业确认数量 Long zdzyqrCount = keyProjectRepository.count(queryWrapper); queryWrapper.clear(); queryWrapper.eq("xgf_master_user_id", id); queryWrapper.eq("delete_enum", "FALSE"); - queryWrapper.in("apply_status",1,4); + queryWrapper.in("apply_status",1,4,7); + queryWrapper.apply(latestVersionNotExists); // 重点作业申请数量 Long zdzysqCount = keyProjectRepository.count(queryWrapper); - // 检查核实数量 + // 检查核实数量：与检查核实列表口径一致 + Long jchsCount = safetyEnvironmentalInspectionUserRepository.countCheckVerifyByUserId(id); List insUserList = safetyEnvironmentalInspectionUserRepository.listByUserId(id); - Long jchsCount = 0L; Long shenbianclCount = 0L; Long bjcrqrCount = 0L; for (SafetyEnvironmentalInspectionUserDO insUser : insUserList) { - if (insUser.getType() == 2 || insUser.getType() == 5) { - jchsCount += 1; - } else if (insUser.getType() == 4) { + if (insUser.getType() == 4) { shenbianclCount += 1; } else if (insUser.getType() == 3 || insUser.getType() == 6) { bjcrqrCount += 1; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java index da697e6..ca9d7d7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.java @@ -19,5 +19,7 @@ public interface SafetyEnvironmentalInspectionUserMapper extends BaseMapper selectListByInspectionId(@Param("params") Map params); List listByUserId(Long userId); + + Long countCheckVerifyByUserId(@Param("userId") Long userId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java index 6a9dd27..2409867 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionUserRepositoryImpl.java @@ -134,5 +134,10 @@ public class SafetyEnvironmentalInspectionUserRepositoryImpl extends BaseReposit public List listByUserId(Long userId) { return safetyEnvironmentalInspectionUserMapper.listByUserId(userId); } + + @Override + public Long countCheckVerifyByUserId(Long userId) { + return safetyEnvironmentalInspectionUserMapper.countCheckVerifyByUserId(userId); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java index ae3f2e6..8b01020 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/inspection/SafetyEnvironmentalInspectionUserRepository.java @@ -35,5 +35,7 @@ public interface SafetyEnvironmentalInspectionUserRepository extends BaseReposit List listByUserId(Long userId); + Long countCheckVerifyByUserId(Long userId); + } diff --git a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml index be89463..8585f34 100644 --- a/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionUserMapper.xml @@ -38,5 +38,27 @@ and iu.user_id = #{userId} GROUP BY iu.id + + +