WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目状态看板-导出（法规任务确认，设计符合性，验证符合性）

Browse Source
This commit is contained in:
zhn
2023-10-12 18:02:10 +08:00
parent ffddd03a4a
commit b4b70564a9
2 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+40 -39
View File
@@ -11361,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;
@@ -11414,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();
@@ -11434,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;
@@ -11452,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);
@@ -11472,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;
@@ -11525,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();
@@ -11545,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{
@@ -11564,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/ProjectStatusBoardServiceImpl.java
+5 -5
View File
@@ -1046,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);
@@ -1072,9 +1072,9 @@ 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(16).setCellValue(verifyNotStart);
dataRow.createCell(17).setCellValue(verifyToBeSubmitted);