From b61acd96e19a7aa39cbeb6c23a408dc6899e83a5 Mon Sep 17 00:00:00 2001
From: tianxinlei <tianxinlei@zcloudchina.com>
Date: Fri, 15 May 2026 14:15:35 +0800
Subject: [PATCH] 5-15 - fix

---
 .../key/project/dto/clientobject/project/KeyProjectCO.java    | 4 ++--
 .../java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java  | 1 -
 .../src/main/resources/mapper/KeyProjectMapper.xml            | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java
index 4d197c0..5b8be33 100644
--- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java
+++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java
@@ -23,7 +23,7 @@ public class KeyProjectCO extends ClientObject {
     @ApiModelProperty(value = "主键")
     private Long id;
     //业务主键id
-    @ApiModelProperty(value = "业务主键id")
+    @ApiModelProperty(value = "业务主键id-重点作业id")
     private String keyProjectId;
     //企业id
     @ApiModelProperty(value = "企业id")
@@ -44,7 +44,7 @@ public class KeyProjectCO extends ClientObject {
     @ApiModelProperty(value = "是否已有项目内作业,1:是,0:否")
     private Integer projectWorkFlag;
     //重点作业名称
-    @ApiModelProperty(value = "重点作业id")
+    @ApiModelProperty(value = "项目id")
     private String projectId;
     //重点作业名称
     @ApiModelProperty(value = "重点作业名称")
diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java
index cdf4ce7..d7ccce0 100644
--- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java
@@ -54,7 +54,6 @@ public class HiddenAddCmd extends Command {
     private String legalBasis;
 
     @ApiModelProperty(value = "隐患位置描述", name = "positionDesc", required = true)
-    @NotEmpty(message = "隐患位置描述不能为空")
     private String positionDesc;
 
     @ApiModelProperty(value = "隐患类型", name = "hiddenType", required = true)
diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
index 0b11a51..fa470ca 100644
--- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
@@ -206,7 +206,7 @@
     <select id="corpStatistics" resultType="com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO">
         SELECT cp.id                                                AS corpinfoId,
                cp.corp_name                                         AS corpinfoName,
-               COUNT(distinct kp.id)                                         AS totalProjectCount,
+                COUNT(distinct kp.id)                                         AS totalProjectCount,
                 COUNT(DISTINCT CASE WHEN kp.apply_status = 4 THEN kp.id END) AS startCount,
                 COUNT(DISTINCT CASE WHEN kp.apply_status = 6 THEN kp.id END) AS completeCount,
                 COUNT(DISTINCT CASE WHEN kpc.camera_type = 1 THEN kpc.camera_id END) AS fixedCameraCount,
@@ -217,7 +217,7 @@
                 GROUP_CONCAT(DISTINCT CASE WHEN kpc.camera_type = 2 THEN kpc.camera_id END) AS mobileCameraIdList
         FROM corp_info cp
                  LEFT JOIN key_project kp
-                           ON cp.id = kp.jurisdiction_corpinfo_id AND kp.delete_enum = 'FALSE'
+                           ON cp.id = kp.jurisdiction_corpinfo_id AND kp.delete_enum = 'FALSE' AND kp.apply_status NOT IN (0,1)
                  left join key_project_camera kpc on kp.key_project_id = kpc.key_project_id AND kpc.delete_enum = 'FALSE'
                 left join safety_environmental_inspection sei on cp.id = sei.corp_id AND sei.delete_enum = 'FALSE' and sei.status != 0
                 left join hidden h on cp.id = h.tenant_id AND h.delete_enum = 'FALSE'