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/service/impl/CommonServiceImpl.java

@@ -1750,7 +1750,7 @@ public class CommonServiceImpl implements ICommonService {
      * @param supervisoryCompanyCode 接收机构单位代码
      * @return 使用登记编号
      */
-    public String generateRegistrationCode(String equipId, String supervisoryCode, String supervisoryCompanyCode) {
+    public String generateRegistrationCode(String equipId, String supervisoryCode, String supervisoryCompanyCode, boolean isUnit) {
         // 根据设备id查询设备类别、品种
         LambdaQueryWrapper<RegistrationInfo> equipWrapper = new LambdaQueryWrapper<>();
         equipWrapper.eq(RegistrationInfo::getRecord, equipId);
@@ -1765,16 +1765,14 @@ public class CommonServiceImpl implements ICommonService {
                         EquipTypeEnum.getMessage(equCategory.substring(0, 1));
 
                 // 设备代码中间两位
-                String equipType2MidDigits;
-                equipType2MidDigits = equCategory.substring(1, 3);
-                //if (ValidationUtil.isEmpty(equDefine)) {
-                    // 没有设备品种的设备取设备类别代码中间两位
-
-                //}
-                //else {
-                //    // 设备品种代码中间两位
-                //    equipType2MidDigits = equDefine.substring(1, 3);
-                //}
+                String equipType2MidDigits = equCategory.substring(1, 3);
+                //台套还是取品种的中间两位
+                if (!isUnit) {
+                    if (!ValidationUtil.isEmpty(equDefine)) {
+                        equipType2MidDigits = equDefine.substring(1, 3);
+                    }
+                }
+
                 // 登记机关代号
                 String city = supervisoryCode.substring(0, 1);
                 // 西咸新区监管码对应的设备使用登记证还按咸阳(D)生成

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

@@ -920,7 +920,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                     supervisoryCode = supervisoryCodeMap.get("superviseCode");
                     code96333 = supervisoryCodeMap.get("code96333");
-                    useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode()));
+                    useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
                 }else{
@@ -934,7 +934,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");
                         code96333 = supervisoryCodeMap.get("code96333");
-                        useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode()));
+                        useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
                         useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                         isUpdateRegistrationCode.set(true);
                     }

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

@@ -458,18 +458,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgCertificateChangeRecord.setEquCategory(manage.getEquCategory());
         jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveCompanyCode());
         jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
