Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

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<ParamsManifestEOMap
                 for (SysDictItem dictItem : dutyTerritoryList) {
                     // 计算数量
                     notStartNumber += listAll.stream().filter(e -> (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(); // 已同步上报库的参数项 数量
                 }
 

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());

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<Platf
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10157,7 +10157,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10174,6 +10175,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				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<Platf
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10229,7 +10231,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10246,6 +10249,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();

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;
@@ -1007,7 +1008,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 	@Override
 	public List<ProjectLibraryBase> queryById(String id,String cut) {
 		List<ProjectLibraryBase> records = platformProjectLibraryBaseMapper.queryById(id);
-		disposeData(records,"",false);
+		disposeData(records,cut,false);
 		//目标市场数据字典
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		for(ProjectLibraryBase projectLibraryBase: records){
@@ -1537,6 +1538,15 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					projectLibraryBase.setUrlList(urlList);
 				}
 			}
+			//目标市场
+			Map<String,Object> 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 +1625,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			taskToConfirmMap.put("count",taskAffirmStatusCount);
 			result.put("taskToConfirmMap",taskToConfirmMap);
 
-			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
-			/*List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
-			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
-			for (CurrentProjectStatusEnum value : values) {
-				Map<String,Object> map = new HashMap<>();
-				map.put("color",value.getValue());
-				currentProjectStatusMapList.add(map);
-			}
-			int currentProjectStatusTotal;
-			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
-
-			for (Map<String, Object> map : currentProjectStatusMapList) {
-				List<ConditionAssessmentEO> 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<Map<String,Object>> designComplianceMapList = this.platformProjectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
@@ -1664,36 +1649,6 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
 			verifyComplianceMap.put("count",verifyFlowTaskStatusCount);
 			result.put("verifyComplianceMap",verifyComplianceMap);
-
-			//认证进度统计
-			/*int certificationProgressTotal;
-			List<Map<String,Object>> 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<String, Object> map : certificationProgressMapList) {
-					if(map.get("certificationProgress") != null){
-						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
-							flag = false;
-							break;
-						}
-					}
-				}
-				if(flag){
-					Map<String,Object> 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<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
@@ -2899,14 +2854,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 				"Pre-Homo";
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
-				"未发起,待确认,审查通过,审查退回,完成度";
+				"未发起,待提交,审查通过,审查退回,完成度";
+//				"未发起,待确认,审查通过,审查退回,完成度";
 		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			sheetName = "Certification Activity Management";
 			firstTitle = "Authentication task confirmation," +
 					"Pre-Homo";
 			secondTitle = "Area of responsibility (level 1)," +
 					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
-					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion";
+					"Not launched,To submit,Review of the adoption,Review return,Degree of completion";
+//					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion";
 		}
 		HSSFSheet sheet = workbook.createSheet(sheetName);
 
@@ -3029,7 +2986,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 		Map<String, Object> prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params);
 		Map<String, Object> prehomoNotStartedMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 		double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount");
-		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TodoCenterStatusEnum.TO_SUBMIT.getValue());
 		double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount");
 		Map<String, Object> prehomoAcceptedMap = (Map<String, Object>) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
 		double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java

@@ -75,6 +75,8 @@ public interface IProjectLibraryStatisticsService {
      */
     Map<String, Object> getPartCertificationProgressStatisticsGroupByTerritory(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params);
 
+    Map<String, Object> getPartCertificationProgressStatisticsGroupByTerritoryTemp(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params);
+
     /**
      * 获取认证参数收集-统计信息
      * @param datas
@@ -82,4 +84,6 @@ public interface IProjectLibraryStatisticsService {
      * @return
      */
     Map<String, Object> getParameterCollectingStatisticsGroupByTerritory(List<ParamsCollectManifestEO> datas, Map<String, Object> params);
+
+    Map<String, Object> getParameterCollectingStatisticsGroupByTerritoryExport(List<ParamsCollectManifestEO> datas, Map<String, Object> params);
 }

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<Proj
 		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());
