28381设备详情修改接口

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;
+    }
+
     /**
      * 使用信息
      *