焊口编码代码修改

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

@@ -96,12 +96,12 @@ public class WeldController extends BaseController {
      * @param current 每页大小
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "焊口信息表分页查询", notes = "焊口信息表分页查询")
     public ResponseModel<Page<WeldDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size) {
-        return ResponseHelper.buildResponse(weldServiceImpl.queryForWeldPage(current,size));
+        return ResponseHelper.buildResponse(weldServiceImpl.queryForWeldPage(current, size));
     }
 
     /**

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

@@ -63,13 +63,13 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
 
             QueryWrapper<Project> wrapperUnit = new QueryWrapper<>();
             wrapperUnit.eq("installation_unit_id", weldDto.getInstallCompany());
-            Project project1 = projectMapper.selectOne(wrapperUnit);
-            weldDto.setInstallationUnit(project1.getInstallationUnit());
-            weldDto.setCodingStatus(WeldCodeEnum.map.get(weldDto.getCodingStatus()));
-            weldDto.setCodingMethod(WeldMethodEnum.map.get(weldDto.getCodingMethod()));
+            List<Project> projects = projectMapper.selectList(wrapperUnit);
+            for (Project project1 : projects) {
+                weldDto.setInstallationUnit(project1.getInstallationUnit());
+                weldDto.setCodingStatus(WeldCodeEnum.map.get(weldDto.getCodingStatus()));
+                weldDto.setCodingMethod(WeldMethodEnum.map.get(weldDto.getCodingMethod()));
+            }
         }
-
-
         return weldDtoPage;
 
     }
@@ -133,8 +133,6 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
                 welds.add(weld);
             }
             saveBatch(welds);
-
-
         }