@@ -6561,9 +6563,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		double inProgressCount = 0;    // 进行中
 		double testPassedCount = 0;    // 实验通过
 		double testFailedCount = 0;    // 实验失败
-		double notSubmitCount = 0;     // 部件报告未上传
-		double reportSubmitCount = 0;  // 部件报告已上传
-		double storedCount = 0;        // 部件报告已入库
+//		double notSubmitCount = 0;     // 部件报告未上传
+//		double reportSubmitCount = 0;  // 部件报告已上传
+//		double storedCount = 0;        // 部件报告已入库
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -6583,6 +6585,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			List<ProjectCertificationInventoryEO> 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());
@@ -6592,6 +6595,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			List<ProjectCertificationInventoryEO> 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());
@@ -6607,33 +6612,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			testFailedCount = (double) testFailedPciEoList.size();
 
 			// 部件报告未提交
-			List<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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 {
@@ -6646,9 +6652,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		projectScheduleExportMap.put("inProgressCount",inProgressCount);
 		projectScheduleExportMap.put("testPassedCount",testPassedCount);
 		projectScheduleExportMap.put("testFailedCount",testFailedCount);
-		projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
-		projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
-		projectScheduleExportMap.put("storedCount",storedCount);
+//		projectScheduleExportMap.put("notSubmitCount",notSubmitCount);
+//		projectScheduleExportMap.put("reportSubmitCount",reportSubmitCount);
+//		projectScheduleExportMap.put("storedCount",storedCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);

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<ProjectLawsIn
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10128,7 +10128,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				boolean flag = (
 						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//						|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10145,6 +10146,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				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<ProjectLawsIn
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
 				);
 				return flag;
 			}).count();
@@ -10200,7 +10202,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
 								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())
-								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
+								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
+//								|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -10217,6 +10220,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			nonComplianceCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
 				boolean flag = (
 						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.INCONFORMITY.getValue())
+						|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TO_TRACK.getValue())
 				);
 				return flag;
 			}).count();
@@ -11357,8 +11361,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-		double notInvolvedCount = 0;   // 不涉及
-		double taskTerminationCount = 0;   // 任务终止
+//		double notInvolvedCount = 0;   // 不涉及
+//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -11410,19 +11414,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> designNotInvolved = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> 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();
@@ -11430,9 +11434,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			complianceCount = designCompliance.size();
 			nonComplianceCount = designNonCompliance.size();
 			toBeTrackedCount = designToBeTracked.size();
