Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -12,10 +12,12 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageS
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -224,8 +226,11 @@ public class JgUseRegistrationManageController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
     public ResponseModel<Page<JSONObject>> queryEquByCertificateSeqList(@RequestParam(value = "current") int current,
                                                                         @RequestParam(value = "size") int size,
-                                                                        @RequestParam(value = "enableType",required = false) String enableType,
-                                                                        @RequestParam(value = "sequenceNbrs") String sequenceNbrs) {
+                                                                        @RequestParam(value = "enableType", required = false) String enableType,
+                                                                        @RequestParam(value = "sequenceNbrs", required = false) String sequenceNbrs) {
+        if (ObjectUtils.isEmpty(sequenceNbrs)) {
+            throw new BadRequest("请先选择使用登记证");
+        }
         List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
                 .map(Long::parseLong)
                 .collect(Collectors.toList());

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

@@ -1415,6 +1415,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     }
                     map.put("USE_UNIT_CREDIT_CODE", String.valueOf(map.get("useUnitCreditCode")).split("_")[0]);
                     map.put(USE_PLACE_CODE, String.valueOf(map.get("county")).split("_")[0]);
+                    this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "renovationNoticeNew");
                 } else if (ValidationUtil.equals(queryType, "GZ_WX")) {// 维修告知设备选择 - 业务限制
                     // 设备类别（EQU_CATEGORY）、安装单位（USC_UNIT_CREDIT_CODE）、选择的使用单位（USE_UNIT_CREDIT_CODE）、选择的区县（USE_PLACE_CODE）过滤数据
                     if (ValidationUtil.isEmpty(map.get("useUnitCreditCode")) || ValidationUtil.isEmpty(map.get("county"))) {
@@ -1436,6 +1437,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                         }
                     }
                     map.put("USE_UNIT_CREDIT_CODE", String.valueOf(map.get("useUnitCreditCode")).split("_")[0]);
+                    this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "transferNotice");
                 }
             }
 //            this.setRepeatUsedCheckFilterByType(boolMust,companyCode,queryType);
@@ -2185,6 +2187,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
         // 其他信息
         IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
+        // 检验检测
+        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
 
         // 使用信息
         useInfo.setRecord(record);
@@ -2290,19 +2294,25 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 
-        if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory) || "8300".equals(equCategory)) {
-            IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
-            List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
-            Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
-            Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
-            inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
-            inspectionDetectionInfo.setRecord(record);
-            inspectionDetectionInfo.setRecDate(date);
-            inspectionDetectionInfo.setInspectType("8300".equals(equCategory) ? "AZJDJY" : "ZZJDJY");
-            // inspectionDetectionInfo.setInspectConclusion("6040");
-            inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
-            iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
-        }
+        // 检验检测信息
+        inspectionDetectionInfo.setRecord(record);
+        inspectionDetectionInfo.setRecDate(date);
+        inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
+        iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+
+        // if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory) || "8300".equals(equCategory)) {
+        //     IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
+        //     List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
+        //     Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
+        //     Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
+        //     inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
+        //     inspectionDetectionInfo.setRecord(record);
+        //     inspectionDetectionInfo.setRecDate(date);
+        //     inspectionDetectionInfo.setInspectType("8300".equals(equCategory) ? "AZJDJY" : "ZZJDJY");
+        //     // inspectionDetectionInfo.setInspectConclusion("6040");
+        //     inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
+        //     iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+        // }
 
         // 八大类技术参数和主要零部件和安全附件表
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();