feat(jg): 新增设备维保信息处理功能

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
+import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.IdxBizJgPipelineOperationHist;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
@@ -36,7 +37,6 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.RegionCodeTypeHandle
 import com.yeejoin.amos.boot.module.jg.biz.edit.utils.DiffUtils;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.*;
-import com.yeejoin.amos.boot.module.jg.api.common.PipLenCalUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -786,7 +786,6 @@ public class CommonEquipDataProcessService {
         return changeData;
     }
 
-
     public Map<String, Object> getEquipDetailByRecord(String record) {
         Map<String, Object> re = new HashMap<>();
         IdxBizJgRegisterInfo registerInfo = jgUseRegistrationService.getIdxBizJgRegisterInfoService().getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record));
@@ -834,6 +833,8 @@ public class CommonEquipDataProcessService {
                 result.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
             }
         }
+        // 返回当前登录人单位类型（企业还是监管、审批）
+        result.put("loginUnitType", commonService.getSelectedOrgInfo().getCompany().getLevel());
         // 返回是否做过除历史登记外的其他业务
         result.put("inOtherBusiness", !jgUseRegistrationService.getJgUseRegistrationMapper().selectListForSelfDiscard(Lists.newArrayList(record)).isEmpty());
         result.replaceAll((key, value) -> "null".equals(value) ? null : value);

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

@@ -714,7 +714,7 @@ public class CommonServiceImpl implements ICommonService {
     /**
      * 用户选择信心redis获取
      **/
-    protected ReginParams getSelectedOrgInfo() {
+    public ReginParams getSelectedOrgInfo() {
         return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
     }
 

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

@@ -3612,6 +3612,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgUseInfo useInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
         // 设计信息
         IdxBizJgDesignInfo designInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgDesignInfo.class);
+        // 维保信息
+        IdxBizJgMaintenanceRecordInfo maintenanceInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
         // 制造信息
         IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(toJSONString(equipmentInfoForm), IdxBizJgFactoryInfo.class);
         // 施工信息
@@ -3715,6 +3717,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         designInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("DESIGNINFO_SEQ")));
         iIdxBizJgDesignInfoService.saveOrUpdateData(designInfo);
 
+        if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
+            // 维保信息
+            maintenanceInfo.setRecord(record);
+            maintenanceInfo.setRecDate(date);
+            maintenanceInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
+            iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceInfo);
+        }
+
         // 制造信息
         factoryInfo.setRecord(record);
         factoryInfo.setRecDate(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/JgUseRegistrationServiceImpl.java

@@ -1812,10 +1812,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 }
             }
         } else {
-            //如果是特殊的历史设备需要更新安装信息
+            //如果是特殊的历史设备需要更新安装信息和维保信息
             String dataSource = jsonObject.getString("DATA_SOURCE");
-            if ("jg_his_black".equals(dataSource)) {
+            if (!ValidationUtil.isEmpty(dataSource) && dataSource.startsWith("jg_his_black")) {
                 this.historyEquUpdateInstallInfo(jsonObject);
+                // 电梯维保信息
+                if (EquipmentClassifityEnum.DT.getCode().equals(jsonObject.getString("equList"))) {
+                    this.historyEquUpdateMaintenanceInfo(jsonObject);
+                }
             }
             // 流程结束
             jgUseRegistration.setStatus(taskCode);
@@ -4561,7 +4565,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.historyEquUpdateInstallInfo(map);
 
                 // 设备维保信息更新,只有电梯
-                if ("3000".equals(map.get("equList")) || "3000".equals(map.get("equListCode"))) {
+                if (EquipmentClassifityEnum.DT.getCode().equals(map.get("equList")) || EquipmentClassifityEnum.DT.getCode().equals(map.get("equListCode"))) {
                     this.historyEquUpdateMaintenanceInfo(map);
                 }
 
@@ -4649,7 +4653,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * 历史设备登记-》更新维保信息
      */
     private void historyEquUpdateMaintenanceInfo(JSONObject map) {
-        IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+        IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
+        if (ValidationUtil.isEmpty(info)) {
+            info = new IdxBizJgMaintenanceRecordInfo();
+        }
         info.setRecord(String.valueOf(map.get("equipId")));
         String meUnitName = String.valueOf(map.get("meUnitName"));
         info.setRecDate(new Date());
@@ -4670,7 +4677,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             log.info("date转化失败");
         }
         info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
-        idxBizJgMaintenanceRecordInfoService.save(info);
+        idxBizJgMaintenanceRecordInfoService.saveOrUpdate(info);
     }
 
     /**
@@ -4680,7 +4687,19 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
         if (!ValidationUtil.isEmpty(constructionInfo.getSequenceNbr())) {
-            constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitName")) ? null : String.valueOf(map.get("uscUnitName")));
+            String uscUnitName = MapUtil.getStr(map, "uscUnitName");
+            if (!ValidationUtil.isEmpty(uscUnitName) && uscUnitName.contains("_") && uscUnitName.split("_").length == 2) {
+                constructionInfo.setUscUnitCreditCode(MapUtil.getStr(map, "uscUnitName").split("_")[0]);
+                constructionInfo.setUscUnitName(MapUtil.getStr(map, "uscUnitName").split("_")[1]);
+            } else {
+                TzBaseEnterpriseInfo baseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectByUseUnitCode(uscUnitName);
+                if (!ValidationUtil.isEmpty(baseEnterpriseInfo)) {
+                    constructionInfo.setUscUnitName(baseEnterpriseInfo.getUseUnit());
+                    constructionInfo.setUscUnitCreditCode(baseEnterpriseInfo.getUseUnitCode());
+                } else {
+                    constructionInfo.setUscUnitName(uscUnitName);
+                }
+            }
             constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")));
             constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
             constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));