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 4d37a10..10372d9 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 @@ -169,5 +169,17 @@ public class KeyProjectController { return MultiResponse.of(keyProjectService.largeScreenProjectProgress(qry)); } + @ApiOperation("可视化大屏-相关方作业情况统计") + @PostMapping("/largeScreenXgfStatistics") + public MultiResponse largeScreenXgfStatistics(@RequestBody KeyProjectLargeScreenXgfStatisticsQry qry) { + return MultiResponse.of(keyProjectService.largeScreenXgfStatistics(qry)); + } + + @ApiOperation("可视化大屏-重点作业信息列表") + @PostMapping("/largeScreenInfo") + public MultiResponse largeScreenInfo(@RequestBody KeyProjectLargeScreenInfoQry qry) { + return MultiResponse.of(keyProjectService.largeScreenInfo(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 e881f02..d9d4bca 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 @@ -360,5 +360,35 @@ public class KeyProjectQueryExe { return result; }).collect(Collectors.toList()); } + + public List largeScreenXgfStatistics(KeyProjectLargeScreenXgfStatisticsQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List dataList = keyProjectRepository.largeScreenXgfStatistics(params); + if (CollUtil.isEmpty(dataList)) { + return java.util.Collections.emptyList(); + } + return dataList.stream().map(data -> { + KeyProjectLargeScreenXgfStatisticsCO result = new KeyProjectLargeScreenXgfStatisticsCO(); + result.setXgfCorpinfoId(data.getXgfCorpinfoId()); + result.setXgfCorpinfoName(data.getXgfCorpinfoName()); + result.setMorePeopleCount(data.getMorePeopleCount()); + result.setFourNewHomeworkCount(data.getFourNewHomeworkCount()); + result.setNightWorkCount(data.getNightWorkCount()); + return result; + }).collect(Collectors.toList()); + } + + public List largeScreenInfo(KeyProjectLargeScreenInfoQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List dataList = keyProjectRepository.largeScreenInfo(params); + if (CollUtil.isEmpty(dataList)) { + return java.util.Collections.emptyList(); + } + return dataList.stream().map(data -> { + KeyProjectLargeScreenInfoCO result = new KeyProjectLargeScreenInfoCO(); + org.springframework.beans.BeanUtils.copyProperties(data, result); + 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 e1720e7..f8bf638 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 @@ -133,5 +133,15 @@ public class KeyProjectServiceImpl implements KeyProjectServiceI { public List largeScreenProjectProgress(KeyProjectLargeScreenProjectProgressQry qry) { return keyProjectQueryExe.largeScreenProjectProgress(qry); } + + @Override + public List largeScreenXgfStatistics(KeyProjectLargeScreenXgfStatisticsQry qry) { + return keyProjectQueryExe.largeScreenXgfStatistics(qry); + } + + @Override + public List largeScreenInfo(KeyProjectLargeScreenInfoQry qry) { + return keyProjectQueryExe.largeScreenInfo(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 c18c361..ad0f76e 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 @@ -55,5 +55,9 @@ public interface KeyProjectServiceI { List largeScreenDepartmentStatistics(KeyProjectLargeScreenDepartmentStatisticsQry qry); List largeScreenProjectProgress(KeyProjectLargeScreenProjectProgressQry qry); + + List largeScreenXgfStatistics(KeyProjectLargeScreenXgfStatisticsQry qry); + + List largeScreenInfo(KeyProjectLargeScreenInfoQry qry); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenInfoCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenInfoCO.java new file mode 100644 index 0000000..d3e93b4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenInfoCO.java @@ -0,0 +1,19 @@ +package com.zcloud.key.project.dto.clientobject.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 可视化大屏重点作业信息列表返回 + * + * @Author zhaokai + * @Date 2026-07-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class KeyProjectLargeScreenInfoCO extends KeyProjectLargeScreenCO { + + @ApiModelProperty(value = "辖区单位企业名称") + private String jurisdictionCorpinfoName; +} diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenXgfStatisticsCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenXgfStatisticsCO.java new file mode 100644 index 0000000..b13a686 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenXgfStatisticsCO.java @@ -0,0 +1,31 @@ +package com.zcloud.key.project.dto.clientobject.project; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 可视化大屏相关方作业情况统计返回 + * + * @Author zhaokai + * @Date 2026-07-28 + */ +@Data +public class KeyProjectLargeScreenXgfStatisticsCO implements Serializable { + + @ApiModelProperty(value = "相关方企业id") + private Long xgfCorpinfoId; + + @ApiModelProperty(value = "相关方名称") + private String xgfCorpinfoName; + + @ApiModelProperty(value = "三人及以上作业数") + private Integer morePeopleCount; + + @ApiModelProperty(value = "四新作业数") + private Integer fourNewHomeworkCount; + + @ApiModelProperty(value = "夜间作业数") + private Integer nightWorkCount; +} diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenInfoQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenInfoQry.java new file mode 100644 index 0000000..9d9452b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenInfoQry.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-29 + */ +@Data +public class KeyProjectLargeScreenInfoQry implements Serializable { + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; +} diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenXgfStatisticsQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenXgfStatisticsQry.java new file mode 100644 index 0000000..fc90875 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenXgfStatisticsQry.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-28 + */ +@Data +public class KeyProjectLargeScreenXgfStatisticsQry 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/KeyProjectLargeScreenInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenInfoDO.java new file mode 100644 index 0000000..63e0cd4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenInfoDO.java @@ -0,0 +1,21 @@ +package com.zcloud.key.project.persistence.dataobject.project; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 可视化大屏重点作业信息列表数据 + * + * @Author zhaokai + * @Date 2026-07-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class KeyProjectLargeScreenInfoDO extends KeyProjectDO { + + @ApiModelProperty(value = "辖区单位企业名称") + @TableField(exist = false) + private String jurisdictionCorpinfoName; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenXgfStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenXgfStatisticsDO.java new file mode 100644 index 0000000..25b8939 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenXgfStatisticsDO.java @@ -0,0 +1,25 @@ +package com.zcloud.key.project.persistence.dataobject.project; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 可视化大屏相关方作业情况统计数据 + * + * @Author zhaokai + * @Date 2026-07-28 + */ +@Data +public class KeyProjectLargeScreenXgfStatisticsDO implements Serializable { + + private Long xgfCorpinfoId; + + private String xgfCorpinfoName; + + private Integer morePeopleCount; + + private Integer fourNewHomeworkCount; + + private Integer nightWorkCount; +} 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 0417a8d..cd5d06c 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 @@ -50,5 +50,9 @@ public interface KeyProjectMapper extends BaseMapper { List largeScreenDepartmentStatistics(Map params); List largeScreenProjectProgress(Map params); + + List largeScreenXgfStatistics(Map params); + + List largeScreenInfo(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 fe1baee..20faee8 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 @@ -119,5 +119,15 @@ public class KeyProjectRepositoryImpl extends BaseRepositoryImpl largeScreenProjectProgress(Map params) { return keyProjectMapper.largeScreenProjectProgress(params); } + + @Override + public List largeScreenXgfStatistics(Map params) { + return keyProjectMapper.largeScreenXgfStatistics(params); + } + + @Override + public List largeScreenInfo(Map params) { + return keyProjectMapper.largeScreenInfo(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 dcfbe8e..a74e426 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 @@ -41,5 +41,9 @@ public interface KeyProjectRepository extends BaseRepository { List largeScreenDepartmentStatistics(Map params); List largeScreenProjectProgress(Map params); + + List largeScreenXgfStatistics(Map params); + + List largeScreenInfo(Map params); } diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 2837f27..4186bb6 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -640,7 +640,7 @@ FROM key_project kp WHERE kp.delete_enum = 'FALSE' - AND kp.corpinfo_id = #{corpinfoId} + AND kp.jurisdiction_corpinfo_id = #{corpinfoId} @@ -650,12 +650,12 @@ cp.port_area AS portArea FROM key_project kp - LEFT JOIN corp_info cp ON kp.corpinfo_id = cp.id + LEFT JOIN corp_info cp ON kp.jurisdiction_corpinfo_id = cp.id WHERE kp.delete_enum = 'FALSE' AND kp.apply_status IN (2, 4, 5) - AND kp.corpinfo_id = #{params.corpinfoId} + AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId} AND cp.port_area = #{params.portArea} @@ -666,12 +666,12 @@ + + + +