-			notInvolvedCount = designNotInvolved.size();
-			taskTerminationCount = taskTermination.size();
-			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+//			notInvolvedCount = designNotInvolved.size();
+//			taskTerminationCount = taskTermination.size();
+//			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			// 计算百分比
 			if(count <= 0){
 				percentage = 0;
@@ -11448,8 +11453,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectScheduleExportMap.put("compliance",complianceCount);
 		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
 		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
-		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
-		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+//		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+//		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);
@@ -11468,8 +11473,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		double complianceCount = 0;    // 符合
 		double nonComplianceCount = 0; // 不符合
 		double toBeTrackedCount = 0;   // 待追踪
-		double notInvolvedCount = 0;   // 不涉及
-		double taskTerminationCount = 0;   // 任务终止
+//		double notInvolvedCount = 0;   // 不涉及
+//		double taskTerminationCount = 0;   // 任务终止
 		double count = 0;
 		// 计算百分比
 		double percentage = 0;
@@ -11521,19 +11526,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				return flag;
 			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> verifyNotInvolved = pliEos.stream().filter(pliEo -> {
+//				boolean flag = (
+//						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.UNINVOLVED.getValue())
+//				);
+//				return flag;
+//			}).collect(Collectors.toList());
 
-			List<ProjectLawsInventoryEO> taskTermination = pliEos.stream().filter(pliEo -> {
-				boolean flag = (
-						StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TERMINATION_OF_TASK.getValue())
-				);
-				return flag;
-			}).collect(Collectors.toList());
+//			List<ProjectLawsInventoryEO> 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();
@@ -11541,10 +11546,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			complianceCount = verifyCompliance.size();
 			nonComplianceCount = verifyNonCompliance.size();
 			toBeTrackedCount = verifyToBeTracked.size();
-			notInvolvedCount = verifyNotInvolved.size();
-			taskTerminationCount = taskTermination.size();
-
-			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+//			notInvolvedCount = verifyNotInvolved.size();
+//			taskTerminationCount = taskTermination.size();
+//			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount + taskTerminationCount;
+			count = notStartCount + toBeSubmittedCount + toBeReviewedCount + complianceCount + nonComplianceCount + toBeTrackedCount;
 			if(count <= 0){
 				percentage = 0;
 			}else{
@@ -11560,8 +11565,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		projectScheduleExportMap.put("compliance",complianceCount);
 		projectScheduleExportMap.put("nonCompliance",nonComplianceCount);
 		projectScheduleExportMap.put("toBeTracked",toBeTrackedCount);
-		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
-		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
+//		projectScheduleExportMap.put("notInvolved",notInvolvedCount);
+//		projectScheduleExportMap.put("taskTermination",taskTerminationCount);
 		projectScheduleExportMap.put("count",count);
 		projectScheduleExportMap.put("percentage",percentageStr + percentSign);
 		result.put("projectScheduleExportMap",projectScheduleExportMap);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -75,6 +75,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 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;
@@ -1935,32 +1936,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			taskToConfirmMap.put("count",taskAffirmStatusCount);
 			result.put("taskToConfirmMap",taskToConfirmMap);
 
-			//当前项目状态统计   获取一个 最差的结果 统计的数据 就是studio看到的数据。
-			/*List<Map<String,Object>> currentProjectStatusMapList = new ArrayList<>();
-			CurrentProjectStatusEnum[] values = CurrentProjectStatusEnum.values();
-			for (CurrentProjectStatusEnum value : values) {
-				Map<String,Object> map = new HashMap<>();
-				map.put("color",value.getValue());
-				currentProjectStatusMapList.add(map);
-			}
-			int currentProjectStatusTotal;
-			List<ConditionAssessmentEO> projectStatusAssessList = this.conditionAssessmentEOService.getProjectStatusAssessList(projectLawsInventoryIdList);
-
-			for (Map<String, Object> map : currentProjectStatusMapList) {
-				List<ConditionAssessmentEO> 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<Map<String,Object>> designComplianceMapList = this.projectLawsInventoryEOService.getDesignComplianceStatistice(projectLawsInventoryEOList);
 			int designFlowTaskStatusCount = 0;
@@ -1984,36 +1959,6 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			verifyComplianceMap.put("verifyComplianceMapList",verifyComplianceMapList);
 			verifyComplianceMap.put("count",verifyFlowTaskStatusCount);
 			result.put("verifyComplianceMap",verifyComplianceMap);
-
-			//认证进度统计
-			/*int certificationProgressTotal;
-			List<Map<String,Object>> 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<String, Object> map : certificationProgressMapList) {
-					if(map.get("certificationProgress") != null){
-						if(StringUtils.equals(certificationProgressEnumValue.getValue(),map.get("certificationProgress").toString())){
-							flag = false;
-							break;
-						}
-					}
-				}
-				if(flag){
-					Map<String,Object> 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<ProjectCertificationInventoryEO> pciQueryWrap = new QueryWrapper<>();
@@ -3202,8 +3147,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				"认证进度";
 		String secondTitle = "责任领域（一级）," +
 				"未发起,待确认,接受,拒绝,完成度," +
-				"未发起,待确认,审查通过,审查退回,完成度," +
-				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
+				"未发起,待提交,审查通过,审查退回,完成度," +
+				"未开始,进行中,实验通过,实验失败,完成度";
+//		String secondTitle = "责任领域（一级）," +
+//				"未发起,待确认,接受,拒绝,完成度," +
+//				"未发起,待确认,审查通过,审查退回,完成度," +
+//				"未开始,进行中,实验通过,实验失败,部件报告未上传,部件报告已上传,部件报告已入库,完成度";
 		if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 			sheetName = "Certification Activity Management";
 			firstTitle = "Authentication task confirmation," +
@@ -3211,8 +3160,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 					"Certification progress";
 			secondTitle = "Area of responsibility (level 1)," +
 					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
-					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
-					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
+					"Not launched,To submit,Review of the adoption,Review return,Degree of completion," +
+					"Not started,In progress,Experiment passed,Experiment failed,Degree of completion";
+//			secondTitle = "Area of responsibility (level 1)," +
+//					"Not launched,To be confirmed,Accept,Refuse,Degree of completion," +
+//					"Not launched,To be confirmed,Review of the adoption,Review return,Degree of completion," +
+//					"Not started,In progress,Experiment passed,Experiment failed,Parts report not uploaded,Parts report uploaded,Parts report in stock,Degree of completion";
 		}
 		HSSFSheet sheet = workbook.createSheet(sheetName);
 
@@ -3221,10 +3174,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		sheet.addMergedRegion(region1);
 		CellRangeAddress region2 = new CellRangeAddress(0, 0, 6, 10);
 		sheet.addMergedRegion(region2);
-		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
+		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 15);
+//		CellRangeAddress region3 = new CellRangeAddress(0, 0, 11, 18);
 		sheet.addMergedRegion(region3);
-		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
-		sheet.addMergedRegion(region4);
+//		CellRangeAddress region4 = new CellRangeAddress(0, 0, 19, 23);
+//		sheet.addMergedRegion(region4);
 
 		String[] firstTitleArr = firstTitle.split(",");
 		String[] secondTitleArr = secondTitle.split(",");
@@ -3233,7 +3187,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		CellStyle cellStyleTitle = workbook.createCellStyle();
 		cellStyleTitle.setAlignment(HorizontalAlignment.CENTER);
-		for (int i = 0; i <= 18; i++){
+		for (int i = 0; i <= 15; i++){
 			sheet.setColumnWidth(i, 3500);
 			Cell firstRowCell = firstRow.createCell(i);
 			firstRowCell.setCellStyle(cellStyleTitle);
@@ -3243,9 +3197,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				firstRowCell.setCellValue(firstTitleArr[1]);
 			}else if(i==11){
 				firstRowCell.setCellValue(firstTitleArr[2]);
-			}else if(i==19){
-				firstRowCell.setCellValue(firstTitleArr[3]);
 			}
+//			else if(i==19){
+//				firstRowCell.setCellValue(firstTitleArr[3]);
+//			}
 			Cell secondRowCell = secondRow.createCell(i);
 			secondRowCell.setCellValue(secondTitleArr[i]);
 		}
@@ -3334,7 +3289,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		Map<String, Object> prehomoMap = this.projectLibraryStatisticsService.getPrehomoStatisticeGroupByTerritory(pciEoList, params);
 		Map<String, Object> prehomoNotStartedMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.NOT_STARTED.getValue());
 		double prehomoNotStartedAmount = (double) prehomoNotStartedMap.get("amount");
-		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
+		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TodoCenterStatusEnum.TO_SUBMIT.getValue());
+//		Map<String, Object> prehomoToConfirmMap = (Map<String, Object>) prehomoMap.get(TaskAffirmStatusEnum.LIST_TO_CONFIRM.getValue());
 		double prehomoToConfirmAmount = (double) prehomoToConfirmMap.get("amount");
 		Map<String, Object> prehomoAcceptedMap = (Map<String, Object>) prehomoMap.get(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
 		double prehomoAcceptedAmount = (double) prehomoAcceptedMap.get("amount");
@@ -3349,7 +3305,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String prehomoPercentageStr = (prehomoPercentage != 0 && (prehomoCount !=0 )) ? df.format(prehomoPercentage) : "0";
 		dataRow.createCell(10).setCellValue(prehomoPercentageStr + percentSign);
 
-		Map<String, Object> certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritory(pciEoList, params);
+		Map<String, Object> certificationProgressMap = this.projectLibraryStatisticsService.getPartCertificationProgressStatisticsGroupByTerritoryTemp(pciEoList, params);
 		Map<String, Object> certificationProgressNotStartMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.NOT_START.getValue());
 		double certificationProgressNotStartAmount = (double) certificationProgressNotStartMap.get("amount");
 		Map<String, Object> certificationProgressInProgressMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.IN_PROGRESS.getValue());
@@ -3358,26 +3314,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		double certificationProgressTestPassedAmount = (double) certificationProgressTestPassedMap.get("amount");
 		Map<String, Object> certificationProgressTestFailedMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.TEST_FAILED.getValue());
 		double certificationProgressTestFailedAmount = (double) certificationProgressTestFailedMap.get("amount");
-		Map<String, Object> certificationProgressNotSubmitMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue());
-		double certificationProgressNotSubmitAmount = (double) certificationProgressNotSubmitMap.get("amount");
-		Map<String, Object> certificationProgressSubmitMap = (Map<String, Object>)certificationProgressMap.get(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue());
-		double certificationProgressSubmitAmount = (double) certificationProgressSubmitMap.get("amount");
-		Map<String, Object> certificationProgressStoredMap = (Map<String, Object>)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);
 	}
 
 	/**
@@ -3570,7 +3515,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	 * @param pcmEos
 	 */
 	private void exportParameterCollectingSetData(Map<String, Object> params, HSSFSheet sheet, int dataIndex, String key, List<ParamsCollectManifestEO> pcmEos) {
-		Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,params);
+		Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritoryExport(pcmEos,params);
 		Map<String, Object> notStartMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue());
 		double notStartAmount = (double) notStartMap.get("amount");
 		Map<String, Object> collectingMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.COLLECTING.getValue());

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;
@@ -155,7 +156,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 +171,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 +199,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             List<ProjectLawsInventoryEO> 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 +232,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 +247,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 +275,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             List<ProjectLawsInventoryEO> 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());
@@ -356,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);
         }
