问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -68,7 +68,7 @@ public interface BaseVehicleCertificateFeign {
 
     @ApiOperation("单独维护车架号")
     @PostMapping("/updateVinNo")
-    public ResultBean updateVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid);
+    public ResultBean updateVinNo(@RequestParam("vinNo") String vinNo,@RequestParam("smRemarks") String smRemarks, @RequestParam("sid") String sid);
 
     /**
      * 根据前台传来的sid的集合进行批量删除

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -43,7 +43,7 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
     }
 
     @Override
-    public ResultBean updateVinNo(String vinNo, String sid) {
+    public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -104,10 +104,10 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     HandoverCertVo getCertificateInfoOne(@Param("vinSid") String vinSid);
 
     @Update("update base_vehicle_certificate set transferStateKey = #{tranKey},transferStateValue = #{tranValue} where sid = #{sid}")
-    void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue);
+    void updateTransferState(@Param("sid") String sid, @Param("tranKey") String tranKey, @Param("tranValue") String tranValue);
 
     BaseVehicleCertificate selectByVinSid(String vinSid);
 
     @Update("update base_vehicle_certificate set remarks = #{remarks},vinNo = #{vinNo} where sid = #{sid}")
-    void updateVinNo(@Param("vinNo") String vinNo,@Param("remarks") String remarks,@Param("sid") String sid);
+    void updateVinNo(@Param("vinNo") String vinNo, @Param("remarks") String remarks, @Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -69,6 +69,7 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
+
     /**
      * 台账信息条件分页列表
      *
@@ -165,7 +166,7 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
                 }
                 String smRemarks = dto.getSmRemarks();
                 if (!vinNo.equals(vinNo1)) {
-                    remarks += smRemarks + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+                    remarks += smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
                 }
                 baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
                 dto.setRemarks(remarks);
@@ -178,8 +179,8 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
     }
 
     @Override
-    public ResultBean updateVinNo(String vinNo, String sid) {
+    public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) {
-        return baseVehicleCertificateService.updateVinNo(vinNo,sid);
+        return baseVehicleCertificateService.updateVinNo(vinNo, smRemarks, sid);
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basevehiclecertificate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -70,6 +71,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     private BaseVehicleAppendixService baseVehicleAppendixService;
     @Autowired
     private BaseVehicleService baseVehicleService;
+
     /**
      * 台账信息条件分页查询
      *
@@ -252,8 +254,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid) {
         ResultBean<HandoverCertVo> rb = ResultBean.fireFail();
         HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid);
-        if(handoverCertVo != null){
+        if (handoverCertVo != null) {
-            if(StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())){
+            if (StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())) {
                 List<String> photoList = Arrays.asList(handoverCertVo.getCertificatePhoto().split(","));
                 handoverCertVo.setCertificatePhotoList(photoList);
             }
@@ -270,10 +272,10 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
         for (String sid : sids) {
             BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
-            if (CertificState.CertificateState.CERSTATE_ZS.getCode().equals(baseVehicleCertificate.getCertificateState()) && CertificState.TransferState.TRANSTATE_DYJ.getCode().equals(baseVehicleCertificate.getTransferStateKey())){
+            if (CertificState.CertificateState.CERSTATE_ZS.getCode().equals(baseVehicleCertificate.getCertificateState()) && CertificState.TransferState.TRANSTATE_DYJ.getCode().equals(baseVehicleCertificate.getTransferStateKey())) {
                 String vehicleSid = baseVehicleCertificate.getVehicleSid();
                 BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData();
-                if (busSalesOrderDetailsVo == null){
+                if (busSalesOrderDetailsVo == null) {
                     return rb.setMsg("暂无销售订单，不可移交");
                 }
                 String staffSid = busSalesOrderDetailsVo.getStaffSid();
@@ -303,13 +305,13 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
                 //移交附件
                 List<String> transferFiles = baseVehicleAppendixService.selectList(sid);
                 String transferFilesString = "";
-                if (!transferFiles.isEmpty()){
+                if (!transferFiles.isEmpty()) {
                     for (String transferFile : transferFiles) {
                         transferFilesString = transferFilesString + transferFile + ",";
                     }
                 }
-                if (StringUtils.isNotBlank(transferFilesString)){
+                if (StringUtils.isNotBlank(transferFilesString)) {
-                    busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0,transferFilesString.length() - 1));
+                    busTransferRecordsDto.setTransferFiles(transferFilesString.substring(0, transferFilesString.length() - 1));
                 }
                 busTransferRecordsFeign.saveRecords(busTransferRecordsDto);
                 //消息推送
@@ -327,8 +329,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
                 messagePushTransferDto.setReceiveSids(sysUserVo1.getSid());
                 messagePushTransferDto.setReceiveNames(sysUserVo1.getName());
                 messageFeign.pushTransferMessage(messagePushTransferDto);
-                baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(),CertificState.TransferState.TRANSTATE_YJZ.getRemarks());
+                baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(), CertificState.TransferState.TRANSTATE_YJZ.getRemarks());
-            }else {
+            } else {
                 return rb.setMsg("不符合移交条件");
             }
         }
@@ -338,7 +340,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     public ResultBean updateYjState(CertificateStateQuery query) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehicleCertificate baseVehicleCertificate = baseMapper.selectByVinSid(query.getVinSid());
-        if(baseVehicleCertificate != null){
+        if (baseVehicleCertificate != null) {
             baseVehicleCertificate.setTransferStateKey(query.getTransferStateKey());
             baseVehicleCertificate.setTransferStateValue(query.getTransferStateValue());
             baseMapper.updateById(baseVehicleCertificate);
@@ -346,19 +348,24 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         return rb.success();
     }
 
-    public ResultBean updateVinNo(String vinNo, String sid) {
+    public ResultBean updateVinNo(String vinNo, String smRemarks, String sid) {
         ResultBean rb = ResultBean.fireFail();
-        if (vinNo.length() != 17){
+        if (vinNo.length() != 17) {
             return rb.setMsg("字符串长度不是17位");
         }
         BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
+        BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid());
+        String tzVinNo = baseVehicle.getVinNo();
+        if (!vinNo.substring(vinNo.length() - 8).equals(tzVinNo.substring(tzVinNo.length() - 8)) && StringUtils.isBlank(smRemarks)) {
+            return rb.success().setMsg("该车架号后八位与车辆台账中车架号不符，请填写说明原因");
+        }
         String remarks = baseVehicleCertificate.getRemarks();
         if (StringUtils.isBlank(remarks)) {
-            remarks = "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+            remarks = smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
-        }else {
+        } else {
-            remarks = remarks + "，" + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+            remarks = remarks + "，" + smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
         }
-        baseMapper.updateVinNo(vinNo,remarks,sid);
+        baseMapper.updateVinNo(vinNo, remarks, sid);
         baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
         return rb.success();
     }