修改申请码获取

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -19,19 +19,17 @@
         tzjia.application_date,
         tzjia.accept_date,
         tzjia.inspection_charge_phone,
-        tui.name as  inspectionChargePerson,
         tbei.use_unit AS applicationUnitName,
         tbei1.use_unit AS inspectionUnitName,
         tzjia.status,
         cdd2.NAME AS statusName,
         tzjia.next_execute_ids as nextExecuteIds,
         tzjia.promoter,
-        tzjia.create_user_id
-        FROM
+        tzjia.create_user_id,
+        (select  group_concat(name)  from  tzs_user_info where  find_in_set(sequence_nbr,tzjia.inspection_charge_person))  as  inspectionChargePerson        FROM
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
         LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
-        LEFT JOIN tzs_user_info tui ON tui.sequence_nbr = tzjia.inspection_charge_person
         LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
         LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
         LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/CommonController.java

@@ -63,7 +63,7 @@ public class CommonController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/getInnerPersonCodeByPersonCode")
-    @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员内部编号", notes = "根据公司的unitCode获取检测检验人员内部编号")
+    @ApiOperation(httpMethod = "POST", value = "根据公司的unitCode获取检测检验人员内部编号", notes = "根据公司的unitCode获取检测检验人员内部编号")
     public ResponseModel<Map<String,Object>> getInnerPersonCodeByPersonCode(@RequestParam String unitCode) {
         List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
         if (CollectionUtils.isEmpty(userPhones)){
@@ -72,10 +72,9 @@ public class CommonController extends BaseController {
         List<String> phones = userPhones.stream().map(TzsUserInfo::getInnerPersonCode).collect(Collectors.toList());
         Map<String,Object> map = new HashMap<>();
         if (CollectionUtils.isEmpty(phones)){
-            String innerPersonCode = String.join(",", phones);
-            map.put("innerPersonCode",innerPersonCode);
-        }else {
             map.put("innerPersonCode","");
+        }else { String innerPersonCode = String.join(",", phones);
+            map.put("innerPersonCode",innerPersonCode);
         }
 
         return ResponseHelper.buildResponse(map);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/TzsServiceFeignClient.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.List;
 import java.util.Map;
 
 @FeignClient(name = "TZS-YMT", path = "/ymt", configuration =
@@ -42,7 +43,7 @@ public interface TzsServiceFeignClient {
      * @return List
      */
     @RequestMapping(value = "/generate-code/applicationFormCode", method = RequestMethod.POST)
-    ResponseModel<Map<String, Object>> applicationFormCode(@RequestParam("type") String type,
+    ResponseModel<List<String>> applicationFormCode(@RequestParam("type") String type,
                                                     @RequestParam("batchSize") int batchSize);
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMap
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
+import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
@@ -64,8 +65,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     private JyjcInspectionResultServiceImpl inspectionResultService;
     @Autowired
     private JyjcInspectionApplicationEquipServiceImpl applicationEquipService;
+  //  @Autowired
+  // private ICreateCodeService createCodeService;
     @Autowired
-    private ICreateCodeService createCodeService;
+    TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     private WorkflowHelper workflowHelper;
     /**
@@ -140,7 +143,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     model.setResultType(jyjcOpeningApplications.get(0).getResultType());
                 }
             }
-            List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
+
+            List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
+      //       List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
 
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
@@ -370,7 +375,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             return;
         }
         List<JyjcInspectionResult> resultModels = new ArrayList(applicationEquipModels.size());
-        List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size());
+        //List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size());
+        List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult();
+
+
         for (int i = 0; i < applicationEquipModels.size(); i++) {
             JyjcInspectionResult resultModel = new JyjcInspectionResult();
             resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
@@ -483,9 +491,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             return;
         }
         String status = (String) params.get("status");
-        String inspectionChargePerson = (String) params.get("inspectionChargePerson");
-        String inspectionChargePhone = (String) params.get("inspectionChargePhone");
-        String processDescription = (String) params.get("comments");
+        List<String> persons = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePerson")), String.class);
+       // List<String> phones = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePhone")), String.class);
+
+        String inspectionChargePerson = String.join(",",persons);
+        String inspectionChargePhone = (String)params.get("inspectionChargePhone");
+        String processDescription =  (String)params.get("comments");
         if (StringUtils.isNotBlank(inspectionChargePerson)) {
             entity.setInspectionChargePerson(inspectionChargePerson);
         }
@@ -512,7 +523,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         //逻辑变更为 通过后才对办理时间赋值
         if (status.equals(FlowStatusEnum.TO_BE_FINISHED.getCode())){
             entity.setAcceptDate(new Date());
-            entity.setInspectionUnitCode(params.getOrDefault("innerPersonCode","").toString());
+            entity.setInnerPersonCode(params.getOrDefault("innerPersonCode","").toString());
         }
         this.updateById(entity);
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -147,7 +147,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 model.setUnitCode(companyBo.getCompanyCode());
                 model.setUnitCodeName(companyBo.getCompanyName());
                 // ResponseModel<Map<String, Object>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
-                List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
+                List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1).getResult();
+
+                //List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
                 model.setApplicationSeq(codes.get(0));
                 model.setCreateUserId(reginParams.getUserModel().getUserId());
                 model = this.createWithModel(model);