From ed9f70b178e64dd731354f1cebe3f9127fd34152 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 11 Oct 2023 16:24:56 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=88=E8=BD=A6=E5=9E=8B=E5=BA=93=EF=BC=8C=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=8A=B6=E6=80=81=E7=9C=8B=E6=9D=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsManifestEOServiceImpl.java | 50 ++++++++++---- ...formProjectLawsInventoryEOServiceImpl.java | 12 ++-- ...PlatformProjectLibraryBaseServiceImpl.java | 66 +++---------------- .../ProjectLawsInventoryEOServiceImpl.java | 12 ++-- .../impl/ProjectLibraryBaseServiceImpl.java | 56 ---------------- 5 files changed, 65 insertions(+), 131 deletions(-) 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 ae78fd2a6..0cbc8deb9 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 @@ -8,16 +8,32 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; -import com.jero.modules.cert.collect.entity.*; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; +import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO; +import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.entity.ParamsManifestHistoryEO; 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.*; -import com.jero.modules.cert.collect.service.*; +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.ParamsManifestHistoryEOMapper; +import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; +import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; +import com.jero.modules.cert.collect.service.IParamsConfigEOService; +import com.jero.modules.cert.collect.service.IParamsConfigHistoryEOService; +import com.jero.modules.cert.collect.service.IParamsManifestEOService; +import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; import com.jero.modules.cert.collect.vo.ParamsManifestVO; import com.jero.modules.cert.report.entity.ParamsReportEO; @@ -29,7 +45,6 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.cert.template.service.IParamsTemplateEOService; import com.jero.modules.enums.DictCodeEnum; -import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectRelatedPersonnelService; @@ -50,7 +65,16 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.text.NumberFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -1241,20 +1265,24 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.get("state")) - || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.get("state")) - || CollectManifestStateEnum.CHANGE.getValue().equals(e.get("state"))) && dictItem.getItemValue().equals(e.get("duty_territory"))) + || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.get("state"))) + && dictItem.getItemValue().equals(e.get("duty_territory"))) .count(); // 未开始的参数项 数量 collectingNumber += listAll.stream().filter(e -> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.get("state")) || CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.get("state")) || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.get("state")) - || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.get("state"))) && dictItem.getItemValue().equals(e.get("duty_territory"))) + || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.get("state"))) + && dictItem.getItemValue().equals(e.get("duty_territory"))) .count(); // 收集中的参数项 数量 - submitNumber += listAll.stream().filter(e -> CollectManifestStateEnum.SUBMIT.getValue().equals(e.get("state")) && dictItem.getItemValue().equals(e.get("duty_territory"))) + submitNumber += listAll.stream().filter(e -> (CollectManifestStateEnum.SUBMIT.getValue().equals(e.get("state")) + || CollectManifestStateEnum.CHANGE.getValue().equals(e.get("state"))) + && dictItem.getItemValue().equals(e.get("duty_territory"))) .count(); // 已提交的参数项 数量 - syncReportNumber += listAll.stream().filter(e -> CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.get("state")) && dictItem.getItemValue().equals(e.get("duty_territory"))) + syncReportNumber += listAll.stream().filter(e -> CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.get("state")) + && dictItem.getItemValue().equals(e.get("duty_territory"))) .count(); // 已同步上报库的参数项 数量 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 4e9c06391..f25ae55b1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -10147,7 +10147,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).count(); @@ -10219,7 +10221,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).count(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 888ce7c63..8f45a7c6a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -1007,7 +1007,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl queryById(String id,String cut) { List records = platformProjectLibraryBaseMapper.queryById(id); - disposeData(records,"",false); + disposeData(records,cut,false); //目标市场数据字典 List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for(ProjectLibraryBase projectLibraryBase: records){ @@ -1537,6 +1537,15 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl param = new HashMap<>(); + param.put("cut",cut); + String targetMarketTemp = getMarket(param, targetMarketList, projectLibraryBase); + //项目名称（功率-生产商-目标市场） + String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarketTemp; + projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值 + //平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值 + projectLibraryBase.setProjectName(projectName); if(disposeTargetMarketFlag){ if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){ @@ -1615,31 +1624,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> currentProjectStatusMapList = new ArrayList<>(); - CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values(); - for (CurrentProjectStatusEnum value : values) { - Map map = new HashMap<>(); - map.put("color",value.getValue()); - currentProjectStatusMapList.add(map); - } - int currentProjectStatusTotal; - List projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList); - - for (Map map : currentProjectStatusMapList) { - List collect = projectStatusAssessList.stream().filter( - projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString()) - ).collect(Collectors.toList()); - map.put("conditionAssessmentCount",collect.size()); - } - - currentProjectStatusTotal = currentProjectStatusMapList.stream().filter( - currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0 - ).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum(); - - currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList); - currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal); - result.put("currentProjectStatusMap",currentProjectStatusMap);*/ //设计符合性 List> designComplianceMapList = this.platformProjectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); @@ -1664,36 +1648,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList); - certificationProgressTotal = certificationProgressMapList.stream().filter( - certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0 - ).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum(); - - CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values(); - for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) { - boolean flag = true; - for (Map map : certificationProgressMapList) { - if(map.get("certificationProgress") != null){ - if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){ - flag = false; - break; - } - } - } - if(flag){ - Map map = new HashMap<>(); - map.put("certificationProgress",certificationProgressEnumValue.getValue()); - map.put("certificationProgressCount",0); - certificationProgressMapList.add(map); - } - } - - certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal); - certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList); - result.put("certificationProgressMap",certificationProgressMap);*/ } QueryWrapper pciQueryWrap = new QueryWrapper<>(); 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 ecf1766f9..564b436ea 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 @@ -10118,7 +10118,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).count(); @@ -10190,7 +10192,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { boolean flag = ( StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).count(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index d7ca2b6f9..21a021e7f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -1935,32 +1935,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> currentProjectStatusMapList = new ArrayList<>(); - CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values(); - for (CurrentProjectStatusEnum value : values) { - Map map = new HashMap<>(); - map.put("color",value.getValue()); - currentProjectStatusMapList.add(map); - } - int currentProjectStatusTotal; - List projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList); - - for (Map map : currentProjectStatusMapList) { - List collect = projectStatusAssessList.stream().filter( - projectStatusAssess -> StringUtils.equals(projectStatusAssess.getConditionAssessment(),map.get("color").toString()) - ).collect(Collectors.toList()); - map.put("conditionAssessmentCount",collect.size()); - } - - currentProjectStatusTotal = currentProjectStatusMapList.stream().filter( - currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString()) != 0 - ).mapToInt(currentProjectStatus -> Integer.parseInt(currentProjectStatus.get("conditionAssessmentCount").toString())).sum(); - - currentProjectStatusMap.put("currentProjectStatusMapList",currentProjectStatusMapList); - currentProjectStatusMap.put("currentProjectStatusTotal",currentProjectStatusTotal); - result.put("currentProjectStatusMap",currentProjectStatusMap);*/ - //设计符合性 List> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList); int designFlowTaskStatusCount = 0; @@ -1984,36 +1958,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> certificationProgressMapList = this.projectTaskInventoryEOMapper.getCertificationProgressStatistics(projectLawsInventoryIdList); - certificationProgressTotal = certificationProgressMapList.stream().filter( - certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString()) != 0 - ).mapToInt(certificationProgress -> Integer.parseInt(certificationProgress.get("certificationProgressCount").toString())).sum(); - - CertificationProgressEnum[] CertificationProgressEnumValues = CertificationProgressEnum.values(); - for (CertificationProgressEnum certificationProgressEnumValue : CertificationProgressEnumValues) { - boolean flag = true; - for (Map map : certificationProgressMapList) { - if(map.get("certificationProgress") != null){ - if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){ - flag = false; - break; - } - } - } - if(flag){ - Map map = new HashMap<>(); - map.put("certificationProgress",certificationProgressEnumValue.getValue()); - map.put("certificationProgressCount",0); - certificationProgressMapList.add(map); - } - } - - certificationProgressMap.put("certificationProgressTotal",certificationProgressTotal); - certificationProgressMap.put("certificationProgressMapList",certificationProgressMapList); - result.put("certificationProgressMap",certificationProgressMap);*/ } QueryWrapper pciQueryWrap = new QueryWrapper<>(); From 522479c105bc090a432a05e235fac1021b2f9a50 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 11 Oct 2023 17:37:35 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AF=BC=E5=87=BA=EF=BC=88=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E7=AE=A1=E7=90=86-=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLibraryStatisticsServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java index fd57d530d..18dcc91c1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java @@ -155,7 +155,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -170,7 +170,8 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati boolean flag = ( StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -197,6 +198,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati List nonComplianceDesignPliEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(data.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -229,7 +231,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()) || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()) || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue()) - || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -244,7 +246,8 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati boolean flag = ( StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue()) - || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) + || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()) +// || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -271,6 +274,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati List nonComplianceVerifyPliEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue()) + || StringUtils.equals(data.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue()) ); return flag; }).collect(Collectors.toList()); From b0f3ba8dc235837863c4253bc76d69abd7256298 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 11:13:13 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA=EF=BC=88?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=89?= =?UTF-8?q?=20=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6=E6=83=85-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=B9=B6=E5=BC=A0=E5=9B=BE=E5=B1=95=E7=A4=BA=E4=B8=AD?= =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 4 +- ...PlatformProjectLibraryBaseServiceImpl.java | 3 +- .../IProjectLibraryStatisticsService.java | 2 + ...ctCertificationInventoryEOServiceImpl.java | 4 +- .../impl/ProjectLibraryBaseServiceImpl.java | 47 ++++++------ .../ProjectLibraryStatisticsServiceImpl.java | 76 ++++++++++++++++++- 6 files changed, 108 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 02f0d6a96..3c6a98c03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -80,6 +80,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; @@ -3489,7 +3490,8 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI notStartedMap.put("taskAffirmStatus",TaskAffirmStatusEnum.NOT_STARTED.getValue()); notStartedMap.put("taskAffirmStatusCount",notStartedCount); - toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); + toConfirmMap.put("taskAffirmStatus", TodoCenterStatusEnum.TO_SUBMIT.getValue()); +// toConfirmMap.put("taskAffirmStatus",TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); toConfirmMap.put("taskAffirmStatusCount",toConfirmCount); acceptedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 8f45a7c6a..ff237b1bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -77,6 +77,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; +import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.top.entity.TopProjectEO; import com.jero.modules.top.service.ITopProjectEOService; @@ -2983,7 +2984,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params); Map prehomoNotStartedMap = (Map) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue()); double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount"); - Map prehomoToConfirmMap = (Map) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); + Map prehomoToConfirmMap = (Map) prehomoMap.get(TodoCenterStatusEnum.TO_SUBMIT.getValue()); double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount"); Map prehomoAcceptedMap = (Map) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java index 8bac94398..c9db860f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java @@ -75,6 +75,8 @@ public interface IProjectLibraryStatisticsService { */ Map getPartCertificationProgressStatisticsGroupByTerritory(List datas, Map params); + Map getPartCertificationProgressStatisticsGroupByTerritoryTemp(List datas, Map params); + /** * 获取认证参数收集-统计信息 * @param datas diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 2bfe78073..50a1033e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -83,6 +83,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; +import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.todoCenter.service.IProcessInfoEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; @@ -3389,7 +3390,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params); Map prehomoNotStartedMap = (Map) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue()); double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount"); - Map prehomoToConfirmMap = (Map) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); + Map prehomoToConfirmMap = (Map) prehomoMap.get(TodoCenterStatusEnum.TO_SUBMIT.getValue()); +// Map prehomoToConfirmMap = (Map) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue()); double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount"); Map prehomoAcceptedMap = (Map) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()); double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount"); @@ -3293,7 +3305,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritory(pciEoList, params); + Map certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritoryTemp(pciEoList, params); Map certificationProgressNotStartMap = (Map)certificationProgressMap.get(CertificationProgressEnum.NOT_START.getValue()); double certificationProgressNotStartAmount = (double) certificationProgressNotStartMap.get("amount"); Map certificationProgressInProgressMap = (Map)certificationProgressMap.get(CertificationProgressEnum.IN_PROGRESS.getValue()); @@ -3302,26 +3314,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressTestFailedMap = (Map)certificationProgressMap.get(CertificationProgressEnum.TEST_FAILED.getValue()); double certificationProgressTestFailedAmount = (double) certificationProgressTestFailedMap.get("amount"); - Map certificationProgressNotSubmitMap = (Map)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue()); - double certificationProgressNotSubmitAmount = (double) certificationProgressNotSubmitMap.get("amount"); - Map certificationProgressSubmitMap = (Map)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue()); - double certificationProgressSubmitAmount = (double) certificationProgressSubmitMap.get("amount"); - Map certificationProgressStoredMap = (Map)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue()); - double certificationProgressStoredAmount = (double) certificationProgressStoredMap.get("amount"); dataRow.createCell(11).setCellValue(certificationProgressNotStartAmount); dataRow.createCell(12).setCellValue(certificationProgressInProgressAmount); dataRow.createCell(13).setCellValue(certificationProgressTestPassedAmount); dataRow.createCell(14).setCellValue(certificationProgressTestFailedAmount); - dataRow.createCell(15).setCellValue(certificationProgressNotSubmitAmount); - dataRow.createCell(16).setCellValue(certificationProgressSubmitAmount); - dataRow.createCell(17).setCellValue(certificationProgressStoredAmount); double certificationProgressCount = certificationProgressNotStartAmount + certificationProgressInProgressAmount - + certificationProgressTestPassedAmount + certificationProgressTestFailedAmount - + certificationProgressNotSubmitAmount + certificationProgressSubmitAmount - + certificationProgressStoredAmount; + + certificationProgressTestPassedAmount + certificationProgressTestFailedAmount; double certificationProgressPercentage = (certificationProgressTestPassedAmount / certificationProgressCount) * 100; String certificationProgressPercentageStr = (certificationProgressPercentage != 0 && (certificationProgressCount !=0 )) ? df.format(certificationProgressPercentage) : "0"; - dataRow.createCell(18).setCellValue(certificationProgressPercentageStr + percentSign); + dataRow.createCell(15).setCellValue(certificationProgressPercentageStr + percentSign); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java index 18dcc91c1..bcd80f318 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java @@ -12,6 +12,7 @@ import com.jero.modules.project.enums.TaskAffirmStatusEnum; import com.jero.modules.project.service.IProjectCertificationInventoryEOService; import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLibraryStatisticsService; +import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -360,6 +361,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati result.put(TaskAffirmStatusEnum.NOT_STARTED.getValue(),notStartedMap); result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap); +// result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),acceptedMap); result.put(TaskAffirmStatusEnum.ACCEPTED.getValue(),acceptedMap); result.put(TaskAffirmStatusEnum.REJECTED.getValue(),rejectedMap); } @@ -436,7 +438,8 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati rejectedMap.put("percentage",rejectedPercentageStr + percentSign); result.put(TaskAffirmStatusEnum.NOT_STARTED.getValue(),notStartedMap); - result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap); +// result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap); + result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),acceptedMap); result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue(),acceptedMap); result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue(),rejectedMap); } @@ -514,7 +517,6 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati } return result; } - @Override public Map getCarCertificationProgressStatisticsGroupByTerritory(List datas, Map params) { Map result = new HashMap<>(); @@ -695,6 +697,76 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati } return result; } + @Override + public Map getPartCertificationProgressStatisticsGroupByTerritoryTemp(List datas, Map params) { + Map result = new HashMap<>(); + if(CollectionUtils.isNotEmpty(datas)){ + Map notStartMap = new HashMap<>(); + Map inProgressMap = new HashMap<>(); + Map testPassedMap = new HashMap<>(); + Map testFailedMap = new HashMap<>(); + + + // 未开始 + List notStartPciEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.NOT_START.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double notStartCount = (double) notStartPciEoList.size(); + double notStartPercentage = (notStartCount / (datas.size())) * 100; + String notStartPercentageStr = notStartPercentage != 0 ? df.format(notStartPercentage) : "0"; + notStartMap.put("amount",notStartCount); + notStartMap.put("percentage",notStartPercentageStr + percentSign); + // 进行中 + List inProgressPciEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue()) + || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double inProgressCount = (double) inProgressPciEoList.size(); + double inProgressPercentage = (inProgressCount / (datas.size())) * 100; + String inProgressPercentageStr = inProgressPercentage != 0 ? df.format(inProgressPercentage) : "0"; + inProgressMap.put("amount",inProgressCount); + inProgressMap.put("percentage",inProgressPercentageStr + percentSign); + // 实验通过 + List testPassedPciEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue()) + || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue()) + || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double testPassedCount = (double) testPassedPciEoList.size(); + double testPassedPercentage = (testPassedCount / (datas.size())) * 100; + String testPassedPercentageStr = testPassedPercentage != 0 ? df.format(testPassedPercentage) : "0"; + testPassedMap.put("amount",testPassedCount); + testPassedMap.put("percentage",testPassedPercentageStr + percentSign); + + // 实验失败 + List testFailedPciEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_FAILED.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double testFailedCount = (double) testFailedPciEoList.size(); + double testFailedPercentage = (testFailedCount / (datas.size())) * 100; + String testFailedPercentageStr = testFailedPercentage != 0 ? df.format(testFailedPercentage) : "0"; + testFailedMap.put("amount",testFailedCount); + testFailedMap.put("percentage",testFailedPercentageStr + percentSign); + + result.put(CertificationProgressEnum.NOT_START.getValue(),notStartMap); + result.put(CertificationProgressEnum.IN_PROGRESS.getValue(),inProgressMap); + result.put(CertificationProgressEnum.TEST_PASSED.getValue(),testPassedMap); + result.put(CertificationProgressEnum.TEST_FAILED.getValue(),testFailedMap); + } + return result; + } @Override public Map getParameterCollectingStatisticsGroupByTerritory(List datas, Map params) { From 4473a4cf043a6ac3a44ac7d932c8c530766416d3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 13:51:29 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=90=9C=E9=9B=86=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IProjectLibraryStatisticsService.java | 2 + .../impl/ProjectLibraryBaseServiceImpl.java | 2 +- .../ProjectLibraryStatisticsServiceImpl.java | 64 ++++++++++++++++++- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java index c9db860f1..4046b8f59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java @@ -84,4 +84,6 @@ public interface IProjectLibraryStatisticsService { * @return */ Map getParameterCollectingStatisticsGroupByTerritory(List datas, Map params); + + Map getParameterCollectingStatisticsGroupByTerritoryExport(List datas, Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0ae3ab0ef..db4ccc29b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -3515,7 +3515,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl params, HSSFSheet sheet, int dataIndex, String key, List pcmEos) { - Map parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,params); + Map parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritoryExport(pcmEos,params); Map notStartMap = (Map) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue()); double notStartAmount = (double) notStartMap.get("amount"); Map collectingMap = (Map) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.COLLECTING.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java index bcd80f318..d5903a0f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java @@ -776,7 +776,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati Map collectingMap = new HashMap<>(); Map submitMap = new HashMap<>(); Map syncReporMap = new HashMap<>(); - + //未发起 List notStartPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue()) @@ -787,7 +787,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati }).collect(Collectors.toList()); double notStartCount = (double) notStartPcmEoList.size(); notStartMap.put("amount",notStartCount); - + //收集中 List collectingPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue()) @@ -799,7 +799,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati }).collect(Collectors.toList()); double collectingCount = (double) collectingPcmEoList.size(); collectingMap.put("amount",collectingCount); - + //已提交 List submitPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue()) @@ -808,7 +808,65 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati }).collect(Collectors.toList()); double submitCount = (double) submitPcmEoList.size(); submitMap.put("amount",submitCount); + //已同步至上报库 + List syncReporPcmEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double syncReporCount = (double) syncReporPcmEoList.size(); + syncReporMap.put("amount",syncReporCount); + result.put(CollectManifestStatisticsStateEnum.NOT_START.getValue(),notStartMap); + result.put(CollectManifestStatisticsStateEnum.COLLECTING.getValue(),collectingMap); + result.put(CollectManifestStatisticsStateEnum.SUBMIT.getValue(),submitMap); + result.put(CollectManifestStatisticsStateEnum.SYNC_REPORT.getValue(),syncReporMap); + } + return result; + } + @Override + public Map getParameterCollectingStatisticsGroupByTerritoryExport(List datas, Map params) { + Map result = new HashMap<>(); + if(CollectionUtils.isNotEmpty(datas)){ + Map notStartMap = new HashMap<>(); + Map collectingMap = new HashMap<>(); + Map submitMap = new HashMap<>(); + Map syncReporMap = new HashMap<>(); + //未发起 + List notStartPcmEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue()) + || StringUtils.equals(data.getState(), CollectManifestStateEnum.SDT_BACK.getValue()) +// || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double notStartCount = (double) notStartPcmEoList.size(); + notStartMap.put("amount",notStartCount); + //收集中 + List collectingPcmEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue()) + || StringUtils.equals(data.getState(),CollectManifestStateEnum.WAIT_SDT.getValue()) + || StringUtils.equals(data.getState(),CollectManifestStateEnum.DRE_BACK.getValue()) + || StringUtils.equals(data.getState(),CollectManifestStateEnum.CERT_BACK.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double collectingCount = (double) collectingPcmEoList.size(); + collectingMap.put("amount",collectingCount); + //已提交 + List submitPcmEoList = datas.stream().filter(data -> { + boolean flag = ( + StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue()) + || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue()) + ); + return flag; + }).collect(Collectors.toList()); + double submitCount = (double) submitPcmEoList.size(); + submitMap.put("amount",submitCount); + //已同步至上报库 List syncReporPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue()) From 4fd2a4b402773b8c6a128b5a65bf35df0b5c735e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 14:23:19 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=88=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=94=B1=E5=BE=85=E7=A1=AE=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationActivity.vue | 8 ++++---- .../components/certificationActivity.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index ef669653b..6e56fc29e 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -118,10 +118,10 @@ status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'List to confirm') { + } else if (res.taskAffirmStatus == 'To submit') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('listToConfirm'), + name: this.$t('toSubmit'), color: '#FDA71C', status: res.taskAffirmStatus }) @@ -163,10 +163,10 @@ status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'List to confirm') { + } else if (res.taskAffirmStatus == 'To submit') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('listToConfirm'), + name: this.$t('toSubmit'), color: '#FDA71C', status: res.taskAffirmStatus }) diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue index d4780313a..2013d4d78 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue @@ -117,10 +117,10 @@ status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'List to confirm') { + } else if (res.taskAffirmStatus == 'To submit') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('listToConfirm'), + name: this.$t('toSubmit'), color: '#FDA71C', status: res.taskAffirmStatus }) @@ -162,10 +162,10 @@ status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'List to confirm') { + } else if (res.taskAffirmStatus == 'To submit') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('listToConfirm'), + name: this.$t('toSubmit'), color: '#FDA71C', status: res.taskAffirmStatus }) From d4c5825cf581bf8403e7c9dd9de969477a6873e6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 14:41:43 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E8=AF=A6?= =?UTF-8?q?=E6=83=85-=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E7=8A=B6=E6=80=81=E7=94=B1=E5=BE=85=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PlatformProjectLibraryBaseServiceImpl.java | 6 ++++-- .../service/impl/ProjectLibraryStatisticsServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index ff237b1bb..5fe52592d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -2854,14 +2854,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl toConfirmPciEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()) From 3ee392f27fc4377f860d7c282508588f1d467f2d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 15:08:18 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AF=BC=E5=87=BA-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86Pre-Homo?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=8A=B6=E6=80=81=E7=94=B1=E5=BE=85?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B9=E4=B8=BA=E5=BE=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index db4ccc29b..ef5926884 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -3147,7 +3147,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl Date: Thu, 12 Oct 2023 15:09:48 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 12 +++++++----- jero-web/src/common/lang/zh-cn.js | 2 ++ .../otaAuthentication/components/detil.vue | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b83a7c3c3..7b510f439 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1933,12 +1933,14 @@ module.exports = { softwarereleasetime:'Software release time', theme:'Theme', influencestatute:'Influence statute', - vdrste:'VDR status', + influencestatuteCN:'Impact CN Homo', + influencestatuteEU:'Impact EU Homo', + vdrste:'VDR Status', impactdescription:'Impact description', - authenticationimpact:'Authentication impact', - impactstatement:'Impact statement', - certificationdeclaration:'Certification declaration', - matchingstate:'Matching state', + authenticationimpact:'Homo Impact', + impactstatement:'Impact Statement', + certificationdeclaration:'Application Submitted', + matchingstate:'Matching State', issuenotice:'Issue notice', applyforrematch:'Apply for rematch', notificationsent:'Is a notification sent?', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a6a08fbe6..653497dc2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3891,6 +3891,8 @@ module.exports = { softwarereleasetime:'软件发布时间', theme:'主题', influencestatute:'影响法规', + influencestatuteCN:'影响法规', + influencestatuteEU:'影响法规', vdrste:'VDR状态', impactdescription:'影响描述', authenticationimpact:'认证影响', diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index 7b48ee6e3..feb8311ff 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -516,7 +516,7 @@ export default { }, { sort: '', - name: this.$t('influencestatute') + '-CN', + name: this.$t('influencestatuteCN'), headFieldCn: '影响法规-CN', headFieldEn: 'Influence statute-CN', field: 'impactCnHomo', @@ -525,7 +525,7 @@ export default { }, { sort: '', - name: this.$t('influencestatute') + '-EU', + name: this.$t('influencestatuteEU'), headFieldCn: '影响法规-EU', headFieldEn: 'Influence statute-EU', field: 'impactEuHomo', @@ -601,7 +601,7 @@ export default { }, { sort: '', - name: this.$t('influencestatute') + '-CN', + name: this.$t('influencestatuteCN'), headFieldCn: '影响法规-CN', headFieldEn: 'Influence statute-CN', field: 'impactCnHomo', @@ -610,7 +610,7 @@ export default { }, { sort: '', - name: this.$t('influencestatute') + '-EU', + name: this.$t('influencestatuteEU'), headFieldCn: '影响法规-EU', headFieldEn: 'Influence statute-EU', field: 'impactEuHomo', From 808d0e3aa17fb7f41c738f4effa10d7511de784b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 12 Oct 2023 16:19:26 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7b510f439..9e234ec69 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1707,7 +1707,7 @@ module.exports = { addfunction:'Add function', controllername:'Controller name', hardwaremanufacturer:'Hardware manufacturer', - softwareversion:'Software version', + softwareversion:'Software Version', returntofill:'Return to fill', thereAreCurrentlyNoRegulationsToHandle:'No regulations to be processed now', certificationSubmission:'Application Submitted', @@ -1928,9 +1928,9 @@ module.exports = { processInitiationOne:'Process Initiation', taskHandlingOne:'Task Handling', taskReview:'Task Review', - softwareversion:'Software version', + softwareversion:'Software Version', softwareplatform:'Software platform', - softwarereleasetime:'Software release time', + softwarereleasetime:'Software Release Time', theme:'Theme', influencestatute:'Influence statute', influencestatuteCN:'Impact CN Homo', @@ -1973,7 +1973,7 @@ module.exports = { Listcreationtime:'List creation time', Chinesecharacters:'The role code cannot enter Chinese characters', alreadyexistssystem:'The role encoding already exists', - releaseType:'releaseType', + releaseType:'Release Type', by:'By', Changeto:'Change to', emptyc:'empty', From ffddd03a4aa89d3c4dfc3a2f74fa5bf14da04bca Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 17:16:48 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=BF=9B=E5=BA=A6sheet=E9=A1=B5=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectStatusBoardServiceImpl.java | 188 ++++++++++-------- 1 file changed, 110 insertions(+), 78 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index d4b7de890..83daf1b74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -15,7 +15,6 @@ import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; import com.jero.modules.cert.collect.service.IParamsCollectManifestHistoryEOService; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService; -import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO; import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl; @@ -840,38 +839,71 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService private HSSFSheet createCorssProjectProgressSheet(HSSFWorkbook workbook, ProjectLibraryBase projectLibraryBase) { String cut = projectLibraryBase.getCut(); String sheetName = "项目进度"; +// String firstTitle = "项目," + +// "法规任务确认," + +// "设计符合性确认," + +// "验证符合性确认," + +// "认证任务确认," + +// "Pre-Homo确认," + +// "认证进度," + +// "参数收集"; +// String secondTitle = "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," + +// "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,设计核查日期," + +// "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,验证核查日期," + +// "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," + +// "未发起,待提交,待审查,审查通过,审查退回,完成度,认证开始日期," + +// "待开始,进行中,实验通过,实验失败,部件报告未提交,部件报告已提交,部件报告已入库,完成度,认证提交时间," + +// "未开始,收集中,已提交,已同步至上报库,完成度,认证提交时间"; String firstTitle = "项目," + "法规任务确认," + - "设计符合性确认," + - "验证符合性确认," + + "设计符合性," + + "验证符合性," + "认证任务确认," + - "Pre-Homo确认," + + "Pre-Homo流程," + "认证进度," + - "参数收集"; - String secondTitle = "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," + - "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,设计核查日期," + - "未发起,待提交,待审查,符合,不符合,待追踪,不涉及,任务终止,完成度,验证核查日期," + - "待发布,待校核,待确认,接受,拒绝,完成度,责任确认日期," + - "未发起,待提交,待审查,审查通过,审查退回,完成度,认证开始日期," + - "待开始,进行中,实验通过,实验失败,部件报告未提交,部件报告已提交,部件报告已入库,完成度,认证提交时间," + - "未开始,收集中,已提交,已同步至上报库,完成度,认证提交时间"; + "参数收集进度"; + String secondTitle = "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," + + "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,设计核查日期," +//去掉不涉及，任务终止 + "任务待确认,结果待提交,结果待审查,符合,不符合,待追踪,完成度,验证核查日期," +//删掉2个 + "清单待发布,任务待发起,任务待确认,责任人接受,责任人拒绝,完成度,责任确认日期," + + "任务待确认,结果待提交,结果待审查,审查通过,审查退回,完成度,认证开始日期," + + "待开始,进行中,实验通过,实验失败,完成度,认证提交时间," +//删掉3个 + "未发起,收集中,已提交,已同步至上报库,完成度,认证提交时间"; + if(com.jero.modules.system.util.StringUtils.equals(cut,CutEnum.EN.getValue())){ sheetName = "Project Progress"; firstTitle = "Project," + "Confirmation of regulatory tasks," + - "Confirmation of design compliance," + - "Verification of compliance confirmation," + + "Design compliance," + + "Verification compliance," + "Certification task confirmation," + - "Pre Homo confirmation," + + "Pre Homo process," + "Certification progress," + - "Parameter collection"; - secondTitle = "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," + - "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Design verification date," + - "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Verification verification date," + - "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," + - "Not initiated,To be submitted,Pending review,Review passed,Review return,Completion degree,Certification start date," + - "To begin,In progress,Experiment passed,Experimental failure,Component report not submitted,Component report submitted,Component report has been stored,Completion degree,Certification submission time," + - "Not started,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time"; + "Parameter collection progress"; + secondTitle = "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," + + "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Design verification date," + + "Task to be confirmed,Results to be submitted,Results to be reviewed,Compliance,Non-compliance,To be tracked,Completion degree,Verification verification date," + + "List to be released,Task to be initiated,Task to be confirmed,Assignee accept,Assignee refuse,Completion degree,Responsibility confirmation date," + + "Task to be confirmed,Results to be submitted,Results to be reviewed,Review passed,Review return,Completion degree,Certification start date," + + "To begin,In progress,Experiment passed,Experimental failure,Completion degree,Certification submission time," + + "Not initiated,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time"; + + // firstTitle = "Project," + +// "Confirmation of regulatory tasks," + +// "Confirmation of design compliance," + +// "Verification of compliance confirmation," + +// "Certification task confirmation," + +// "Pre Homo confirmation," + +// "Certification progress," + +// "Parameter collection"; + // secondTitle = "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," + +// "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Design verification date," + +// "Not initiated,To be submitted,Pending review,Conform to,Non Conformance,To be tracked,Not involved,Task Termination,Completion degree,Verification verification date," + +// "To be released,To be verified,To be confirmed,Accept,Refuse,Completion degree,Responsibility confirmation date," + +// "Not initiated,To be submitted,Pending review,Review passed,Review return,Completion degree,Certification start date," + +// "To begin,In progress,Experiment passed,Experimental failure,Component report not submitted,Component report submitted,Component report has been stored,Completion degree,Certification submission time," + +// "Not started,Collecting,Submitted,Synchronized to the upper report library,Completion degree,Certification submission time"; + } HSSFSheet sheet = workbook.createSheet(sheetName); @@ -879,17 +911,17 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService sheet.addMergedRegion(region1); CellRangeAddress region6 = new CellRangeAddress(0, 0, 1, 7); sheet.addMergedRegion(region6); - CellRangeAddress region7 = new CellRangeAddress(0, 0, 8, 17); + CellRangeAddress region7 = new CellRangeAddress(0, 0, 8, 15); sheet.addMergedRegion(region7); - CellRangeAddress region8 = new CellRangeAddress(0, 0, 18, 27); + CellRangeAddress region8 = new CellRangeAddress(0, 0, 16, 23); sheet.addMergedRegion(region8); - CellRangeAddress region9 = new CellRangeAddress(0, 0, 28, 34); + CellRangeAddress region9 = new CellRangeAddress(0, 0, 24, 30); sheet.addMergedRegion(region9); - CellRangeAddress region10 = new CellRangeAddress(0, 0, 35, 41); + CellRangeAddress region10 = new CellRangeAddress(0, 0, 31, 37); sheet.addMergedRegion(region10); - CellRangeAddress region11 = new CellRangeAddress(0, 0, 42, 50); + CellRangeAddress region11 = new CellRangeAddress(0, 0, 38, 43); sheet.addMergedRegion(region11); - CellRangeAddress region12 = new CellRangeAddress(0, 0, 51, 56); + CellRangeAddress region12 = new CellRangeAddress(0, 0, 44, 49); sheet.addMergedRegion(region12); String[] firstTitleArr = firstTitle.split(","); @@ -900,7 +932,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService CellStyle cellStyleTitle = workbook.createCellStyle(); cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 cellStyleTitle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 - for (int i = 0; i <= 56; i++){ + for (int i = 0; i <= 49; i++){ sheet.setColumnWidth(i, 4000); Cell firstRowCell = firstRow.createCell(i); firstRowCell.setCellStyle(cellStyleTitle); @@ -910,15 +942,15 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService firstRowCell.setCellValue(firstTitleArr[1]); }else if(i == 8){ firstRowCell.setCellValue(firstTitleArr[2]); - }else if(i == 18){ + }else if(i == 16){ firstRowCell.setCellValue(firstTitleArr[3]); - }else if(i == 28){ + }else if(i == 24){ firstRowCell.setCellValue(firstTitleArr[4]); - }else if(i == 35){ + }else if(i == 31){ firstRowCell.setCellValue(firstTitleArr[5]); - }else if(i == 42){ + }else if(i == 38){ firstRowCell.setCellValue(firstTitleArr[6]); - }else if(i == 51){ + }else if(i == 44){ firstRowCell.setCellValue(firstTitleArr[7]); } if(i >= 1){ @@ -1024,13 +1056,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService dataRow.createCell(11).setCellValue(designCompliance); dataRow.createCell(12).setCellValue(designNonCompliance); dataRow.createCell(13).setCellValue(designToBeTracked); - dataRow.createCell(14).setCellValue(designNotInvolved); - dataRow.createCell(15).setCellValue(designTaskTermination); - cell = dataRow.createCell(16); +// dataRow.createCell(14).setCellValue(designNotInvolved); +// dataRow.createCell(15).setCellValue(designTaskTermination); + cell = dataRow.createCell(14); cell.setCellStyle(style); cell.setCellType(CellType.NUMERIC); cell.setCellValue(Double.valueOf(designPercentage.replace("%",""))/100); - dataRow.createCell(17).setCellValue(designDeadlineStr); + dataRow.createCell(15).setCellValue(designDeadlineStr); Map verifyMap = this.projectLawsInventoryEOService.groupByVerifyStatus(pliEos); Map verifyMapProjectScheduleExportMap = (Map) verifyMap.get("projectScheduleExportMap"); @@ -1044,19 +1076,19 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination"); double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count"); String verifyPercentage = (String) verifyMapProjectScheduleExportMap.get("percentage"); - dataRow.createCell(18).setCellValue(verifyNotStart); - dataRow.createCell(19).setCellValue(verifyToBeSubmitted); - dataRow.createCell(20).setCellValue(verifyToBeReviewed); - dataRow.createCell(21).setCellValue(verifyCompliance); - dataRow.createCell(22).setCellValue(verifyNonCompliance); - dataRow.createCell(23).setCellValue(verifyToBeTracked); - dataRow.createCell(24).setCellValue(verifyNotInvolved); - dataRow.createCell(25).setCellValue(verifyTaskTermination); - cell = dataRow.createCell(26); + dataRow.createCell(16).setCellValue(verifyNotStart); + dataRow.createCell(17).setCellValue(verifyToBeSubmitted); + dataRow.createCell(18).setCellValue(verifyToBeReviewed); + dataRow.createCell(19).setCellValue(verifyCompliance); + dataRow.createCell(20).setCellValue(verifyNonCompliance); + dataRow.createCell(21).setCellValue(verifyToBeTracked); +// dataRow.createCell(24).setCellValue(verifyNotInvolved); +// dataRow.createCell(25).setCellValue(verifyTaskTermination); + cell = dataRow.createCell(22); cell.setCellStyle(style); cell.setCellType(CellType.NUMERIC); cell.setCellValue(Double.valueOf(verifyPercentage.replace("%",""))/100); - dataRow.createCell(27).setCellValue(verifyDeadlineStr); + dataRow.createCell(23).setCellValue(verifyDeadlineStr); List pciEos = pciEoList.stream().filter(pciEo -> StringUtils.equals(pciEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList()); Map rzRwqrMap = this.projectCertificationInventoryEOService.groupByFGRwqrStatus(pciEos); @@ -1067,16 +1099,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService double rzRqqrAccept = (double) rzRwqrProjectScheduleExportMap.get("accept"); double rzRqqrRefuse = (double) rzRwqrProjectScheduleExportMap.get("refuse"); String rzRqqrPercentage = (String) rzRwqrProjectScheduleExportMap.get("percentage"); - dataRow.createCell(28).setCellValue(rzRqqrToBeReleased); - dataRow.createCell(29).setCellValue(rzRqqrToBeVerified); - dataRow.createCell(30).setCellValue(rzRqqrToBeConfirmed); - dataRow.createCell(31).setCellValue(rzRqqrAccept); - dataRow.createCell(32).setCellValue(rzRqqrRefuse); - cell = dataRow.createCell(33); + dataRow.createCell(24).setCellValue(rzRqqrToBeReleased); + dataRow.createCell(25).setCellValue(rzRqqrToBeVerified); + dataRow.createCell(26).setCellValue(rzRqqrToBeConfirmed); + dataRow.createCell(27).setCellValue(rzRqqrAccept); + dataRow.createCell(28).setCellValue(rzRqqrRefuse); + cell = dataRow.createCell(29); cell.setCellStyle(style); cell.setCellType(CellType.NUMERIC); cell.setCellValue(Double.valueOf(rzRqqrPercentage.replace("%",""))/100); - dataRow.createCell(34).setCellValue(legalTaskConfirmationStr); + dataRow.createCell(30).setCellValue(legalTaskConfirmationStr); Map preHomoMap = this.projectCertificationInventoryEOService.groupByPreHomoStatus(pciEos); Map preHomoProjectScheduleExportMap = (Map) preHomoMap.get("projectScheduleExportMap"); @@ -1086,16 +1118,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService double preHomoAccept = (double) preHomoProjectScheduleExportMap.get("accept"); double preHomoRefuse = (double) preHomoProjectScheduleExportMap.get("refuse"); String preHomoPercentage = (String) preHomoProjectScheduleExportMap.get("percentage"); - dataRow.createCell(35).setCellValue(preHomoNotStartCount); - dataRow.createCell(36).setCellValue(preHomoToBeSubmittedCount); - dataRow.createCell(37).setCellValue(preHomoToBeReviewedCount); - dataRow.createCell(38).setCellValue(preHomoAccept); - dataRow.createCell(39).setCellValue(preHomoRefuse); - cell = dataRow.createCell(40); + dataRow.createCell(31).setCellValue(preHomoNotStartCount); + dataRow.createCell(32).setCellValue(preHomoToBeSubmittedCount); + dataRow.createCell(33).setCellValue(preHomoToBeReviewedCount); + dataRow.createCell(34).setCellValue(preHomoAccept); + dataRow.createCell(35).setCellValue(preHomoRefuse); + cell = dataRow.createCell(36); cell.setCellStyle(style); cell.setCellType(CellType.NUMERIC); cell.setCellValue(Double.valueOf(preHomoPercentage.replace("%",""))/100); - dataRow.createCell(41).setCellValue(attestationStartTimeStr); + dataRow.createCell(37).setCellValue(attestationStartTimeStr); Map certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos); Map certificationProgressMapProjectScheduleExportMap = (Map) certificationProgressMap.get("projectScheduleExportMap"); @@ -1108,18 +1140,18 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount"); // String certificationProgressCount = (String) certificationProgressMapProjectScheduleExportMap.get("count"); String certificationProgressPercentage = (String) certificationProgressMapProjectScheduleExportMap.get("percentage"); - dataRow.createCell(42).setCellValue(certificationProgressNotStartCount); - dataRow.createCell(43).setCellValue(certificationProgressInProgressCount); - dataRow.createCell(44).setCellValue(certificationProgressTestPassedCount); - dataRow.createCell(45).setCellValue(certificationProgressTestFailedCount); - dataRow.createCell(46).setCellValue(certificationProgressNotSubmitCount); - dataRow.createCell(47).setCellValue(certificationProgressReportSubmitCount); - dataRow.createCell(48).setCellValue(certificationProgressStoredCount); - cell = dataRow.createCell(49); + dataRow.createCell(38).setCellValue(certificationProgressNotStartCount); + dataRow.createCell(39).setCellValue(certificationProgressInProgressCount); + dataRow.createCell(40).setCellValue(certificationProgressTestPassedCount); + dataRow.createCell(41).setCellValue(certificationProgressTestFailedCount); +// dataRow.createCell(46).setCellValue(certificationProgressNotSubmitCount); +// dataRow.createCell(47).setCellValue(certificationProgressReportSubmitCount); +// dataRow.createCell(48).setCellValue(certificationProgressStoredCount); + cell = dataRow.createCell(42); cell.setCellStyle(style); cell.setCellType(CellType.NUMERIC); cell.setCellValue(Double.valueOf(certificationProgressPercentage.replace("%",""))/100); - dataRow.createCell(50).setCellValue(certificationSubmissionStr); + dataRow.createCell(43).setCellValue(certificationSubmissionStr); List pmEos = pmEoList.stream().filter(pmEo -> { @@ -1164,15 +1196,15 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100; parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0"; } - dataRow.createCell(51).setCellValue(notStartAmount); - dataRow.createCell(52).setCellValue(collectingAmount); - dataRow.createCell(53).setCellValue(submitAmount); - dataRow.createCell(54).setCellValue(syncReporAmount); - cell = dataRow.createCell(55); + dataRow.createCell(44).setCellValue(notStartAmount); + dataRow.createCell(45).setCellValue(collectingAmount); + dataRow.createCell(46).setCellValue(submitAmount); + dataRow.createCell(47).setCellValue(syncReporAmount); + cell = dataRow.createCell(48); cell.setCellStyle(style); cell.setCellType(CellType.NUMERIC); cell.setCellValue(Double.valueOf(parameterCollectingPercentageStr)/100); - dataRow.createCell(56).setCellValue(certificationSubmissionStr); + dataRow.createCell(49).setCellValue(certificationSubmissionStr); dataIndex ++; log.info("11111处理"+ dataIndex +"个项目消耗时间：" + (System.currentTimeMillis() - startTime)); From b4b70564a97aa59afe9e6344c6cd7ea95dd4d0b8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 Oct 2023 18:02:10 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7=EF=BC=8C=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 79 ++++++++++--------- .../impl/ProjectStatusBoardServiceImpl.java | 10 +-- 2 files changed, 45 insertions(+), 44 deletions(-) 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 564b436ea..b1ba0d549 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 @@ -11361,8 +11361,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designNotInvolved = pliEos.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue()) - ); - return flag; - }).collect(Collectors.toList()); +// List designNotInvolved = pliEos.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); - List taskTermination = pliEos.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue()) - ); - return flag; - }).collect(Collectors.toList()); +// List taskTermination = pliEos.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); notStartCount = designNotStart.size(); toBeSubmittedCount = designToBeSubmitted.size(); @@ -11434,9 +11434,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl verifyNotInvolved = pliEos.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue()) - ); - return flag; - }).collect(Collectors.toList()); +// List verifyNotInvolved = pliEos.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); - List taskTermination = pliEos.stream().filter(pliEo -> { - boolean flag = ( - StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue()) - ); - return flag; - }).collect(Collectors.toList()); +// List taskTermination = pliEos.stream().filter(pliEo -> { +// boolean flag = ( +// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); notStartCount = verifyNotStart.size(); toBeSubmittedCount = verifyToBeSubmitted.size(); @@ -11545,10 +11546,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 13 Oct 2023 10:14:45 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=AF=BC=E5=87=BA=EF=BC=88=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8CPre-Homo?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 60 ++++++++++--------- .../ProjectLibraryStatisticsServiceImpl.java | 3 +- .../impl/ProjectStatusBoardServiceImpl.java | 6 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 50a1033e7..a1522a076 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -6563,9 +6563,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl inProgressPciEoList = pciEos.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.IN_PROGRESS.getValue()) + || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -6594,6 +6595,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl testPassedPciEoList = pciEos.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.TEST_PASSED.getValue()) + || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue()) + || StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -6609,33 +6612,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl notSubmitPciEoList = pciEos.stream().filter(data -> { - boolean flag = ( - StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue()) - ); - return flag; - }).collect(Collectors.toList()); - notSubmitCount = (double) notSubmitPciEoList.size(); +// List notSubmitPciEoList = pciEos.stream().filter(data -> { +// boolean flag = ( +// StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); +// notSubmitCount = (double) notSubmitPciEoList.size(); // 部件报告已提交 - List reportSubmitPciEoList = pciEos.stream().filter(data -> { - boolean flag = ( - StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue()) - ); - return flag; - }).collect(Collectors.toList()); - reportSubmitCount = (double) reportSubmitPciEoList.size(); +// List reportSubmitPciEoList = pciEos.stream().filter(data -> { +// boolean flag = ( +// StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); +// reportSubmitCount = (double) reportSubmitPciEoList.size(); // 部件报告已入库 - List storedPciEoList = pciEos.stream().filter(data -> { - boolean flag = ( - StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue()) - ); - return flag; - }).collect(Collectors.toList()); - storedCount = (double) storedPciEoList.size(); +// List storedPciEoList = pciEos.stream().filter(data -> { +// boolean flag = ( +// StringUtils.equals(data.getCertificationProgress(),CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue()) +// ); +// return flag; +// }).collect(Collectors.toList()); +// storedCount = (double) storedPciEoList.size(); - count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount; +// count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount + notSubmitCount + reportSubmitCount + storedCount; + count = notStartCount + inProgressCount + testPassedCount + testFailedCount + testFailedCount; if(count<=0){ percentage = 0; }else { @@ -6648,9 +6652,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl submitPcmEoList = datas.stream().filter(data -> { boolean flag = ( StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue()) + || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue()) ); return flag; }).collect(Collectors.toList()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 375232f46..cf38c9ff3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -1135,9 +1135,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService double certificationProgressInProgressCount = (double) certificationProgressMapProjectScheduleExportMap.get("inProgressCount"); double certificationProgressTestPassedCount = (double) certificationProgressMapProjectScheduleExportMap.get("testPassedCount"); double certificationProgressTestFailedCount = (double) certificationProgressMapProjectScheduleExportMap.get("testFailedCount"); - double certificationProgressNotSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("notSubmitCount"); - double certificationProgressReportSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("reportSubmitCount"); - double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount"); +// double certificationProgressNotSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("notSubmitCount"); +// double certificationProgressReportSubmitCount = (double) certificationProgressMapProjectScheduleExportMap.get("reportSubmitCount"); +// double certificationProgressStoredCount = (double) certificationProgressMapProjectScheduleExportMap.get("storedCount"); // String certificationProgressCount = (String) certificationProgressMapProjectScheduleExportMap.get("count"); String certificationProgressPercentage = (String) certificationProgressMapProjectScheduleExportMap.get("percentage"); dataRow.createCell(38).setCellValue(certificationProgressNotStartCount); From 198742388964cb810808df617bc031e1b1fe334b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 13 Oct 2023 10:23:16 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9ota=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9e234ec69..93e296293 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -513,7 +513,7 @@ module.exports = { ProcessName: 'Process Name', ProcessType: 'Process Type', AddProcess: 'Add Process', - RelatedItems: 'Project', + RelatedItems: 'Relevant Projects', Sponsor: 'Creator', CurrentProcessor: 'Current Operator', LastProcessor: 'Last Operator', @@ -1873,7 +1873,7 @@ module.exports = { technicalAssessmentOfRegulations:'Regulation Technical Assessment', legalOpinionCollection:'Opinion Collection on Regulation', authenticationParameterCollectionData:'Homo Parameter Collection Data', - phoneRelatedItems:'Project', + phoneRelatedItems:'Relevant Projects', listHeading:'List Title', phoneVersionNumber:'Version', node:'Node', @@ -1959,13 +1959,13 @@ module.exports = { Reasonforreturn:'Reason for return', maintenanceTemplate:'Maintenance template', UserFeedback:'User Feedback', - Relevantlawsregulations:'Relevant laws and regulations', - Problemstate:'Problem state', + Relevantlawsregulations:'Relevant Regulations', + Problemstate:'Issue State', descriptions:'Descriptions', documents:'Documents', - examineapproveevidence:'Examine and approve evidence', + examineapproveevidence:'Approval', conculsion:'Conculsion', - progresstracking:'Progress Tracking', + progresstracking:'Progress Track', Fileupload:'File upload', Addresslink:'Address link', Problemanagement:'Problem management', From 2b21e65506f31ad76b2251d1278228cea57b522c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 13 Oct 2023 11:16:14 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=BB=9F=E8=AE=A1=E5=9B=BE=E7=BB=9F=E8=AE=A1=E9=A2=86?= =?UTF-8?q?=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLibraryStatisticsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java index 16cfa30a5..7f87f897c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java @@ -439,7 +439,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati result.put(TaskAffirmStatusEnum.NOT_STARTED.getValue(),notStartedMap); // result.put(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue(),toConfirmMap); - result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),acceptedMap); + result.put(TodoCenterStatusEnum.TO_SUBMIT.getValue(),toConfirmMap); result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue(),acceptedMap); result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue(),rejectedMap); } From 645a031785d49be92f253fbb38bd6fd533ce7f86 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 13 Oct 2023 13:50:45 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=BA=93-=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=AE=A4=E8=AF=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/certificationActivity.vue | 4 ++-- .../components/certificationActivity.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationActivity.vue b/jero-web/src/views/projectManagement/components/certificationActivity.vue index 6e56fc29e..b19a1314f 100644 --- a/jero-web/src/views/projectManagement/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/components/certificationActivity.vue @@ -118,10 +118,10 @@ status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'To submit') { + } else if (res.taskAffirmStatus == 'List to confirm') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('toSubmit'), + name: this.$t('listToConfirm'), color: '#FDA71C', status: res.taskAffirmStatus }) diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue index 2013d4d78..a2da1a598 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue @@ -117,10 +117,10 @@ status: res.taskAffirmStatus }) color.push('#00B3BE') - } else if (res.taskAffirmStatus == 'To submit') { + } else if (res.taskAffirmStatus == 'List to confirm') { data.push({ value: res.taskAffirmStatusCount, - name: this.$t('toSubmit'), + name: this.$t('listToConfirm'), color: '#FDA71C', status: res.taskAffirmStatus })