修改

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

@@ -12,10 +12,7 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.*;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.SuperviseRuleMapper;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.VerifyMapper;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.*;
 import com.yeejoin.amos.boot.module.ugp.api.service.IWeldService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -70,6 +67,9 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
     @Autowired
     VerifyServiceImpl verifyService;
 
+    @Autowired
+    QualityProblemMapper qualityProblemMapper;
+
 
 //    Logger logger = LoggerFactory.getLogger(WeldServiceImpl.class);
 
@@ -547,25 +547,33 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
     }
 
     public String updateWeldes(String projectId, JSONObject obj) {
+        String sequenceNbrProblem = obj.getString("sequenceNbr");
+        if (ValidationUtil.isEmpty(sequenceNbrProblem)) {
+            return "no";
+        }
+        QualityProblem qualityProblem = qualityProblemMapper.selectById(sequenceNbrProblem);
+        Verify verify = verifyMapper.selectById(qualityProblem.getStageVerifyId());
+        if (ValidationUtil.isEmpty(verify) ) {
+            return "no";
+        }
+        if (ValidationUtil.isEmpty(verify.getCode()) ) {
+            return "no";
+        }
         LambdaQueryWrapper<Weld> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
         objectLambdaQueryWrapper.eq(!ValidationUtil.isEmpty(projectId),Weld::getProjectId,projectId)
-                .eq(!ValidationUtil.isEmpty(obj) && !ValidationUtil.isEmpty(obj.getString("code")),Weld::getCode,obj.getString("code"));
+                .eq(Weld::getCode,verify.getCode());
         Weld weld = weldMapper.selectOne(objectLambdaQueryWrapper);
-        List list = (List)obj.get("codeList");
-        if (!ValidationUtil.isEmpty(list) && !ValidationUtil.isEmpty(list.size()==1)) {
-            weld.setBinding((String)list.get(0));
-        }
-        if (!ValidationUtil.isEmpty(list) && !ValidationUtil.isEmpty(list.size()>1)) {
-            String codeLists="";
-            for (int i = 0; i < list.size(); i++) {
-                if (i == 0) {
-                    codeLists +=(String) list.get(i);
-                }
-                codeLists += ","+(String) list.get(i);
-            }
-            weld.setBinding(codeLists);
+        String st = obj.getString("code");
+        if ( ValidationUtil.isEmpty(st)) {
+            return "no";
         }
-        int i = weldMapper.updateById(weld);
+        LambdaQueryWrapper<Weld> objectLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper1.eq(!ValidationUtil.isEmpty(projectId),Weld::getProjectId,projectId)
+                .eq(Weld::getCode,st);
+        Weld weld1 = weldMapper.selectOne(objectLambdaQueryWrapper1);
+        weld1.setBinding(weld.getCode());
+        weld1.setRepairMark(2);
+        int i = weldMapper.updateById(weld1);
         return i==1?"Ok":"no";
     }
 }
\ No newline at end of file