Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

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

@@ -1239,7 +1239,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 idxBizJgUseInfoService.update(
                                         new IdxBizJgUseInfo()
                                                 .setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode())
-                                                .setEquState("1")
+                                                .setEquState(EquimentEnum.ZAIYONG.getCode().toString())
                                                 .setEstateUnitName(enterpriseInfo.getUseUnit()),
                                         new LambdaQueryWrapper<IdxBizJgUseInfo>()
                                                 .in(IdxBizJgUseInfo::getRecord, records)

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
@@ -455,7 +456,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("EQU_STATE", EquimentEnum.ZAIYONG.getCode().toString());
             param.put("USE_UNIT_NAME", jgChangeVehicleRegistrationUnit.getNewUseUnitName());
             param.put("USE_UNIT_CREDIT_CODE", jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
             // 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
@@ -595,7 +596,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");
+        updateWrapper.set(IdxBizJgUseInfo::getEquState, EquimentEnum.ZAIYONG.getCode().toString());
         jgUseInfoMapper.update(null, updateWrapper);
     }