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

@@ -567,6 +567,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if ("add".equals(submitType)) {
             projectContraption.setCreateDate(date);
         }
+        if (StringUtils.isEmpty(projectContraption.getProjectContraption())) {
+            throw new BadRequest("请填写工程（装置）名称/项目名称后暂存！");
+        }
         idxBizJgProjectContraptionService.saveOrUpdateData(projectContraption);
 
         List<IdxBizJgUseInfo> useInfoList = initializeList();

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

@@ -986,6 +986,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     useRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_CANCEL.getName());
                     useRegistrationManage.setIsScrap("1");
                     useRegistrationManage.setRecDate(new Date());
+                    useRegistrationManage.setIsDoBusiness("3");//报废修改为3，不可做业务，可以被证管理查询到
                 }
                 jgUseRegistrationManageService.updateBatchById(jgUseRegistrationManageList);
             }

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

@@ -1934,9 +1934,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             param.put("ADDRESS", dataMap.getOrDefault("address", ""));
             param.put("USE_PLACE", usePlace);
             param.put("STATUS", "已认领");
-            if (useInfo.getEquState() == null){
-                param.put("EQU_STATE", 1);
-            }
+            param.put("EQU_STATE", useInfo.getEquState());
             // 更新es的下次检验日期
             param.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(dataMap.getString("nextInspectDate")));
             param.put("USE_INNER_CODE", useInfo.getUseInnerCode());

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

@@ -2423,9 +2423,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         //param.put("ADDRESS", otherInfo.get);
         param.put("USE_PLACE", jgVehicleInformation.getUseUnitAddress());
         param.put("STATUS", "已认领");
-        if (useInfo.getEquState() == null) {
-            param.putIfAbsent("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());