fix(jg):普通气瓶导入

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

@@ -3742,6 +3742,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             useInfo.setDataSource("his".equals(equipInfoDto.getDataSource()) ? "jg_his" : "jg");// 区分历史设备和新增设备
             useInfo.setEquState(null);
             useInfo.setIsIntoManagement("his".equals(equipInfoDto.getDataSource()));// 历史气瓶导入为已纳管设备
+            // 历史气瓶导入设备状态为在用
+            useInfo.setEquState("his".equals(equipInfoDto.getDataSource()) ? EquimentEnum.ZAIYONG.getCode().toString() : EquimentEnum.WEIDENGJI.getCode().toString());
             // 使用单位信息
             if ("个人主体".equals(company.getCompanyType())) {
                 useInfo.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
@@ -3866,6 +3868,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esEquipmentDto.setEQU_DEFINE(equipInfoDto.getEquDefine());
             esEquipmentDto.setINFORMATION_SITUATION(otherInfo.getInformationSituation());
             esEquipmentDto.setSTATUS("已认领");
+            esEquipmentDto.setEQU_STATE("his".equals(equipInfoDto.getDataSource()) ? EquimentEnum.ZAIYONG.getCode() : EquimentEnum.WEIDENGJI.getCode());
 
             // 使用单位信息
             if ("个人主体".equals(company.getCompanyType())) {
@@ -4128,6 +4131,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         jgUseRegistrationManage.setIsDelete(Boolean.FALSE);
         jgUseRegistrationManage.setEquUseAddress("");
         jgUseRegistrationManage.setManageType("unit");
+        jgUseRegistrationManage.setCreateDate(new Date());
         jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(baseEnterpriseInfoMapper.selectByUseUnit(company.getCompanyName())) ? baseEnterpriseInfoMapper.selectByUseUnit(company.getCompanyName()).getAddress() : "");
         jgUseRegistrationManage.setUseRegistrationCode(equipInfoDto.getUseOrgCode());
         jgUseRegistrationManage.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?

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

@@ -532,7 +532,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 JSONObject dto = jsonObject.getJSONObject("sourceAsMap");
                 dto.put("record", dto.get("SEQUENCE_NBR"));
                 dto.put("equipAddress", dto.get("USE_PLACE") + "/" + dto.get("ADDRESS"));
-                dto.put("EQU_STATE_NAME",EquimentEnum.getName.get(Integer.valueOf(dto.getString("EQU_STATE"))));
+                dto.put("EQU_STATE_NAME", !ValidationUtil.isEmpty(dto.getString("EQU_STATE")) ? EquimentEnum.getName.get(Integer.valueOf(dto.getString("EQU_STATE"))) : null);
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;