@@ -391,7 +397,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             notStartedMap.put("amount",notStartedCount);
             notStartedMap.put("percentage",notStartedPercentageStr + percentSign);
 
-            // 待确认
+            // 待提交
             List<ProjectCertificationInventoryEO> toConfirmPciEoList = datas.stream().filter(data -> {
                 boolean flag = (
                             StringUtils.equals(data.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
@@ -432,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(),toConfirmMap);
             result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue(),acceptedMap);
             result.put(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue(),rejectedMap);
         }
@@ -510,7 +517,6 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
         }
         return result;
     }
-
     @Override
     public Map<String, Object> getCarCertificationProgressStatisticsGroupByTerritory(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params) {
         Map<String, Object> result = new HashMap<>();
@@ -691,6 +697,76 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
         }
         return result;
     }
+    @Override
+    public Map<String, Object> getPartCertificationProgressStatisticsGroupByTerritoryTemp(List<ProjectCertificationInventoryEO> datas, Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(datas)){
+            Map<String,Object> notStartMap = new HashMap<>();
+            Map<String,Object> inProgressMap = new HashMap<>();
+            Map<String,Object> testPassedMap = new HashMap<>();
+            Map<String,Object> testFailedMap = new HashMap<>();
+
+
+            // 未开始
+            List<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<ProjectCertificationInventoryEO> 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<String, Object> getParameterCollectingStatisticsGroupByTerritory(List<ParamsCollectManifestEO> datas, Map<String, Object> params) {
@@ -700,18 +776,18 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             Map<String,Object> collectingMap = new HashMap<>();
             Map<String,Object> submitMap = new HashMap<>();
             Map<String,Object> syncReporMap = new HashMap<>();
-
+            //未发起
             List<ParamsCollectManifestEO> 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())
+//                                || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
                 );
                 return flag;
             }).collect(Collectors.toList());
             double notStartCount = (double) notStartPcmEoList.size();
             notStartMap.put("amount",notStartCount);
