Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -381,6 +381,9 @@
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
             and ui."USE_UNIT_CREDIT_CODE" =  #{jsonObject.useUnitCreditCode}
         </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''" >
+            and ui."RECORD" =  #{jsonObject.record}
+        </if>
         ORDER BY ui.REC_DATE DESC
     </select>
 
@@ -430,6 +433,9 @@
         <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != ''" >
             and ui."USE_UNIT_CREDIT_CODE" =  #{jsonObject.useUnitCreditCode}
         </if>
+        <if test="jsonObject.record != null and jsonObject.record != ''" >
+            and ui."RECORD" =  #{jsonObject.record}
+        </if>
         ORDER BY ui.REC_DATE DESC
     </select>
 

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

@@ -594,7 +594,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         // 新增或编辑保存
         if (StringUtils.isEmpty(useRegistration.getSequenceNbr())) {
-                ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
             if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
                 log.error("使用登记申请单单号获取失败！");
                 throw new BadRequest("使用登记申请单单号获取失败！");
@@ -697,7 +697,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     Objects.requireNonNull(WorkFlowStatusEnum.getMessage(taskCode)).getPass() :
                     Objects.requireNonNull(WorkFlowStatusEnum.getMessage(taskCode)).getReject());
 
-            jgUseRegistration.setPromoter("0".equals(operate) ? reginParams.getUserModel().getUserId(): "");
+            jgUseRegistration.setPromoter("0".equals(operate) ? reginParams.getUserModel().getUserId() : "");
             if (isFirst) {
                 this.buildTask(jgUseRegistration, workflowResultDto);
             } else {
@@ -858,7 +858,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         updateEquipMessage(String.valueOf(sequenceNbr), jgUseRegistration, mapData, registerInfo, otherInfo);
         // 生成使用登记证编号
         if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
-            if ("unit".equals(jgUseRegistration.getManageType())){
+            if ("unit".equals(jgUseRegistration.getManageType())) {
                 if ((Boolean) mapData.get("isFirstEquip")) {
                     String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
                     jgUseRegistration.setUseRegistrationCode(code);
@@ -870,7 +870,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     // 新增页面选择无设备代码后，在审批通过后自动生成设备代码
                     this.justGenerateEquCode(lambda, registerInfo, jgUseRegistration.getReceiveCompanyCode(), mapData, jgRegistrationHistory);
                     idxBizJgRegisterInfoService.update(lambda);
-                }else{
+                } else {
                     registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
                     LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
                     lambda.eq(IdxBizJgRegisterInfo::getRecord, registerInfo.getRecord());
@@ -879,7 +879,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     this.justGenerateEquCode(lambda, registerInfo, jgUseRegistration.getReceiveCompanyCode(), mapData, jgRegistrationHistory);
                     idxBizJgRegisterInfoService.update(lambda);
                 }
-            }else{
+            } else {
                 String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
                 jgUseRegistration.setUseRegistrationCode(code);
                 jgUseRegistration.setAuditPassDate(new Date());
@@ -915,6 +915,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     /**
      * 系统类型的code 自动生成设备代码
+     *
      * @param lambda                lambda
      * @param registerInfo          注册信息
      * @param receiveCompanyCode    接收机构行政区划代码
@@ -1006,7 +1007,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
         List<JgUseRegistrationEq> jgUseRegistrationEqList = jgRelationEquipMapper.selectList(jgUseRegEqWrapper);
 
-        if (!jgUseRegistrationEqList.isEmpty()){
+        if (!jgUseRegistrationEqList.isEmpty()) {
             String equId = jgUseRegistrationEqList.get(0).getEquId();
             taskMessageDto.setEquipId(equId);
             dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
@@ -1160,7 +1161,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
-            if (!"unit".equals(jgUseRegistration.getManageType())){
+            if (!"unit".equals(jgUseRegistration.getManageType())) {
                 // 需求：当申请信息由于设备信息错误被驳回及撤回时显示的数据还是旧设备数据，导致该申请单无法使用
                 // 解决方案：设备基本信息、制造信息、设计信息、安装信息、维保信息，已完成时显示历史数据、非完成时显示最新设备数据
                 this.fillHistoryDataWithNewEquip(jsonObject, jgUseRegistration, record);
@@ -1172,10 +1173,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
                 List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(Collectors.toList());
                 jsonObject.remove("equipmentLists");
-                if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))){
-                    jsonObject.put("equipmentLists",jgUseRegistrationMapper.queryForUnitVesselEquipment(records));
-                }else {
-                    jsonObject.put("equipmentLists",jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
+                if ("2300".equals(jsonObject.get("EQU_CATEGORY_CODE"))) {
+                    jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitVesselEquipment(records));
+                } else {
+                    jsonObject.put("equipmentLists", jgUseRegistrationMapper.queryForUnitPipelineEquipment(records));
                 }
             }
             // 转化 附件 字段

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/JgVehicleInformationServiceImpl.java

@@ -131,18 +131,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             throw new BadRequest("请选择设备");
         }
 
-        List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
-                equipmentLists.stream()
-                        .map(v -> (String) v.get("record"))
-                        .collect(Collectors.toList())
-        );
-        if (inspectionDetectionInfoList.stream().anyMatch(info ->
-                ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
-                        ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
-                        ObjectUtils.isEmpty(info.getInspectOrgName()))) {
-            throw new BadRequest("请补充设备检验检测信息后提交！");
-        }
-
         CompanyBo company = reginParams.getCompany();
         vehicleInfoDto.setCreateDate(new Date());
         vehicleInfoDto.setPromoter(reginParams.getUserModel().getUserId());