修改校验

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

@@ -723,40 +723,47 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //质量问题表添加数据
-        qualityProblem.setProjectId(verify.getProjectId());
-        qualityProblem.setSubmitDate(new Date());
-        Calendar calendar = Calendar.getInstance();
-        // 获取当前年
-        int year = calendar.get(Calendar.YEAR);
-        // 获取当前月
-        int month = calendar.get(Calendar.MONTH) + 1;
-        // 获取当前日
-        int day = calendar.get(Calendar.DATE);
-        StringBuffer stringBuffer = new StringBuffer( );
-        stringBuffer.append(year).append(month).append(day);
-        String date = stringBuffer.toString( );
-        //获取当前的值并自增
-        int newNum  = atomicNum.incrementAndGet( );
 
-        String code =String.format(date+"-WT-"+"%05d", newNum);
-        qualityProblem.setCode(code);
-        String stage = StageEnum.getDetailVerifyNameMap.get(jsonObject.getString("stage"));//获取效验阶段
-        qualityProblem.setGenerateStage(stage);
-        qualityProblem.setProblemDescribe(stage+"不通过");
-        //获取智能监检表id(项目id和检验时间)
-        Verify verify2=null;
-        if (ValidationUtil.isEmpty(jsonObject.getString("manyCode"))) {
-             verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), jsonObject.getString("code"), null);
-        } else {
-            verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), null, jsonObject.getString("manyCode"));
-        }
-        if(!ValidationUtil.isEmpty(verify2)) {
-            Long sequenceNbr = verify2.getSequenceNbr();
-            qualityProblem.setStageVerifyId(sequenceNbr);
+        if (StageEnum.焊接工艺.getStage().equals(verify.getStage())  || StageEnum.敷设质量.getStage().equals(verify.getStage())
+        || StageEnum.管道耐压.getStage().equals(verify.getStage()) || StageEnum.定位.getStage().equals(verify.getStage())||
+                StageEnum.回填.getStage().equals(verify.getStage())) {
+            //质量问题表添加数据
+            qualityProblem.setProjectId(verify.getProjectId());
+            qualityProblem.setSubmitDate(new Date());
+            Calendar calendar = Calendar.getInstance();
+            // 获取当前年
+            int year = calendar.get(Calendar.YEAR);
+            // 获取当前月
+            int month = calendar.get(Calendar.MONTH) + 1;
+            // 获取当前日
+            int day = calendar.get(Calendar.DATE);
+            StringBuffer stringBuffer = new StringBuffer( );
+            stringBuffer.append(year).append(month).append(day);
+            String date = stringBuffer.toString( );
+            //获取当前的值并自增
+            int newNum  = atomicNum.incrementAndGet( );
+
+            String code =String.format(date+"-WT-"+"%05d", newNum);
+            qualityProblem.setCode(code);
+            String stage = StageEnum.getDetailVerifyNameMap.get(jsonObject.getString("stage"));//获取效验阶段
+            qualityProblem.setGenerateStage(stage);
+            qualityProblem.setProblemDescribe(stage+"不通过");
+            //获取智能监检表id(项目id和检验时间)
+            Verify verify2=null;
+            if (ValidationUtil.isEmpty(jsonObject.getString("manyCode"))) {
+                verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), jsonObject.getString("code"), null);
+            } else {
+                verify2 = verifyMapper.getOnes(verify.getProjectId(), verify.getVerifyTime().toLocaleString(), null, jsonObject.getString("manyCode"));
+            }
+            if(!ValidationUtil.isEmpty(verify2)) {
+                Long sequenceNbr = verify2.getSequenceNbr();
+                qualityProblem.setStageVerifyId(sequenceNbr);
+            }
+            qualityProblemService.save(qualityProblem);
+            problemInitiationService.start(qualityProblem);
+
         }
-        qualityProblemService.save(qualityProblem);
-        problemInitiationService.start(qualityProblem);
+
     }
     /**   cpp
      * 校验成功需要添加的数据