fix(jg):西安数据导入接口修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -308,7 +308,9 @@ public class XiAnDataDockServiceImpl {
             //    rowError.append("设备代码不能包含特殊字符；");
             //}
             if (equCodeList.contains(data.getEquCode())) {
-                rowError.append("设备代码不能重复；");
+                data.setOriginalEquCode(data.getEquCode());
+                data.setEquCodeType("2");
+                data.setEquCode("");
             }
             if (this.checkEquCodeUniqueness(data.getEquCode())){
                 data.setOriginalEquCode(data.getEquCode());

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESEquipmentCategoryDto.java

@@ -182,6 +182,6 @@ public class ESEquipmentCategoryDto {
     /**
      * 资料是否齐全（0齐全， 1不齐全）-西安数据导入
      */
-    @Field(type = FieldType.Keyword, name = "IS_COMPLETE_XA")
-    private String IS_COMPLETE_XA;
+    @Field(type = FieldType.Boolean, name = "IS_COMPLETE_XA")
+    private Boolean IS_COMPLETE_XA;
 }

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

@@ -342,15 +342,6 @@
         select
         equ_id as record
         from
-        tzs_jg_maintenance_contract a,
-        tzs_jg_maintenance_contract_eq b
-        where
-        a.sequence_nbr = b.equip_transfer_id
-        and (a.status <![CDATA[ <> ]]> '已作废' and a.status <![CDATA[ <> ]]> '维保单位已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '使用单位待提交')
-        UNION
-        select
-        equ_id as record
-        from
         tzs_jg_reform_notice a,
         tzs_jg_reform_notice_eq b
         where
@@ -374,24 +365,6 @@
         where
         a.sequence_nbr = b.equip_transfer_id
         and (a.notice_status <![CDATA[ <> ]]> '6614' and a.notice_status <![CDATA[ <> ]]> '6615' and a.notice_status <![CDATA[ <> ]]> '6610' and a.notice_status <![CDATA[ <> ]]> '6617')
-        UNION
-        select
-        equ_id as record
-        from
-        tzs_jg_vehicle_information a,
-        tzs_jg_vehicle_information_eq b
-        where
-        a.sequence_nbr = b.vehicle_id
-        and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回'  and a.status <![CDATA[ <> ]]> '已作废')
-        UNION
-        select
-        equ_id as record
-        from
-        tzs_jg_change_vehicle_registration_unit a,
-        tzs_jg_change_vehicle_registration_unit_eq b
-        where
-        a.sequence_nbr = b.unit_change_id
-        and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回'  and a.status <![CDATA[ <> ]]> '已作废')
         ) temp
         ) a ON ibjui.record = a.record
         WHERE

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

@@ -603,7 +603,7 @@ public class DataDockServiceImpl {
         if (!ObjectUtils.isEmpty(equipmentCategoryDto)) {
             long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
             equipmentCategoryDto.setREC_DATE(time);
-            equipmentCategoryDto.setIS_COMPLETE_XA(isCompleteXa);
+            equipmentCategoryDto.setIS_COMPLETE_XA(Objects.equals("0", isCompleteXa));
             esEquipmentCategory.save(equipmentCategoryDto);
         }
     }

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

@@ -1109,7 +1109,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * @author wangguo
      * @date 2024/7/18 11:00
      **/
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public void accept(JgChangeRegistrationUnitDto dto, String op, ReginParams reginParams) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
         RLock lock = redissonClient.getLock(lockKey);
@@ -1172,6 +1172,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         LambdaQueryWrapper<JgChangeRegistrationUnitEq> queryWrapper = new LambdaQueryWrapper<>();
                         queryWrapper.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, dto.getSequenceNbr());
                         List<JgChangeRegistrationUnitEq> jgChangeRegistrationUnitEqs = JgChangeRegistrationUnitEqMapper.selectList(queryWrapper);
+                        //修改ES中使用单位信息和使用单位代码
+                        Map<String, Map<String, Object>> resultMap = new HashMap<>();
                         for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : jgChangeRegistrationUnitEqs) {
                             String equipId = jgChangeRegistrationUnitEq.getEquId();
                             LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
@@ -1186,18 +1188,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                     useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
                                     useInfoMapper.updateById(useInfo);
                                 }
-                                //修改ES中使用单位信息和使用单位代码
-                                Map<String, Map<String, Object>> resultMap = new HashMap<>();
                                 Map<String, Object> map1 = new HashMap<>();
                                 String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
                                 map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
                                 map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
                                 map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
                                 resultMap.put(equipId, map1);
-                                tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
                                 //修改各类告知列表，置为废弃
                                 this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
                             }
+                            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
                         }
                         registration.setNextTaskId(nextTaskId);
                         updateTaskModel(registration, op);
@@ -1393,6 +1393,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 .eq(JgChangeRegistrationUnitEq::getIsDelete,false);
         List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list();
         if(!CollectionUtils.isEmpty(changeRegistrationUnitEqs)){
+            Map<String, Map<String, Object>> resultMap = new HashMap<>();
             for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : changeRegistrationUnitEqs) {
                 String equipId = jgChangeRegistrationUnitEq.getEquId();
                 LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
@@ -1408,7 +1409,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         useInfoMapper.updateById(useInfo);
                     }
                     //修改ES中使用单位信息和使用单位代码
-                    Map<String, Map<String, Object>> resultMap = new HashMap<>();
                     Map<String, Object> map1 = new HashMap<>();
                     String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
                     map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
@@ -1418,10 +1418,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         map1.put("USE_ORG_CODE", useOrgCode);
                     }
                     resultMap.put(equipId, map1);
-                    tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
                     //修改各类告知列表，置为废弃
                     this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
                 }
+                tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
             }
         }
     }