优化检验责任单位及监检状态 接口

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

@@ -181,7 +181,6 @@ public class WeldController extends BaseController {
         return ResponseHelper.buildResponse(weldServiceImpl.lookCode(projectId));
     }
 
-
     /**
      * 通过项目id获取焊口智能监验信息
 
@@ -194,8 +193,11 @@ public class WeldController extends BaseController {
         return ResponseHelper.buildResponse(weldServiceImpl.selectStatus(projectId,code));
     }
 
+    /**
+     *      检验责任单位及监检状态
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @ApiOperation(httpMethod = "GET", value = "焊口智能监验信息", notes = "焊口智能监验信息")
+    @ApiOperation(httpMethod = "GET", value = "检验责任单位", notes = "检验责任单位")
     @GetMapping(value = "/selectDept")
     public ResponseModel<WeldDto> selectDept(String projectId){
         return ResponseHelper.buildResponse(weldServiceImpl.selectDept(projectId));

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

@@ -296,7 +296,6 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
         WeldDto weldDtos = new WeldDto();
         if(!ValidationUtil.isEmpty(project.getInstallRegionCode())){
             SuperviseRule superviseRule = superviseRuleMapper.selectOne( wrapper1.eq(SuperviseRule::getAdminRegionCode,project.getInstallRegionCode()));
-//            LambdaQueryWrapper<OrgUsr> orgUsrLambdaQueryWrapper = new LambdaQueryWrapper<>();
             OrgUsr orgUsr = orgService.getOrgUsrById(String.valueOf(superviseRule.getSuperviseDeptId()));
             weldDtos.setSuperviseDept(orgUsr.getBizOrgName());
         }
@@ -306,14 +305,12 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
                 .orderByDesc(ProjectInitiation::getRecDate);
         List<ProjectInitiation> projectInitiations = projectInitiationService.list(wrapper2);
         for(ProjectInitiation projectInitiation:projectInitiations){
+            String context = projectInitiation.getContext();
+            JSONObject jsonObject = (JSONObject) JSONObject.parse(context);
             if(ProjectInitiationEnum.监检员分配.getName().equals(projectInitiation.getTaskName())){
-                String context = projectInitiation.getContext();
-                JSONObject jsonObject = (JSONObject) JSONObject.parse(context);
                 weldDtos.setInsPerson(jsonObject.getString("insPerson"));
             }
             if(ProjectInitiationEnum.监检科室分配.getName().equals(projectInitiation.getTaskName())){
-                String contexts = projectInitiation.getContext();
-                JSONObject jsonObject = (JSONObject) JSONObject.parse(contexts);
                 weldDtos.setInsDep(jsonObject.getString("insDep"));
             }
         }