车用气瓶和台套单位变更后更新证和设备状态为在用，已登记

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

@@ -1215,6 +1215,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             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
+                            map1.put("EQU_STATE", "1");
                             resultMap.put(equipId, map1);
                             //修改各类告知列表，置为废弃
                             this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
@@ -1238,6 +1239,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 idxBizJgUseInfoService.update(
                                         new IdxBizJgUseInfo()
                                                 .setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
+                                                .setEquState("1")
                                                 .setEstateUnitName(enterpriseInfo.getUseUnit()),
                                         new LambdaQueryWrapper<IdxBizJgUseInfo>()
                                                 .in(IdxBizJgUseInfo::getRecord, records)
@@ -1269,6 +1271,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
                             registrationManage.setAuditPassDate(registration.getAuditPassDate());
                             registrationManage.setVersion(registrationManage.getVersion() + 1);
+                            registrationManage.setCertificateStatus("已登记");
                             if ("5000".equals(registrationManage.getEquListCode())) {
                                 String targetCode = registrationManage.getUseRegistrationCode();
                                 dto.getRegistrationList().stream()

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

@@ -455,6 +455,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         HashMap<String, Map<String, Object>> objMap = new HashMap<>();
         ids.forEach(item -> {
             HashMap<String, Object> param = new HashMap<>();
+            param.put("EQU_STATE", "1");
             param.put("USE_UNIT_NAME", jgChangeVehicleRegistrationUnit.getNewUseUnitName());
             param.put("USE_UNIT_CREDIT_CODE", jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
             // 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
@@ -571,6 +572,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setChangeReason(BusinessTypeEnum.JG_VEHICLE_GAS_CYLINDER_CHANGE.getName());
         manage.setSuperviseOrgCode(jgChangeVehicleRegistrationUnit.getOrgBranchCode());
         manage.setSuperviseOrgName(jgChangeVehicleRegistrationUnit.getOrgBranchName());
+        manage.setCertificateStatus("已登记");
         jgUseRegistrationManageService.updateById(manage);
         // 保存证流水信息
         jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
@@ -593,6 +595,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.in(IdxBizJgUseInfo::getRecord, collect);
         updateWrapper.set(IdxBizJgUseInfo::getUseInnerCode, jgChangeVehicleRegistrationUnit.getNewCarNumber());
+        updateWrapper.set(IdxBizJgUseInfo::getEquState, "1");
         jgUseInfoMapper.update(null, updateWrapper);
     }