diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java index b0d24e2..760eddf 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java @@ -156,5 +156,11 @@ public class KeyProjectController { return MultiResponse.of(keyProjectService.largeScreenDepartmentStatistics(qry)); } + @ApiOperation("可视化大屏-项目进行情况") + @PostMapping("/largeScreenProjectProgress") + public MultiResponse largeScreenProjectProgress(@RequestBody KeyProjectLargeScreenProjectProgressQry qry) { + return MultiResponse.of(keyProjectService.largeScreenProjectProgress(qry)); + } + } 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 5f50132..4e9f41f 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 @@ -318,5 +318,23 @@ public class KeyProjectQueryExe { return result; }).collect(Collectors.toList()); } + + public List largeScreenProjectProgress(KeyProjectLargeScreenProjectProgressQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List dataList = keyProjectRepository.largeScreenProjectProgress(params); + if (CollUtil.isEmpty(dataList)) { + return java.util.Collections.emptyList(); + } + return dataList.stream().map(data -> { + KeyProjectLargeScreenProjectProgressCO result = new KeyProjectLargeScreenProjectProgressCO(); + result.setProjectId(data.getProjectId()); + result.setProjectName(data.getProjectName()); + result.setCorpinfoName(data.getCorpinfoName()); + result.setInspectCount(data.getInspectCount()); + result.setHiddenCount(data.getHiddenCount()); + result.setPenaltyAmount(data.getPenaltyAmount()); + return result; + }).collect(Collectors.toList()); + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java index da4ae28..e1720e7 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java @@ -128,5 +128,10 @@ public class KeyProjectServiceImpl implements KeyProjectServiceI { public List largeScreenDepartmentStatistics(KeyProjectLargeScreenDepartmentStatisticsQry qry) { return keyProjectQueryExe.largeScreenDepartmentStatistics(qry); } + + @Override + public List largeScreenProjectProgress(KeyProjectLargeScreenProjectProgressQry qry) { + return keyProjectQueryExe.largeScreenProjectProgress(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java index a863bd2..c18c361 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java @@ -53,5 +53,7 @@ public interface KeyProjectServiceI { SingleResponse largeScreenProjectStatistics(KeyProjectLargeScreenProjectStatisticsQry qry); List largeScreenDepartmentStatistics(KeyProjectLargeScreenDepartmentStatisticsQry qry); + + List largeScreenProjectProgress(KeyProjectLargeScreenProjectProgressQry qry); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenProjectProgressCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenProjectProgressCO.java new file mode 100644 index 0000000..60d7c41 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenProjectProgressCO.java @@ -0,0 +1,35 @@ +package com.zcloud.key.project.dto.clientobject.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 可视化大屏项目进行情况返回 + * + * @Author zhaokai + * @Date 2026-07-22 + */ +@Data +public class KeyProjectLargeScreenProjectProgressCO implements Serializable { + + @ApiModelProperty(value = "项目id") + private Long projectId; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "承包单位") + private String corpinfoName; + + @ApiModelProperty(value = "被检查数") + private Integer inspectCount; + + @ApiModelProperty(value = "检查发现隐患数") + private Integer hiddenCount; + + @ApiModelProperty(value = "被处罚金额") + private BigDecimal penaltyAmount; +} diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenProjectProgressQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenProjectProgressQry.java new file mode 100644 index 0000000..c52dc02 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenProjectProgressQry.java @@ -0,0 +1,22 @@ +package com.zcloud.key.project.dto.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 可视化大屏项目进行情况请求 + * + * @Author zhaokai + * @Date 2026-07-22 + */ +@Data +public class KeyProjectLargeScreenProjectProgressQry implements Serializable { + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "港区,1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenProjectProgressDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenProjectProgressDO.java new file mode 100644 index 0000000..614d711 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenProjectProgressDO.java @@ -0,0 +1,28 @@ +package com.zcloud.key.project.persistence.dataobject.project; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 可视化大屏项目进行情况数据 + * + * @Author zhaokai + * @Date 2026-07-22 + */ +@Data +public class KeyProjectLargeScreenProjectProgressDO implements Serializable { + + private Long projectId; + + private String projectName; + + private String corpinfoName; + + private Integer inspectCount; + + private Integer hiddenCount; + + private BigDecimal penaltyAmount; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java index bbb1438..0417a8d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java @@ -48,5 +48,7 @@ public interface KeyProjectMapper extends BaseMapper { KeyProjectLargeScreenProjectStatisticsDO largeScreenProjectStatistics(Map params); List largeScreenDepartmentStatistics(Map params); + + List largeScreenProjectProgress(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java index b4695bd..fe1baee 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java @@ -114,5 +114,10 @@ public class KeyProjectRepositoryImpl extends BaseRepositoryImpl largeScreenDepartmentStatistics(Map params) { return keyProjectMapper.largeScreenDepartmentStatistics(params); } + + @Override + public List largeScreenProjectProgress(Map params) { + return keyProjectMapper.largeScreenProjectProgress(params); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java index b90c59c..dcfbe8e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java @@ -39,5 +39,7 @@ public interface KeyProjectRepository extends BaseRepository { KeyProjectLargeScreenProjectStatisticsDO largeScreenProjectStatistics(Map params); List largeScreenDepartmentStatistics(Map params); + + List largeScreenProjectProgress(Map params); } diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 011495a..0847f8f 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -624,5 +624,65 @@ GROUP BY kp.master_department_id, d.name ORDER BY kp.master_department_id ASC + +