diff --git a/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java index 2d1c1d6..eabba59 100644 --- a/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java @@ -12,7 +12,9 @@ import com.zcloud.eightwork.dto.ScreenDangerWorkDataStatisticsQry; import com.zcloud.eightwork.dto.ScreenDepartmentStatisticsQry; import com.zcloud.eightwork.dto.ScreenStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkPageQry; +import com.zcloud.eightwork.dto.ScreenWorkPieStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkRecordQry; +import com.zcloud.eightwork.dto.ScreenWorkStatusStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkTrendQry; import com.zcloud.eightwork.dto.clientobject.DangerWorkStatisticsCO; import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO; @@ -21,7 +23,9 @@ import com.zcloud.eightwork.dto.clientobject.ScreenDangerWorkDataStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenDepartmentStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkPageCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkPieStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkRecordCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkTrendCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; @@ -168,5 +172,17 @@ public class EightworkInfoController { return MultiResponse.of(eightworkInfoService.screenDangerWorkDataStatistics(qry)); } + @ApiOperation("可视化大屏-作业状态统计") + @PostMapping("/screenWorkStatusStatistics") + public SingleResponse screenWorkStatusStatistics(@RequestBody ScreenWorkStatusStatisticsQry qry) { + return SingleResponse.of(eightworkInfoService.screenWorkStatusStatistics(qry)); + } + + @ApiOperation("可视化大屏-作业饼状图") + @PostMapping("/screenWorkPieStatistics") + public MultiResponse screenWorkPieStatistics(@RequestBody ScreenWorkPieStatisticsQry qry) { + return MultiResponse.of(eightworkInfoService.screenWorkPieStatistics(qry)); + } + } diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java index e25ba9f..52e3439 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java @@ -14,7 +14,9 @@ import com.zcloud.eightwork.dto.ScreenDangerWorkDataStatisticsQry; import com.zcloud.eightwork.dto.ScreenDepartmentStatisticsQry; import com.zcloud.eightwork.dto.ScreenStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkPageQry; +import com.zcloud.eightwork.dto.ScreenWorkPieStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkRecordQry; +import com.zcloud.eightwork.dto.ScreenWorkStatusStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkTrendQry; import com.zcloud.eightwork.dto.clientobject.DangerWorkStatisticsCO; import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; @@ -22,7 +24,9 @@ import com.zcloud.eightwork.dto.clientobject.ScreenDangerWorkDataStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenDepartmentStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkPageCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkPieStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkRecordCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkTrendCO; import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO; import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; @@ -31,7 +35,9 @@ import com.zcloud.eightwork.persistence.dataobject.dto.DangerWorkStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDangerWorkDataStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDepartmentStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenStatusStatisticsDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkPieStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkRecordDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkStatusStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkTrendDTO; import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO; import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository; @@ -246,6 +252,53 @@ public class EightworkInfoQueryExe { return statisticsCOS; } + public ScreenWorkStatusStatisticsCO screenWorkStatusStatistics(ScreenWorkStatusStatisticsQry qry) { + Map params = new HashMap<>(); + if (qry != null) { + params = PageQueryHelper.toHashMap(qry); + } + ScreenWorkStatusStatisticsDTO statisticsDTO = eightworkInfoRepository.screenWorkStatusStatistics(params); + ScreenWorkStatusStatisticsCO statisticsCO = new ScreenWorkStatusStatisticsCO(); + if (statisticsDTO != null) { + BeanUtils.copyProperties(statisticsDTO, statisticsCO); + } + if (statisticsCO.getApprovingCount() == null) { + statisticsCO.setApprovingCount(0L); + } + if (statisticsCO.getWorkingCount() == null) { + statisticsCO.setWorkingCount(0L); + } + if (statisticsCO.getArchivedCount() == null) { + statisticsCO.setArchivedCount(0L); + } + return statisticsCO; + } + + public List screenWorkPieStatistics(ScreenWorkPieStatisticsQry qry) { + Map params = new HashMap<>(); + if (qry != null) { + params = PageQueryHelper.toHashMap(qry); + } + List statisticsDTOS = eightworkInfoRepository.screenWorkPieStatistics(params); + Map statisticsMap = new HashMap<>(); + if (CollUtil.isNotEmpty(statisticsDTOS)) { + statisticsMap = statisticsDTOS.stream() + .collect(Collectors.toMap(ScreenWorkPieStatisticsDTO::getWorkType, item -> item, (oldItem, newItem) -> oldItem)); + } + List statisticsCOS = new ArrayList<>(); + for (WorkCodeEnum workCodeEnum : WorkCodeEnum.values()) { + ScreenWorkPieStatisticsDTO statisticsDTO = statisticsMap.get(workCodeEnum.getWorkType()); + ScreenWorkPieStatisticsCO statisticsCO = new ScreenWorkPieStatisticsCO(); + statisticsCO.setWorkType(workCodeEnum.getWorkType()); + statisticsCO.setWorkTypeName(workCodeEnum.getName()); + statisticsCO.setApprovingCount(statisticsDTO == null || statisticsDTO.getApprovingCount() == null ? 0L : statisticsDTO.getApprovingCount()); + statisticsCO.setWorkingCount(statisticsDTO == null || statisticsDTO.getWorkingCount() == null ? 0L : statisticsDTO.getWorkingCount()); + statisticsCO.setArchivedCount(statisticsDTO == null || statisticsDTO.getArchivedCount() == null ? 0L : statisticsDTO.getArchivedCount()); + statisticsCOS.add(statisticsCO); + } + return statisticsCOS; + } + private List buildDateRange(ScreenWorkTrendQry qry) { LocalDate endDate = LocalDate.now(); LocalDate startDate = endDate.minusDays(6); diff --git a/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java index d974861..e790619 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java @@ -21,7 +21,9 @@ import com.zcloud.eightwork.dto.ScreenDangerWorkDataStatisticsQry; import com.zcloud.eightwork.dto.ScreenDepartmentStatisticsQry; import com.zcloud.eightwork.dto.ScreenStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkPageQry; +import com.zcloud.eightwork.dto.ScreenWorkPieStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkRecordQry; +import com.zcloud.eightwork.dto.ScreenWorkStatusStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkTrendQry; import com.zcloud.eightwork.dto.TaskLogNextCmd; import com.zcloud.eightwork.dto.clientobject.DangerWorkStatisticsCO; @@ -30,7 +32,9 @@ import com.zcloud.eightwork.dto.clientobject.ScreenDangerWorkDataStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenDepartmentStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkPageCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkPieStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkRecordCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkTrendCO; import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO; import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO; @@ -216,5 +220,15 @@ public class EightworkInfoServiceImpl implements EightworkInfoServiceI { public List screenDangerWorkDataStatistics(ScreenDangerWorkDataStatisticsQry qry) { return eightworkInfoQueryExe.screenDangerWorkDataStatistics(qry); } + + @Override + public ScreenWorkStatusStatisticsCO screenWorkStatusStatistics(ScreenWorkStatusStatisticsQry qry) { + return eightworkInfoQueryExe.screenWorkStatusStatistics(qry); + } + + @Override + public List screenWorkPieStatistics(ScreenWorkPieStatisticsQry qry) { + return eightworkInfoQueryExe.screenWorkPieStatistics(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java index 185a719..6b25a3d 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java @@ -10,7 +10,9 @@ import com.zcloud.eightwork.dto.ScreenDangerWorkDataStatisticsQry; import com.zcloud.eightwork.dto.ScreenDepartmentStatisticsQry; import com.zcloud.eightwork.dto.ScreenStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkPageQry; +import com.zcloud.eightwork.dto.ScreenWorkPieStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkRecordQry; +import com.zcloud.eightwork.dto.ScreenWorkStatusStatisticsQry; import com.zcloud.eightwork.dto.ScreenWorkTrendQry; import com.zcloud.eightwork.dto.clientobject.DangerWorkStatisticsCO; import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO; @@ -18,7 +20,9 @@ import com.zcloud.eightwork.dto.clientobject.ScreenDangerWorkDataStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenDepartmentStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkPageCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkPieStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkRecordCO; +import com.zcloud.eightwork.dto.clientobject.ScreenWorkStatusStatisticsCO; import com.zcloud.eightwork.dto.clientobject.ScreenWorkTrendCO; import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO; @@ -77,5 +81,9 @@ public interface EightworkInfoServiceI { List screenDepartmentStatistics(ScreenDepartmentStatisticsQry qry); List screenDangerWorkDataStatistics(ScreenDangerWorkDataStatisticsQry qry); + + ScreenWorkStatusStatisticsCO screenWorkStatusStatistics(ScreenWorkStatusStatisticsQry qry); + + List screenWorkPieStatistics(ScreenWorkPieStatisticsQry qry); } diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/ScreenWorkPieStatisticsQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ScreenWorkPieStatisticsQry.java new file mode 100644 index 0000000..c4bdb8f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ScreenWorkPieStatisticsQry.java @@ -0,0 +1,22 @@ +package com.zcloud.eightwork.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 可视化大屏作业饼状图查询 + * + * @author codex + */ +@Data +public class ScreenWorkPieStatisticsQry implements Serializable { + private static final long serialVersionUID = 1L; + + @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/eightwork/dto/ScreenWorkStatusStatisticsQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/ScreenWorkStatusStatisticsQry.java new file mode 100644 index 0000000..8763485 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/ScreenWorkStatusStatisticsQry.java @@ -0,0 +1,22 @@ +package com.zcloud.eightwork.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 可视化大屏作业状态统计查询 + * + * @author codex + */ +@Data +public class ScreenWorkStatusStatisticsQry implements Serializable { + private static final long serialVersionUID = 1L; + + @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/eightwork/dto/clientobject/ScreenWorkPageCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkPageCO.java index 8f7d52e..1288f75 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkPageCO.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkPageCO.java @@ -24,6 +24,9 @@ public class ScreenWorkPageCO extends ClientObject { @ApiModelProperty(value = "企业名称") private String corpinfoName; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "票号") private String checkNo; @@ -36,6 +39,9 @@ public class ScreenWorkPageCO extends ClientObject { @ApiModelProperty(value = "状态") private Integer status; + @ApiModelProperty(value = "作业状态") + private String currentStep; + @ApiModelProperty(value = "详情信息") private JSONObject info; diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkPieStatisticsCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkPieStatisticsCO.java new file mode 100644 index 0000000..757fe83 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkPieStatisticsCO.java @@ -0,0 +1,28 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 可视化大屏作业饼状图 + * + * @author codex + */ +@Data +public class ScreenWorkPieStatisticsCO extends ClientObject { + @ApiModelProperty(value = "作业类型") + private String workType; + + @ApiModelProperty(value = "作业类型名称") + private String workTypeName; + + @ApiModelProperty(value = "审批中数量") + private Long approvingCount; + + @ApiModelProperty(value = "作业中数量") + private Long workingCount; + + @ApiModelProperty(value = "已归档数量") + private Long archivedCount; +} diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkStatusStatisticsCO.java b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkStatusStatisticsCO.java new file mode 100644 index 0000000..6eac4ab --- /dev/null +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/ScreenWorkStatusStatisticsCO.java @@ -0,0 +1,24 @@ +package com.zcloud.eightwork.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 可视化大屏作业状态统计 + * + * @author codex + */ +@Data +public class ScreenWorkStatusStatisticsCO implements Serializable { + @ApiModelProperty(value = "审批中数量") + private Long approvingCount; + + @ApiModelProperty(value = "作业中数量") + private Long workingCount; + + @ApiModelProperty(value = "已归档数量") + private Long archivedCount; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkPieStatisticsDTO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkPieStatisticsDTO.java new file mode 100644 index 0000000..e430197 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkPieStatisticsDTO.java @@ -0,0 +1,16 @@ +package com.zcloud.eightwork.persistence.dataobject.dto; + +import lombok.Data; + +/** + * 可视化大屏作业饼状图 + * + * @author codex + */ +@Data +public class ScreenWorkPieStatisticsDTO { + private String workType; + private Long approvingCount; + private Long workingCount; + private Long archivedCount; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkRecordDTO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkRecordDTO.java index 9dda141..d39a2f8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkRecordDTO.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkRecordDTO.java @@ -15,9 +15,11 @@ public class ScreenWorkRecordDTO { private String workId; private Long corpinfoId; private String corpinfoName; + private String departmentName; private String checkNo; private String workType; private Integer status; + private String currentStep; private String currentStepName; private String nextStepName; private String info; diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkStatusStatisticsDTO.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkStatusStatisticsDTO.java new file mode 100644 index 0000000..62d958e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/ScreenWorkStatusStatisticsDTO.java @@ -0,0 +1,15 @@ +package com.zcloud.eightwork.persistence.dataobject.dto; + +import lombok.Data; + +/** + * 可视化大屏作业状态统计 + * + * @author codex + */ +@Data +public class ScreenWorkStatusStatisticsDTO { + private Long approvingCount; + private Long workingCount; + private Long archivedCount; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java index eecc8ff..6cad130 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java @@ -10,7 +10,9 @@ import com.zcloud.eightwork.persistence.dataobject.dto.DangerWorkStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDangerWorkDataStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDepartmentStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenStatusStatisticsDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkPieStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkRecordDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkStatusStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkTrendDTO; import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO; import org.apache.ibatis.annotations.Mapper; @@ -48,5 +50,9 @@ public interface EightworkInfoMapper extends BaseMapper { List screenDepartmentStatistics(@Param("params") Map params); List screenDangerWorkDataStatistics(@Param("params") Map params); + + ScreenWorkStatusStatisticsDTO screenWorkStatusStatistics(@Param("params") Map params); + + List screenWorkPieStatistics(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java index 1ec25ce..e39aefb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java @@ -7,7 +7,9 @@ import com.zcloud.eightwork.persistence.dataobject.dto.DangerWorkStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDangerWorkDataStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDepartmentStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenStatusStatisticsDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkPieStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkRecordDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkStatusStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkTrendDTO; import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO; @@ -45,6 +47,10 @@ public interface EightworkInfoRepository extends BaseRepository List screenDangerWorkDataStatistics(Map params); + ScreenWorkStatusStatisticsDTO screenWorkStatusStatistics(Map params); + + List screenWorkPieStatistics(Map params); + /** * 使用 CAS 方式更新 lockFlag(乐观锁) * 只有当 lockFlag 和 status 都匹配时才更新 diff --git a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java index 1eeddb0..f584e57 100644 --- a/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java @@ -14,7 +14,9 @@ import com.zcloud.eightwork.persistence.dataobject.dto.DangerWorkStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDangerWorkDataStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenDepartmentStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenStatusStatisticsDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkPieStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkRecordDTO; +import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkStatusStatisticsDTO; import com.zcloud.eightwork.persistence.dataobject.dto.ScreenWorkTrendDTO; import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO; import com.zcloud.eightwork.persistence.mapper.EightworkInfoMapper; @@ -118,6 +120,16 @@ public class EightworkInfoRepositoryImpl extends BaseRepositoryImpl params) { + return eightworkInfoMapper.screenWorkStatusStatistics(params); + } + + @Override + public List screenWorkPieStatistics(Map params) { + return eightworkInfoMapper.screenWorkPieStatistics(params); + } + @Override public boolean updateLockFlagToLocked(Long id, Integer expectedLockFlag, Integer newLockFlag, Integer expectedStatus) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); diff --git a/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml index 2a73cf1..ad76313 100644 --- a/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml @@ -226,9 +226,11 @@ t.work_id as workId, t.corpinfo_id as corpinfoId, c.corp_name as corpinfoName, + t.department_name as departmentName, t.check_no as checkNo, t.work_type as workType, t.status, + t.current_step as currentStep, t.info, t.create_time as createTime from eightwork_info t @@ -288,4 +290,54 @@ group by t.work_type + + + +