1.车用变更登记增加新车牌号

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeVehicleRegistrationUnitDto.java

@@ -138,6 +138,9 @@ public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 
+    @ApiModelProperty(value = "新车牌号")
+    private String newCarNumber;
+
     @ApiModelProperty(value = "转办人")
     private String transferToUserIds;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeVehicleRegistrationUnit.java

@@ -240,6 +240,12 @@ public class JgChangeVehicleRegistrationUnit extends BaseEntity {
     private String carNumber;
 
     /**
+     *  新车牌号
+     */
+    @TableField("new_car_number")
+    private String newCarNumber;
+
+    /**
      * 转办
      */
 	@TableField("transfer_to_user_ids")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitMapper.xml

@@ -52,6 +52,7 @@
         cru.new_use_unit_name as newUseUnitName,
         cru.transfer_to_user_ids as transferToUserIds,
         cru.car_number as carNumber,
+        cru.new_car_number as newCarNumber,
         cru.next_execute_user_ids as nextExecuteUserIds,
         cru.next_task_id as nextTaskId,
         cru.use_regist_code as useRegistCode,

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

@@ -99,8 +99,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
     @Autowired
     private IdxBizJgOtherInfoMapper otherInfoMapper;
-    @Autowired
-    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
 
     public void changeData(JgChangeVehicleRegistrationUnit dto, CompanyBo company) {
         if (!ObjectUtils.isEmpty(dto.getReceiveCompanyCode())) {
@@ -520,6 +519,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setAuditPassDate(new Date());
         Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
         manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
+        // 新增新车牌号后，兼容老数据默认新车牌号 与 老的一致
+        manage.setCarNumber(jgChangeVehicleRegistrationUnit.getNewCarNumber() != null ? jgChangeVehicleRegistrationUnit.getNewCarNumber() : jgChangeVehicleRegistrationUnit.getCarNumber());
         jgUseRegistrationManageService.updateById(manage);
         // 保存证流水信息
         jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
@@ -746,6 +747,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             object.put("sequenceNbr", sequenceNbr);
             object.put("applyNo", registrationUnit.getApplyNo());
             object.put("status", registrationUnit.getStatus());
+            // 新增新车牌后字段，兼容老数据
+            if(registrationUnit.getNewCarNumber() != null){
+                object.put("newCarNumber", registrationUnit.getNewCarNumber());
+            } else {
+                object.put("newCarNumber", registrationUnit.getCarNumber());
+            }
             return object;
         } else {
             return new HashMap<>();