zcloud_gbs
/
zcloud_gbs_key_project
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5-15 - fix

main
tianxinlei 2026-05-15 14:15:35 +08:00
parent 7070c2d1ff
commit b61acd96e1
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectCO.java
View File

@ -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 = "重点作业名称")

1
web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenAddCmd.java
View File

@ -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)

4
web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
View File

@ -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'