From 2ea261cbbc7c34ffa4614e743aaf6b2da36c2a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sat, 19 Aug 2023 21:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lsStatisticsCollectManifestController.java | 5 +- .../ParamsCollectManifestHistoryEOMapper.java | 3 + .../mapper/ParamsManifestEOMapper.java | 2 +- .../mapper/ParamsManifestHistoryEOMapper.java | 6 ++ .../ParamsCollectManifestHistoryEOMapper.xml | 14 ++++ .../mapper/xml/ParamsManifestEOMapper.xml | 1 + .../xml/ParamsManifestHistoryEOMapper.xml | 9 +++ .../service/IParamsManifestEOService.java | 2 +- .../impl/ParamsManifestEOServiceImpl.java | 23 ++++-- .../ProjectLawsInventoryEOServiceImpl.java | 4 +- .../impl/ProjectStatusBoardServiceImpl.java | 70 +++++++++++++------ 11 files changed, 104 insertions(+), 35 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java index 7b2d2a1c9..96613da8d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ProjectDetailsStatisticsCollectManifestController.java @@ -30,8 +30,9 @@ public class ProjectDetailsStatisticsCollectManifestController { @AutoLog(value = "项目详情-参数收集统计接口-清单下拉选项") @ApiOperation(value="项目详情-参数收集统计接口-清单下拉选项", notes="项目详情-参数收集统计接口-清单下拉选项") @GetMapping(value = "/getProjectDetailsStatisticsCollectManifestLabel") - public Result getProjectDetailsStatisticsCollectManifestLabel(@RequestParam(name="id",required=true) String id) { - List> labelList = paramsManifestEOService.labelListForProjectDetails(id); + public Result getProjectDetailsStatisticsCollectManifestLabel(@RequestParam(name="id",required=true) String id, + @RequestParam(name="projectVersion",required=true) String projectVersion) { + List> labelList = paramsManifestEOService.labelListForProjectDetails(id,projectVersion); return Result.OK(labelList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java index b2eafd59f..2dfdd92c2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestHistoryEOMapper.java @@ -7,6 +7,7 @@ import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @Description: 参数项收集清单历史版本 @@ -19,4 +20,6 @@ public interface ParamsCollectManifestHistoryEOMapper extends BaseMapper listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); IPage pageInfo(@Param("page") IPage page, @Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); + List> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java index 94f76a559..768d21ee1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java @@ -30,7 +30,7 @@ public interface ParamsManifestEOMapper extends BaseMapper { ParamsManifestVO getProjectById(@Param("projectId") String projectId); - List> labelListForProjectDetails(@Param("projectId") String projectId); + List> labelListForProjectDetails(@Param("projectId") String projectId,@Param("projectVersion") String projectVersion); List listInfoHomo(@Param("userId") String userId, @Param("state") String state); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java index 9a9777ff2..b6fdefd91 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestHistoryEOMapper.java @@ -2,6 +2,10 @@ package com.jero.modules.cert.collect.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * @Description: 参数清单历史版本 @@ -11,4 +15,6 @@ import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO; */ public interface ParamsManifestHistoryEOMapper extends BaseMapper { + List labelListForProjectDetails(@Param("projectId") String projectId, @Param("projectVersion") String projectVersion); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml index 7ef7f892a..6d09349cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml @@ -73,4 +73,18 @@ and control_type != '11' order by nio_number asc + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 96bd6c847..3b8f336e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -220,6 +220,7 @@ id as value from params_manifest where project_id = #{projectId} + AND project_version = #{projectVersion} order by create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml index c3f9911f4..f31e15ad8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestHistoryEOMapper.xml @@ -18,4 +18,13 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index 461fbd58a..175fc4866 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -98,7 +98,7 @@ public interface IParamsManifestEOService extends IService { ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut); - List> labelListForProjectDetails(String projectId); + List> labelListForProjectDetails(String projectId,String projectVersion); Map getStatisticsForProjectDetails(String paramsManifestId, String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 678150427..4b8742a10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -16,10 +16,7 @@ import com.jero.modules.cert.collect.entity.*; import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum; import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ManifestStateEnum; -import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper; -import com.jero.modules.cert.collect.mapper.ParamsCollectManifestHistoryEOMapper; -import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper; -import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; +import com.jero.modules.cert.collect.mapper.*; import com.jero.modules.cert.collect.service.*; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.collect.vo.ParamsManifestVO; @@ -69,6 +66,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> labelListForProjectDetails(String projectId) { - return paramsManifestEOMapper.labelListForProjectDetails(projectId); + public List> labelListForProjectDetails(String projectId,String projectVersion) { + List> res = paramsManifestEOMapper.labelListForProjectDetails(projectId,projectVersion); + List hisRes = paramsManifestHistoryEOMapper.labelListForProjectDetails(projectId,projectVersion); + for (ParamsManifestHistoryEO hisEO : hisRes) { + Map hisMap = new HashMap<>(); + hisMap.put("label",hisEO.getTitle() + "-" + hisEO.getVersion()); + hisMap.put("value",hisEO.getId()); + res.add(hisMap); + } + return res; } @Override @@ -1155,6 +1163,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> listAll = paramsCollectManifestEOMapper.listInfoForExport(paramsCollectManifestEO, null); + if(CollectionUtils.isEmpty(listAll)){ + listAll = paramsCollectManifestHistoryEOMapper.listInfoForExport(paramsCollectManifestEO, null); + } if(ObjectUtil.isNotEmpty(firstLevelDutyTerritoryMap)){ for (Map.Entry> dutyTerritoryMap : firstLevelDutyTerritoryMap.entrySet()) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 238c781b6..848c2ccb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10712,7 +10712,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl pciEoList = this.projectCertificationInventoryEOService.list(); List ptpEoList = this.projectTaskPlanningService.list(); List pmEoList = this.paramsManifestEOService.list(); + pmEoList.addAll(this.paramsManifestHistoryEOService.list()); log.info("一阶段消耗时间：" + (System.currentTimeMillis() - startTime)); List pcmEoList = this.paramsCollectManifestEOService.getList(null); + List pcmHisEoList = this.paramsCollectManifestHistoryEOService.list(); + for (ParamsCollectManifestHistoryEO his : pcmHisEoList) { + ParamsCollectManifestEO pcm = new ParamsCollectManifestEO(); + BeanUtils.copyProperties(his,pcm); + pcmEoList.add(pcm); + } pcmEoList = pcmEoList.stream().filter(pcmEo -> !StringUtils.equals(pcmEo.getControlType(), ControlTypeEnum.Title.getValue())).collect(Collectors.toList());; log.info("二阶段消耗时间：" + (System.currentTimeMillis() - startTime)); @@ -717,16 +732,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService * @param pcmEoList * @param ptpEoList */ - private void exportCrossProjectProgress(HSSFSheet sheet, - ProjectLibraryBase projectLibraryBase, - List plbEoList, - List pliEoList, - List pciEoList, - List pmEoList, - List pcmEoList, - List ptpEoList) { - this.exportCrossProjectProgressSetData(plbEoList, sheet,pliEoList,pciEoList,pmEoList,pcmEoList,projectLibraryBase,ptpEoList); - } +// private void exportCrossProjectProgress(HSSFSheet sheet, +// ProjectLibraryBase projectLibraryBase, +// List plbEoList, +// List pliEoList, +// List pciEoList, +// List pmEoList, +// List pcmEoList, +// List ptpEoList) { +// this.exportCrossProjectProgressSetData(plbEoList, sheet,pliEoList,pciEoList,pmEoList,pcmEoList,projectLibraryBase,ptpEoList); +// } @NotNull private HSSFSheet createCorssProjectProgressSheet(HSSFWorkbook workbook, ProjectLibraryBase projectLibraryBase) { @@ -1015,7 +1030,11 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService List pmEos = pmEoList.stream().filter(pmEo -> { - return StringUtils.equals(pmEo.getProjectId(), plbEo.getId()); + if(pmEo.getProjectVersion().equals("00")){ + return StringUtils.equals(pmEo.getProjectId(), plbEo.getId()); + }else{ + return StringUtils.equals(pmEo.getProjectId(), plbEo.getParentId()) && StringUtils.equals(pmEo.getProjectVersion(), plbEo.getProjectVersion()); + } }).collect(Collectors.toList()); double notStartAmount = 0; @@ -1078,17 +1097,17 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService * @param pcmEoList * @param ptpEoList */ - private void exportOverviewCrossProjectProgress(HSSFSheet sheet, - ProjectLibraryBase projectLibraryBase, - List plbEoList, - List pliEoList, - List pciEoList, - List pmEoList, - List pcmEoList, - List ptpEoList, - CellStyle cellStyleTitle) { - this.exportOverviewCrossProjectProgressSetData(plbEoList, sheet,pliEoList,pciEoList,pmEoList,pcmEoList,projectLibraryBase,ptpEoList,cellStyleTitle); - } +// private void exportOverviewCrossProjectProgress(HSSFSheet sheet, +// ProjectLibraryBase projectLibraryBase, +// List plbEoList, +// List pliEoList, +// List pciEoList, +// List pmEoList, +// List pcmEoList, +// List ptpEoList, +// CellStyle cellStyleTitle) { +// this.exportOverviewCrossProjectProgressSetData(plbEoList, sheet,pliEoList,pciEoList,pmEoList,pcmEoList,projectLibraryBase,ptpEoList,cellStyleTitle); +// } public HSSFSheet createOverviewCrossProjectProgressSheet(HSSFWorkbook workbook, ProjectLibraryBase projectLibraryBase){ String cut = projectLibraryBase.getCut(); @@ -1222,8 +1241,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService Map preHomoProjectScheduleExportMap = (Map) preHomoMap.get("projectScheduleExportMap"); double preHomoPercentage = Double.parseDouble(((String)preHomoProjectScheduleExportMap.get("percentage")).replace("%",""))/100; + List pmEos = pmEoList.stream().filter(pmEo -> { - return StringUtils.equals(pmEo.getProjectId(), plbEo.getId()); + if(pmEo.getProjectVersion().equals("00")){ + return StringUtils.equals(pmEo.getProjectId(), plbEo.getId()); + }else{ + return StringUtils.equals(pmEo.getProjectId(), plbEo.getParentId()) && StringUtils.equals(pmEo.getProjectVersion(), plbEo.getProjectVersion()); + } }).collect(Collectors.toList()); double parameterCollectingPercentageStr = 0;