-
+            //收集中
             List<ParamsCollectManifestEO> collectingPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue())
@@ -723,16 +799,75 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
             }).collect(Collectors.toList());
             double collectingCount = (double) collectingPcmEoList.size();
             collectingMap.put("amount",collectingCount);
-
+            //已提交
             List<ParamsCollectManifestEO> 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<ParamsCollectManifestEO> 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<String, Object> getParameterCollectingStatisticsGroupByTerritoryExport(List<ParamsCollectManifestEO> datas, Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(datas)){
+            Map<String,Object> notStartMap = new HashMap<>();
+            Map<String,Object> collectingMap = new HashMap<>();
+            Map<String,Object> submitMap = new HashMap<>();
+            Map<String,Object> syncReporMap = new HashMap<>();
+            //未发起
+            List<ParamsCollectManifestEO> 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<ParamsCollectManifestEO> 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<ParamsCollectManifestEO> 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<ParamsCollectManifestEO> syncReporPcmEoList = datas.stream().filter(data -> {
                 boolean flag = (
                         StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue())

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){
@@ -1014,8 +1046,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double designCompliance = (double) designMapProjectScheduleExportMap.get("compliance");
             double designNonCompliance = (double) designMapProjectScheduleExportMap.get("nonCompliance");
             double designToBeTracked = (double) designMapProjectScheduleExportMap.get("toBeTracked");
-            double designNotInvolved = (double) designMapProjectScheduleExportMap.get("notInvolved");
-            double designTaskTermination = (double) designMapProjectScheduleExportMap.get("taskTermination");
+//            double designNotInvolved = (double) designMapProjectScheduleExportMap.get("notInvolved");
+//            double designTaskTermination = (double) designMapProjectScheduleExportMap.get("taskTermination");
             // double designCount = (double) designMapProjectScheduleExportMap.get("count");
             String designPercentage = (String) designMapProjectScheduleExportMap.get("percentage");
             dataRow.createCell(8).setCellValue(designNotStart);
@@ -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<String,Object> verifyMap = this.projectLawsInventoryEOService.groupByVerifyStatus(pliEos);
             Map<String,Object> verifyMapProjectScheduleExportMap = (Map<String, Object>) verifyMap.get("projectScheduleExportMap");
@@ -1040,23 +1072,23 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             double verifyCompliance = (double) verifyMapProjectScheduleExportMap.get("compliance");
             double verifyNonCompliance = (double) verifyMapProjectScheduleExportMap.get("nonCompliance");
             double verifyToBeTracked = (double) verifyMapProjectScheduleExportMap.get("toBeTracked");
-            double verifyNotInvolved = (double) verifyMapProjectScheduleExportMap.get("notInvolved");
-            double verifyTaskTermination = (double) verifyMapProjectScheduleExportMap.get("taskTermination");
-            double verifyCount = (double) verifyMapProjectScheduleExportMap.get("count");
+//            double verifyNotInvolved = (double) verifyMapProjectScheduleExportMap.get("notInvolved");
+//            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<ProjectCertificationInventoryEO> pciEos = pciEoList.stream().filter(pciEo -> StringUtils.equals(pciEo.getProjectLibraryId(), plbEo.getId())).collect(Collectors.toList());
             Map<String,Object> 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<String,Object> preHomoMap = this.projectCertificationInventoryEOService.groupByPreHomoStatus(pciEos);
             Map<String,Object> preHomoProjectScheduleExportMap = (Map<String, Object>) 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<String,Object> certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos);
             Map<String,Object> certificationProgressMapProjectScheduleExportMap = (Map<String, Object>) certificationProgressMap.get("projectScheduleExportMap");
@@ -1103,23 +1135,23 @@ 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(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<ParamsManifestEO> 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));

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',
@@ -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',
@@ -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',
@@ -1928,17 +1928,19 @@ 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',
-  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?',
@@ -1957,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',
@@ -1971,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',

jero-web/src/common/lang/zh-cn.js

@@ -3891,6 +3891,8 @@ module.exports = {
   softwarereleasetime:'软件发布时间',
   theme:'主题',
   influencestatute:'影响法规',
+  influencestatuteCN:'影响法规',
+  influencestatuteEU:'影响法规',
   vdrste:'VDR状态',
   impactdescription:'影响描述',
   authenticationimpact:'认证影响',

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',

jero-web/src/views/projectManagement/components/certificationActivity.vue

@@ -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
               })

jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationActivity.vue

@@ -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
               })