修改证管理查询流水bug

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

@@ -452,15 +452,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgCertificateChangeRecord.setRecDate(new Date());
         jgCertificateChangeRecord.setCreateDate(new Date());
         jgCertificateChangeRecord.setCreateUserId(jgChangeVehicleRegistrationUnit.getCreateUserId());
-        jgCertificateChangeRecord.setUseRegistrationCode(jgChangeVehicleRegistrationUnit.getUseRegistCode());
         jgCertificateChangeRecord.setCertificateNo(manage.getCertificateNo());
         jgCertificateChangeRecord.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
         jgCertificateChangeRecord.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
         jgCertificateChangeRecord.setEquCategory(manage.getEquCategory());
         jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveCompanyCode());
         jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
-        // 保存证流水信息
-        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
         // 组装设备流水
         dataList.forEach(item -> {
             JSONObject object = JSONObject.parseObject(JSON.toJSONString(item));
@@ -509,6 +506,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
         manage.setAuditPassDate(new Date());
         jgUseRegistrationManageService.updateById(manage);
+        // 保存证流水信息
+        jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
+        jgCertificateChangeRecordService.save(jgCertificateChangeRecord);
     }
 
     /**

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

@@ -235,6 +235,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
         List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
                 .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode())
+                .or().eq(JgCertificateChangeRecord::getCertificateNo, jgUseRegistrationManage.getCertificateNo())
                 .orderByDesc(JgCertificateChangeRecord::getCreateDate));
         return changeRecordList.stream()
                 .map(x -> {

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

@@ -1520,7 +1520,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         changeRecord.setChangeContent(this.buildRecordContent(jgVehicleInformation));//变更内容
         changeRecord.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());//使用登记编号
         changeRecord.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());//接收机构公司代码
-        changeRecord.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));//登记证书唯一码
+//      changeRecord.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));//登记证书唯一码
+        // 流水表不需要再次生成唯一编号，使用证管理表对应值
+        if (!ObjectUtils.isEmpty(jgVehicleInformation.getUseRegistrationCode())){
+            JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgVehicleInformation.getUseRegistrationCode()).one();
+            changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
+        }
         changeRecord.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());//使用单位统一信用代码
         changeRecord.setUseUnitName(jgVehicleInformation.getUseUnitName());//使用单位名称
         changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码