fix(jg):修复设备登记逻辑与数据过滤条件

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/DictParamsConverter.java

@@ -84,12 +84,12 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("直接顶升", "1");
         dictMap.put("间接顶升", "2");
 
-//        HashMap<String, String> controlModeMap = new HashMap<>();
-//        controlModeMap.put("集选", "1");
-//        controlModeMap.put("并联", "2");
-//        controlModeMap.put("按钮", "3");
-//        controlModeMap.put("其他", "4");
-//        feildDictMap.put("controlMode", controlModeMap);
+        HashMap<String, String> controlModeMap = new HashMap<>();
+        controlModeMap.put("集选", "1");
+        controlModeMap.put("并联", "2");
+        controlModeMap.put("按钮", "3");
+        controlModeMap.put("其他", "4");
+        feildDictMap.put("controlMode", controlModeMap);
 
         HashMap<String, String> nonDestructiveTestingMethodsForPressurePartsMap = new HashMap<>();
         nonDestructiveTestingMethodsForPressurePartsMap.put("磁粉", "5988");

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

@@ -3326,8 +3326,10 @@
         from
             tzs_jg_resume_info
         where
-            equ_id = #{record} AND business_type <![CDATA[ <> ]]> '历史设备登记'
-            AND data_source = 0
+            equ_id = #{record}
+            AND business_type <![CDATA[ <> ]]> '历史设备登记'
+            AND change_content <![CDATA[ <> ]]> '新增设备业务办理'
+            AND data_source <![CDATA[ <> ]]> 1
         ) a
     </select>
 </mapper>

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

@@ -13,7 +13,7 @@
         SELECT
             *
         FROM tzs_jg_resume_info
-        WHERE
+        WHERE is_delete = '0' and
         <foreach collection="equIds" item="id" open="(" separator="or" close=")">
             equ_id  like  concat('%',#{id}, '%')
         </foreach>

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

@@ -502,7 +502,6 @@ public class DataDockServiceImpl {
             registerInfo.setRegisterState("6045");
             registerInfo.setIsCompleteXa("1");
             registerInfo.setInInspectionPeriod("1");
-            registerInfo.setProductName("电梯");
             idxBizJgRegisterInfoServiceImpl.saveOrUpdateData(registerInfo);
         }
         return registerInfo;
@@ -2679,26 +2678,32 @@ public class DataDockServiceImpl {
                     isRegistered = false;
                 }
                 IdxBizJgRegisterInfo oldRegisterInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("record", record));
-                IdxBizJgUseInfo useInfo = saveUseInfo(equ, record, dataSource, remark, null);
-                saveDesignInfo(equ, record);
-                saveFactoryInfo(equ, record);
-                IdxBizJgRegisterInfo registerInfo = saveRegisterInfo(equ, record, equList);
+                IdxBizJgUseInfo useInfo = this.saveUseInfo(equ, record, dataSource, remark, null);
+                this.saveDesignInfo(equ, record);
+                this.saveFactoryInfo(equ, record);
+                IdxBizJgRegisterInfo registerInfo = this.saveRegisterInfo(equ, record, equList);
                 // 西安导入电梯属地监管部门处理
-                handleSupervisionOffice(equ);
-                saveSupervisionInfo(equ, record);
-                IdxBizJgOtherInfo otherInfo = saveOtherInfo(equ, record, equList);
-                saveInspectInfo(equ, record);
-                saveTechParams(equ, record, equList);
-                saveEquInfoToEs(record, isCompleteXa);
+                this.handleSupervisionOffice(equ);
+                this.saveSupervisionInfo(equ, record);
+                IdxBizJgOtherInfo otherInfo = this.saveOtherInfo(equ, record, equList);
+                this.saveInspectInfo(equ, record);
+                this.saveTechParams(equ, record, equList);
+                this.saveEquInfoToEs(record, isCompleteXa);
                 this.saveInstallInfo(equ);//安装信息
                 this.historyEquUpdateMaintenanceInfo(equ);//维保信息
