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

@@ -1927,7 +1927,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             param.put("ADDRESS", dataMap.getOrDefault("address", ""));
             param.put("USE_PLACE", usePlace);
             param.put("STATUS", "已认领");
-            param.put("EQU_STATE", 1);
+            if (useInfo.getEquState() == null){
+                param.put("EQU_STATE", 1);
+            }
             // 更新es的下次检验日期
             param.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(dataMap.getString("nextInspectDate")));
             param.put("USE_INNER_CODE", useInfo.getUseInnerCode());
@@ -4280,7 +4282,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
                     useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
                     // 历史平台登记，将设备状态改为在用
-                    if(!map.containsKey("EQU_STATE")){
+                    if(useInfo.getEquState() == null){
                         useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
                     }
                     usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + "/" + useInfo.getStreetName();