项目状态进度--认证进度

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

@@ -7,6 +7,7 @@ import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectTaskInventoryEO;
+import com.jero.modules.project.enums.CertificationProgressEnum;
 import com.jero.modules.project.enums.CurrentProjectStatusEnum;
 import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
 import com.jero.modules.project.enums.ReviewResultEnum;
@@ -142,7 +143,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     }
                 }
 
-                //2. 认证进度(不涉及/待开始/进行中/实验失败/实验通过)
+
 
 
                 //3. 清单确认状态(未发起,待确认,接收,拒绝)
@@ -194,7 +195,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 String design = "";
                 String pre = "";
                 String verify = "";
+                String certificationProgress = "";
                 if(projectTaskInventoryEOS.size() != 0){
+                    //设计
                     int designToBeConfirmed = 0;//设计待确认
                     int designConformity = 0;//设计符合
                     int designInconformity = 0;//设计不符合
@@ -202,6 +205,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     int designUninvolved = 0;//设计不涉及
                     int designTerminationOfTask = 0;//设计任务终止
 
+                    //pre
                     int preToBeConfirmed = 0;//pre待确认
                     int preConformity = 0;//pre符合
                     int preInconformity = 0;//pre不符合
@@ -209,6 +213,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     int preUninvolved = 0;//pre不涉及
                     int preTerminationOfTask = 0;//pre任务终止
 
+                    //验证
                     int verifyToBeConfirmed = 0;//验证待确认
                     int verifyConformity = 0;//验证符合
                     int verifyInconformity = 0;//验证不符合
@@ -216,6 +221,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     int verifyUninvolved = 0;//验证不涉及
                     int verifyTerminationOfTask = 0;//验证任务终止
 
+                    //认证进度
+                    int na = 0;
+                    int notStart = 0;
+                    int inProgress = 0;
+                    int testFailed = 0;
+                    int testPassed = 0;
+
                     for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOS) {
                         //设计符合性流程-任务状态
                         String designFlowTaskStatus = projectTaskInventoryEO.getDesignFlowTaskStatus();
@@ -223,6 +235,24 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                         String prehomoFlowTaskStatus = projectTaskInventoryEO.getPrehomoFlowTaskStatus();
                         //verify_flow_task_status
                         String verifyFlowTaskStatus = projectTaskInventoryEO.getVerifyFlowTaskStatus();
+                        //认证进度
+                        String certificationProgressTemp = projectTaskInventoryEO.getCertificationProgress();
+
+                        //2. 认证进度(不涉及/待开始/进行中/实验失败/实验通过)
+                        if(StringUtils.isNotBlank(certificationProgressTemp)){
+                            if(CertificationProgressEnum.NA.getValue().equals(certificationProgressTemp)){
+                                na++;
+                            }else if(CertificationProgressEnum.NOT_START.getValue().equals(certificationProgressTemp)){
+                                notStart++;
+                            }else if(CertificationProgressEnum.IN_PROGRESS.getValue().equals(certificationProgressTemp)){
+                                inProgress++;
+                            }else if(CertificationProgressEnum.TEST_FAILED.getValue().equals(certificationProgressTemp)){
+                                testFailed++;
+                            }else if(CertificationProgressEnum.TEST_PASSED.getValue().equals(certificationProgressTemp)){
+                                testPassed++;
+                            }
+                        }
+
 
                         //5. 设计符合性确认(待确认/符合/不符合/待追踪/不涉及/任务终止)
                         if(StringUtils.isNotBlank(designFlowTaskStatus)){
@@ -273,11 +303,12 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                             }
                         }
                     }
-
+                    certificationProgress = na+"/"+notStart+"/"+inProgress+"/"+testFailed+"/"+testPassed;
                     design = designToBeConfirmed+"/"+designConformity+"/"+designInconformity+"/"+designToTrack+"/"+designUninvolved+"/"+designTerminationOfTask;
                     pre = preToBeConfirmed+"/"+preConformity+"/"+preInconformity+"/"+preToTrack+"/"+preUninvolved+"/"+preTerminationOfTask;
                     verify = verifyToBeConfirmed+"/"+verifyConformity+"/"+verifyInconformity+"/"+verifyToTrack+"/"+verifyUninvolved+"/"+verifyTerminationOfTask;
                 }
+                map.put("certificationProgress",certificationProgress);//认证进度
                 map.put("design",design);//设计符合性确认
                 map.put("pre",pre);//PreHomo确认
                 map.put("verify",verify);//验证符合性确认