+
                 // isRegistered=false是未做过登记设备，且dataSource=jg_his，且有使用登记证号则做历史登记
                 if (!ValidationUtil.isEmpty(useRegistrationCode) && !isRegistered && "jg_his_xa".equals(dataSource)) {
                     this.handleHistoryEquip(equ);//历史登记
                 }
                 // isRegistered=true表示已做过历史平台登记，则需更新历史单据等信息。
                 if (isRegistered) {
-                    updateHistoryInfo(equ, registerInfo, otherInfo, oldRegisterInfo, useInfo);
+                    this.updateHistoryInfo(equ, registerInfo, otherInfo, oldRegisterInfo, useInfo);
+                }
+                // 西安未做登记的新设备修改纳管状态为已纳管
+                if ("jg_xa".equals(dataSource)) {
+                    this.updateUseManagementStatus(useInfo);
+                    this.saveNewEquipResumeInfo(useInfo);
                 }
             } else if (!businessId.isEmpty()) {
                 this.saveResumeInfo(equ);
@@ -2734,6 +2739,38 @@ public class DataDockServiceImpl {
         }
     }
 
+    private void saveNewEquipResumeInfo(IdxBizJgUseInfo useInfo) {
+        JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getEquId, useInfo.getRecord()).one();
+        if (ValidationUtil.isEmpty(resumeInfo)) {
+            resumeInfo = new JgResumeInfo();
+            resumeInfo.setSequenceNbr(UUID.randomUUID().node());
+            resumeInfo.setStatus("正常");
+            resumeInfo.setBusinessType(BusinessTypeEnum.JG_NEW_EQUIP.getName());
+            resumeInfo.setEquId(useInfo.getRecord());
+            resumeInfo.setCreateDate(new Date());
+            resumeInfo.setRecDate(new Date());
+            resumeInfo.setBusinessId(useInfo.getRecord());
+            resumeInfo.setChangeContent(BusinessTypeEnum.JG_NEW_EQUIP.getName() + "业务办理");
+            resumeInfo.setRoutePath(String.format(equipRoutePath, useInfo.getRecord(), useInfo.getDataSource()));
+        }
+        resumeInfo.setApprovalUnit(useInfo.getUseUnitName());
+        resumeInfo.setApprovalUnitCode(useInfo.getUseUnitCreditCode());
+        jgResumeInfoService.saveOrUpdate(resumeInfo);
+    }
+
+    private void updateUseManagementStatus(IdxBizJgUseInfo useInfo) {
+        if (!ValidationUtil.isEmpty(useInfo)) {
+            useInfo.setIsIntoManagement(Boolean.TRUE);
+            idxBizJgUseInfoService.updateById(useInfo);
+
+            // es更新
+            Map<String, Object> map = categoryOtherInfoMapper.selectDataById(useInfo.getRecord());
+            ESEquipmentCategoryDto equipmentCategoryDto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
+            equipmentCategoryDto.setIS_INTO_MANAGEMENT(Boolean.TRUE);
+            esEquipmentCategory.save(equipmentCategoryDto);
+        }
+    }
+
     private void updateHistoryInfo(Map<String, Object> equ, IdxBizJgRegisterInfo registerInfo, IdxBizJgOtherInfo otherInfo, IdxBizJgRegisterInfo oldRegisterInfo, IdxBizJgUseInfo useInfo) {
         // 更新使用信息-设备改为已纳管
         useInfo.setIsIntoManagement(Boolean.TRUE);
@@ -2918,6 +2955,7 @@ public class DataDockServiceImpl {
         JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getApplyNo, jgUseRegistration.getApplyNo()).one();
         if (ValidationUtil.isEmpty(resumeInfo)) {
             resumeInfo = new JgResumeInfo();
+            resumeInfo.setSequenceNbr(UUID.randomUUID().node());
             resumeInfo.setBusinessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName());
             resumeInfo.setEquId(equ.get("record").toString());
             resumeInfo.setApplyNo(jgUseRegistration.getApplyNo());