增加焊口修复接口和焊口进度列表修改

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WeldDto.java

@@ -128,4 +128,6 @@ public class WeldDto  extends BaseDto {
  private Integer cut;
  private String binding;
 
+ private Integer str;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WeldController.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.WeldServiceImpl;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -192,7 +193,17 @@ public class WeldController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查看焊口编码", notes = "查看焊口编码")
     @GetMapping(value = "/weldInfos")
     public ResponseModel<IPage<WeldDto>> getWeldInfoByProjectId(long current,long size,String projectId, WeldDto weldDto) {
-        return ResponseHelper.buildResponse(weldServiceImpl.getWeldInfoByProjectId(current,size,projectId,weldDto));
+        IPage<WeldDto> weldInfoByProjectId = weldServiceImpl.getWeldInfoByProjectId(current, size, projectId, weldDto);
+        if (!ValidationUtil.isEmpty(weldDto) &&  !ValidationUtil.isEmpty(weldDto.getStr()) && weldDto.getStr() == 1) {
+            List<WeldDto> collect = weldInfoByProjectId.getRecords().stream().filter(t -> t.getStatus() == 1).collect(Collectors.toList());
+            weldInfoByProjectId.setRecords(collect);
+            int totals=0;
+            if (!ValidationUtil.isEmpty(collect)) {
+                totals=collect.size();
+            }
+            weldInfoByProjectId.setTotal(totals);
+        }
+        return ResponseHelper.buildResponse(weldInfoByProjectId);
     }
 
     /**
@@ -265,12 +276,25 @@ public class WeldController extends BaseController {
     public ResponseModel<List<ProjectDto>> getWeldListByLocation(@RequestBody Object obj,boolean isCraft){
         return ResponseHelper.buildResponse(weldServiceImpl.getWeldListByLocation(obj,isCraft));
     }
-    /**焊口修复标识更新*/
+    /**焊口切除更新*/
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/updateWeldRepairMark")
-    @ApiOperation(httpMethod = "POST", value = "焊口修复标识更新", notes = "焊口修复标识更新")
+    @ApiOperation(httpMethod = "POST", value = "焊口切除更新", notes = "焊口切除更新")
     public ResponseModel<List<Map<String, String>>> updateWeldRepairMark(@RequestParam("projectId") String projectId,  @RequestBody List<String> weldCode){
         return ResponseHelper.buildResponse(weldServiceImpl.updateWeldRepairMark(projectId,weldCode));
     }
 
+    /**焊口修复更新*/
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/updateWeldes")
+    @ApiOperation(httpMethod = "POST", value = "焊口修复更新", notes = "焊口修复更新")
+    public ResponseModel<String> updateWeldes(@RequestParam("projectId") String projectId,     @RequestBody JSONObject obj){
+        return ResponseHelper.buildResponse(weldServiceImpl.updateWeldes(projectId,obj));
+    }
+
+
+
+
+
+
 }

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

@@ -246,6 +246,9 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         return weldPage;
     }
 
+
+
+
     public IPage<WeldDto> getWeldInfoByProjectId(long current,long size,String projectId, WeldDto weldDto){
         IPage<Weld> weldPage = lookCode(current,size,projectId,weldDto);
         List<WeldDto> weldDtos = getWeldVerify(weldPage);
@@ -324,6 +327,11 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         return weldDtos;
     }
 
+
+
+
+
+
     public void getWeldWapper(LambdaQueryWrapper<Weld> wapper,WeldDto weldDto){
         if(!ValidationUtil.isEmpty(weldDto.getCode())){
             wapper.eq(Weld::getCode,weldDto.getCode());
@@ -537,4 +545,27 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         });
         return lists;
     }
+
+    public String updateWeldes(String projectId, JSONObject obj) {
+        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"));
+        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);
+        }
+        int i = weldMapper.updateById(weld);
+        return i==1?"Ok":"no";
+    }
 }
\ No newline at end of file