对管材效验，添加敷设监检，焊口敷设位置标定，效验公共接口代码进行优化

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

@@ -191,7 +191,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
     }
 
-    private String 效验状态 = "复审中";
+    private String 效验状态 = "已存在";
 
     private final String 问题编码="-WT";
 
@@ -199,7 +199,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
      * 公共效验接口
      */
     public String effect(JSONObject jsonObject,Integer 效验数量,Boolean i) {
-
+//        String 效验状态 = "已存在";
         Verify verify = new Verify();
         //添加筛选条件
         LambdaQueryWrapper<Verify> wrapper = new LambdaQueryWrapper<>();
@@ -240,7 +240,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
                     效验状态 = "已通过";
                     this.save(verify);
                 } else {
-                    int math= (int) (Math.random()*10000);
+                    int math= (int) ((Math.random() * 9 + 1)*1000);
                     verify.setStatus(VerifyEnum.未通过.getStatus());
                     this.save(verify);
                     LambdaQueryWrapper<Verify> wrapperVerify=new LambdaQueryWrapper<>();
@@ -277,7 +277,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
     public String weldEffect(JSONObject jsonObject) {
 
-        effect(jsonObject,焊前效验数量,true);
+
 
 //        Verify verify = new Verify();
 //        //添加筛选条件
@@ -341,7 +341,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 //
 //        }
 //
-        return 效验状态;
+        return   effect(jsonObject,焊前效验数量,true);
 
     }
     /**
@@ -349,7 +349,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
      */
     private final Integer 管道耐压前效验数量 = 4;
     public String materialEffect(JSONObject jsonObject){
-        effect(jsonObject,管道耐压前效验数量,true);
+
 
 //        Verify verify = new Verify();
 //        //添加筛选条件
@@ -410,7 +410,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 //
 //        }
 //
-        return 效验状态;
+        return   effect(jsonObject,管道耐压前效验数量,true);
     }
     /**
      * 敷设效验
@@ -418,7 +418,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
     private final Integer 敷设效验数量 = 5;
     public String layEffect(JSONObject jsonObject){
 
-        effect(jsonObject,敷设效验数量,true);
+
 //
 //        Verify verify = new Verify();
 //        //添加筛选条件
@@ -479,7 +479,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 //
 //        }
 
-        return 效验状态;
+        return  effect(jsonObject,敷设效验数量,false);
     }
 
     /**
@@ -488,7 +488,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
     private final Integer 定位效验数量 = 6;
     public String positionEffect(JSONObject jsonObject){
 
-        effect(jsonObject,定位效验数量,true);
+
 
 //        Verify verify = new Verify();
 //        //添加筛选条件
@@ -550,7 +550,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 //
 //        }
 
-        return 效验状态;
+        return effect(jsonObject,定位效验数量,true);
     }
 
 }
\ No newline at end of file