Merge branch 'develop_tzs_register' of…

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

@@ -38,6 +38,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
@@ -81,8 +82,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
 
 
@@ -178,8 +177,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             // 业务管理设备信息保存
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
             jgChangeRegistrationReformEq.setEquId(equipId);
-            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
-            jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
+            ResponseModel<List<String>> result =tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
+            if(!result.getResult().isEmpty()){
+                jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+            }else {
+                throw  new BadRequest("申请单编号生成失败,请稍后重试!");
+            }
             jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
             jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
             jgChangeRegistrationReform.setRegDate(new Date());

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

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -49,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,8 +78,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     JgMaintainNoticeEqMapper jgMaintainNoticeEqMapper;
     @Autowired
     private JgMaintainNoticeMapper jgMaintainNoticeMapper;
+//    @Autowired
+//    private ICreateCodeService iCreateCodeService;
+
     @Autowired
-    private ICreateCodeService iCreateCodeService;
+    TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
 
@@ -87,9 +90,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     OtherInfoMapper tzsJgOtherInfoMapper;
 
     @Autowired
-    TzsServiceFeignClient tzsServiceFeignClient;
-
-    @Autowired
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
     @Autowired
@@ -386,13 +386,18 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            log.error(" 获取告知设备列表");
+            throw new RuntimeException();
         }
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
-        if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+//        List<String> applyNoList = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
+        ResponseModel<List<String>> applyNoResult =tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), deviceList.size());
+
+        if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
+            log.error(" 获取告知单号失败");
+            throw new RuntimeException();
         }
+        List<String> applyNoList = applyNoResult.getResult();
         ArrayList<String> roleListFirst = new ArrayList<>();
         ArrayList<String> roleListSecond = new ArrayList<>();
         // 判断当前是否为提交
@@ -411,7 +416,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
-
             try {
                 FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
                 List<Object> returnList = (List<Object>) result.getResult();
@@ -453,7 +457,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 log.error("提交失败：{}", e);
             }
         }
-
         List<JgMaintainNotice> list = new ArrayList<>();
         List<JgMaintainNoticeEq> equipList = new ArrayList<>();
         deviceList.forEach(obj -> {
@@ -486,17 +489,13 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
-
         jgMaintainNoticeMapper.insertBatchSomeColumn(list);
-
         List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
             List<JgMaintainNotice> collect = list.stream().filter(JgMaintainNotice -> jgRelationEquip.getEquipTransferId().equals(JgMaintainNotice.getApplyNo())).collect(Collectors.toList());
             Long sequenceNbr = collect.get(0).getSequenceNbr();
             return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
         }).collect(Collectors.toList());
-
         jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-
     }
 
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {

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

@@ -27,7 +27,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -47,6 +46,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -85,8 +86,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
     @Autowired
     private JgReformNoticeMapper jgReformNoticeMapper;
-    @Autowired
-    private ICreateCodeService iCreateCodeService;
     //    @Autowired
 //    private EquipmentCategoryServiceImpl equipmentCategoryService;
     @Autowired
@@ -404,13 +403,18 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            throw  new BadRequest("请选择设备!");
         }
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
+        ResponseModel<List<String>> codeResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
+        List<String> applyNoList = null;
+        if(codeResult != null && !ValidationUtil.isEmpty(codeResult.getResult())) {
+            applyNoList = codeResult.getResult();
+        }
+        // List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
         if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+            throw new BadRequest("申请单编号生成失败,请稍后重试!");
         }
 
         ArrayList<String> roleListFirst = new ArrayList<>();
@@ -476,12 +480,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
         List<JgReformNotice> list = new ArrayList<>();
         List<JgReformNoticeEq> equipList = new ArrayList<>();
+        List<String> finalApplyNoList = applyNoList;
         deviceList.forEach(obj -> {
             JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
             JgReformNotice dto = new JgReformNotice();
             BeanUtils.copyProperties(model, dto);
             int i = deviceList.indexOf(obj);
-            String applyNo = applyNoList.get(i);
+            String applyNo = finalApplyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
             dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));

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

@@ -428,7 +428,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambda.eq(JgRegistrationHistory::getEquId, id);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
-            jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode()+"-"+jgUseRegistration.getReceiveOrgName());
+            jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode()+"_"+jgUseRegistration.getReceiveOrgName());
             return jsonObject;
         }
         Map<String, Object> detail = this.baseMapper.getDetail(id);

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,8 +43,8 @@ public interface TzsServiceFeignClient {
      * @return List
      */
     @RequestMapping(value = "/generate-code/applicationFormCode", method = RequestMethod.POST)
-    ResponseModel<Map<String, Object>> applicationFormCode(@RequestParam("type") String type,
-                                                     @RequestParam("batchSize") int batchSize);
+    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);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application.properties

-spring.application.name=TZS-JYJC
+spring.application.name=TZS-JYJC-YY
 server.servlet.context-path=/jyjc
 server.port=12000
 spring.profiles.active=dev

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/logback-dev.xml

@@ -50,7 +50,7 @@
     <logger name="com.yeejoin" level="INFO"/>
 
     <!-- 日志输出级别 -->
-    <root level="DEBUG">
+    <root level="INFO">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
 <!--        <appender-ref ref="ELK" />-->