问题修改

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/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;
+
     /**
      * 台账信息条件分页查询
      *
@@ -346,17 +348,22 @@ 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) {
             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 {
-            remarks = remarks + "，" + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
+            remarks = remarks + "，" + smRemarks + "由" + baseVehicleCertificate.getVinNo() + "改成" + vinNo;
         }
         baseMapper.updateVinNo(vinNo, remarks, sid);
         baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());