Merge branch 'develop_tzs_bugfix' into develop_tzs_register

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

@@ -2163,7 +2163,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 if(!Arrays.asList("temp", "tempEdit").contains(submitType)){
                     this.updateEquipInfo(vehicleInformation, registerInfo, otherInfo, String.valueOf(x.get("record")));
                     // 更新es
-                    this.updateEquipEsData(vehicleInformation, otherInfo, registerInfo, String.valueOf(x.get("record")));
+                    this.updateEquipEsData(vehicleInformation, otherInfo, registerInfo, String.valueOf(x.get("record")), useInfo);
                 }
                 // 查询设备制造信息
                 LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
@@ -2467,7 +2467,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         this.createCode(jgVehicleInformation, registerInfo, otherInfo);
     }
 
-    private void updateEquipEsData(JgVehicleInformation jgVehicleInformation, IdxBizJgOtherInfo otherInfo, IdxBizJgRegisterInfo registerInfo, String equId) {
+    private void updateEquipEsData(JgVehicleInformation jgVehicleInformation, IdxBizJgOtherInfo otherInfo,
+                                   IdxBizJgRegisterInfo registerInfo, String equId ,IdxBizJgUseInfo useInfo) {
         // 更新es
         HashMap<String, Map<String, Object>> objMap = new HashMap<>();
         HashMap<String, Object> param = new HashMap<>();
@@ -2477,7 +2478,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         //param.put("ADDRESS", otherInfo.get);
         param.put("USE_PLACE", jgVehicleInformation.getUseUnitAddress());
         param.put("STATUS", "已认领");
-        param.put("EQU_STATE", 1);
+        param.put("EQU_STATE", Optional.ofNullable(useInfo.getEquState())
+                .orElse(EquimentEnum.ZAIYONG.getCode().toString()));
         param.put("IS_INTO_MANAGEMENT", true);
         param.put("ORG_BRANCH_CODE", jgVehicleInformation.getOrgBranchCode());
         param.put("ORG_BRANCH_NAME", jgVehicleInformation.getOrgBranchName());