ugp 修改 建设单位审查处理方案

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/StageEnum.java

@@ -15,18 +15,19 @@ import java.util.Map;
 @AllArgsConstructor
 public enum  StageEnum {
 
-    焊前人员("焊前确定","STAFF","人员"),
-    焊前设备("焊前确定","EQUIPMENT","设备"),
-    焊前管材质量("焊前确定","BEFORE-WELDING","管材"),
-    焊接工艺("工艺确定","CRAFT","工艺"),
-    管道耐压("耐压确定","VOLTAGE","耐压"),
-    敷设质量("敷设确定","LAY","敷设"),
-    定位("定位确定","LOTCATION","定位"),
-    回填("回填确定","BACKFILL","回填");
+    焊前人员("焊前确定","STAFF","人员","人员校验"),
+    焊前设备("焊前确定","EQUIPMENT","设备","设备校验"),
+    焊前管材质量("焊前确定","BEFORE-WELDING","管材","管材校验"),
+    焊接工艺("工艺确定","CRAFT","工艺","工艺校验"),
+    管道耐压("耐压确定","VOLTAGE","耐压","耐压校验"),
+    敷设质量("敷设确定","LAY","敷设","敷设校验"),
+    定位("定位确定","LOTCATION","定位","定位校验"),
+    回填("回填确定","BACKFILL","回填","回填校验");
 
     private String name;
     private String stage;
     private String verifyName;
+    private String detailVerifyName;
 
 
 
@@ -34,10 +35,12 @@ public enum  StageEnum {
 
     public static Map<String,String> getStageByNameMap = new HashMap<>();
     public static Map<String,String> getStatusByVerifyNameMap = new HashMap<>();
+    public static Map<String,String> getDetailVerifyNameMap = new HashMap<>();
     static {
         for(StageEnum enums:StageEnum.values()){
             getStageByNameMap.put(enums.stage,enums.name);
             getStatusByVerifyNameMap.put(enums.stage, enums.verifyName);
+            getDetailVerifyNameMap.put(enums.verifyName, enums.detailVerifyName);
         }
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/QualityProblemServiceImpl.java

@@ -65,6 +65,9 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
         page = qualityProblemMapper.getItems(page,qualityProblemDto,projectIds);
         List<QualityProblemDto> qualityProblemDtoList = page.getRecords();
         for (QualityProblemDto qualityProblemDto1 : qualityProblemDtoList) {
+            if(!ValidationUtil.isEmpty(qualityProblemDto1.getLevel())){
+                qualityProblemDto1.setLevel(ProblemTypeEnum.map.get(qualityProblemDto1.getLevel()));
+            }
             if(!ValidationUtil.isEmpty(qualityProblemDto1.getChargerPersonId())){
                 if(!ValidationUtil.isEmpty(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()))){
                     qualityProblemDto1.setChargerPersonName(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()).getBizOrgName());
@@ -108,6 +111,8 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
             //执行一次
             problemInitiationService.execute(quality.getInstanceId(),quality,"1");
         }else if (ProblemProcessEnum.审查处理方案.getName().equals(quality.getStatus())){
+            quality.setHandingOpinion(qualityProblem.getHandingOpinion());
+            quality.setHandingOpinionDesc(qualityProblem.getHandingOpinionDesc());
             //执行一次
             problemInitiationService.execute(quality.getInstanceId(),quality,"1");
         }else if(ProblemProcessEnum.提交整改书.getName().equals(quality.getStatus())) {
@@ -138,8 +143,6 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
                 problemInitiationService.execute(quality.getInstanceId(),quality,"1");
             }
         }else if(ProblemProcessEnum.审查整改过程.getName().equals(quality.getStatus())) {
-            quality.setHandingOpinion(qualityProblem.getHandingOpinion());
-            quality.setHandingOpinionDesc(qualityProblem.getHandingOpinionDesc());
             quality.setReviewStatus(qualityProblem.getReviewStatus());
             if(quality.getReviewStatus()){
                 if(ProblemTypeEnum.一般问题.getName().equals(quality.getLevel())){