-        // 组装设备流水
-        dataList.forEach(item -> {
-            JSONObject object = JSONObject.parseObject(JSON.toJSONString(item));
-            JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
-            jgCertificateChangeRecordEq.setEquId(object.get("record").toString());
-            jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
-            jgCertificateChangeRecordEq.setProductCode(object.get("factoryNum").toString());
-            jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
-        });
-        // 保存设备流水信息
-        jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
-
         List<String> collect = jgCertificateChangeRecordEqs.stream().map(JgCertificateChangeRecordEq::getEquId).collect(Collectors.toList());
         if ("0".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
             // 区外变更
@@ -509,6 +497,18 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         // 保存证流水信息
         jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
         jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
+        // 组装设备流水
+        dataList.forEach(item -> {
+            JSONObject object = JSONObject.parseObject(JSON.toJSONString(item));
+            JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
+            jgCertificateChangeRecordEq.setEquId(object.get("record").toString());
+            jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
+            jgCertificateChangeRecordEq.setProductCode(object.get("factoryNum").toString());
+            jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
+        });
+        // 保存设备流水信息
+        jgCertificateChangeRecordEqService.saveBatch(jgCertificateChangeRecordEqs);
+
     }
 
     /**

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

@@ -674,10 +674,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             .map(v -> (String) v.get("record"))
                             .collect(Collectors.toList())
             );
-            if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) && inspectionDetectionInfoList.stream().anyMatch(info ->
+            if (!CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE")) &&
+                    (inspectionDetectionInfoList.isEmpty() || inspectionDetectionInfoList.stream().anyMatch(info ->
                             ObjectUtils.isEmpty(info) || ObjectUtils.isEmpty(info.getInspectType()) ||
                             ObjectUtils.isEmpty(info.getInspectConclusion()) || ObjectUtils.isEmpty(info.getInspectOrgCode()) ||
-                            ObjectUtils.isEmpty(info.getInspectOrgName()))) {
+                            ObjectUtils.isEmpty(info.getInspectOrgName())))) {
                 throw new BadRequest("请补充设备检验检测信息后提交！");
             }
 
@@ -1203,7 +1204,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
             if ("unit".equals(jgUseRegistration.getManageType())) {
                 if ((Boolean) mapData.get("isFirstEquip")) {
-                    String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
+                    String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(),
+                            jgUseRegistration.getReceiveCompanyCode(), true);
                     jgUseRegistration.setUseRegistrationCode(code);
                     jgUseRegistration.setAuditPassDate(new Date());
                     registerInfo.setUseOrgCode(code);
@@ -1223,7 +1225,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     idxBizJgRegisterInfoService.update(lambda);
                 }
             } else {
-                String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode());
+                String code = commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(), jgUseRegistration.getReceiveCompanyCode(), false);
                 jgUseRegistration.setUseRegistrationCode(code);
                 jgUseRegistration.setAuditPassDate(new Date());
                 registerInfo.setUseOrgCode(code);
@@ -2024,10 +2026,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @return
      */
     private List<CompletableFuture<byte[]>> pressurePipeDataPreparation(int page, JSONObject jsonObject, int size, double total, JSONArray equipmentLists, String wordPath, String filePrefix, AgencyUserModel result) {
-        List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page)
-                .mapToObj(current -> CompletableFuture.supplyAsync(() -> {
         Map<String, Object> exportParamsMap = new HashMap<>();
-                    exportParamsMap.put("current", current);
         exportParamsMap.put("page", page);
         LocalDate currentDate = LocalDate.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -2054,6 +2053,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         exportParamsMap.put("agent", ValidationUtil.isEmpty(result.getRealName()) ? "" : result.getRealName());
         // 电子邮箱
         exportParamsMap.put("email", ValidationUtil.isEmpty(result.getEmail()) ? "" : result.getEmail());
+
+        List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page)
+                .mapToObj(current -> CompletableFuture.supplyAsync(() -> {
+                    exportParamsMap.put("current", current);
                     // 数据分页
                     int start = (current - 1) * size;
                     int end = ((current - 1) * size + size) < total ? (current - 1) * size + size : (int) total;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/IEquipmentCategoryService.java

@@ -34,6 +34,7 @@ public interface IEquipmentCategoryService {
     List<String> updateOtherInfo(Map<String, Object> map);
 
     Map<String,Map<String,Object>> getFormRecordById(Map<String, Object> map);
+    Map<String,Object> getFormRecordByIdMap(Map<String, Object> map);
 
     void checkEsData(String id);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -288,6 +288,13 @@ public class EquipmentCategoryController extends BaseController {
         return ResponseHelper.buildResponse(equipmentCategoryService.getFormRecordById(map));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/getFormRecordById/map", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "表格查询详情", notes = "表格查询详情")
+    public ResponseModel<Object> getFormRecordByIdMap(@RequestParam Map<String, Object> map) {
+        return ResponseHelper.buildResponse(equipmentCategoryService.getFormRecordByIdMap(map));
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/checkCode", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "校验使用登记证编号、设备代码、96333码重复", notes = "校验使用登记证编号、设备代码、96333码重复")

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

@@ -909,6 +909,60 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         return result;
     }
 
+    @Override
+    public Map<String, Object> getFormRecordByIdMap(Map<String, Object> map) {
+//        ResponseModel<Map<String, Map<String, Object>>> responseModel = idxFeignService.getFormRecordById(map);
+//        Map<String, Map<String, Object>> result = responseModel.getResult();
+        String alias = String.valueOf(map.get("alias"));
+        if (ObjectUtils.isEmpty(alias)) {
+            return new HashMap<>();
+        }
+        EquipmentTypeEnum equipmentMessage = EquipmentTypeEnum.getEnumByCode(alias);
+        if (equipmentMessage == null && ObjectUtils.isEmpty(equipmentMessage)) {
+            return new HashMap<>();
+        }
+        HashMap<String, Map<String, Object>> result = new HashMap<>();
+        // 使用信息
+        Map<String, Object> useInfo = getUseInfo(map);
+        result.put(equipmentMessage.getUseInfo(), useInfo);
+        // 设计信息
+        Map<String, Object> desInfo = getDesInfo(map);
+        result.put(equipmentMessage.getDesInfo(), desInfo);
+        // 监督管理信息
+        Map<String, Object> supInfo = getSupInfo(map);
+        if ("1".equals(useInfo.get("IS_NOT_XIXIAN"))) {
+            supInfo.put("CITY", "咸阳");
+        } else {
+            supInfo.put("CITY", useInfo.get("CITY_NAME"));
+        }
+        result.put(equipmentMessage.getSupInfo(), supInfo);
+        // 施工信息
+        Map<String, Object> comInfo = getComInfo(map);
+        result.put(equipmentMessage.getComInfo(), comInfo);
+        // 维保信息(只有电梯有)
+        if (!ObjectUtils.isEmpty(map) && EquipmentTypeEnum.DT.getCode().equals(alias)) {
+            Map<String, Object> mainInfo = getMainInfo(map);
+            result.put(equipmentMessage.getMainInfo(), mainInfo);
+        }
+        // 检验检测信息
+        Map<String, Object> insInfo = getInsInfo(map);
+        result.put(equipmentMessage.getInsInfo(), insInfo);
+        // 注册信息
+        Map<String, Object> jriInfo = getJriInfo(map, equipmentMessage);
+        result.put(equipmentMessage.getJriInfo(), jriInfo);
+        if (!ObjectUtils.isEmpty(map.get(COPY_KEY))) {
+            result.get(EquipmentTypeEnum.DT.getSupInfo()).remove("CLAIM_STATUS");
+            result.get(EquipmentTypeEnum.DT.getSupInfo()).remove("CODE96333");
+            result.get(EquipmentTypeEnum.DT.getSupInfo()).remove("SUPERVISORY_CODE");
+        }
+
+        Map<String,Object> resultMapNew = new HashMap<>();
+        result.forEach((key, value) -> {
+            resultMapNew.putAll(value);
+        });
+        return resultMapNew;
+    }
+
     /**
      * 使用信息
      *