问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@@ -92,5 +92,6 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
     private String recallStateKey; // 调回状态key
     @ApiModelProperty("调回状态value")
     private String recallStateValue; // 调回状态value
-
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-base(内申请管理) <br/>
  * File: BaseInternalPurchaseVehicleVo.java <br/>
@@ -105,4 +107,6 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String recallStateKey; // 调回状态key
     @ApiModelProperty("调回状态value")
     private String recallStateValue; // 调回状态value
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-base(内申请管理) <br/>
  * File: BaseInternalPurchaseVehicleDto.java <br/>
@@ -93,4 +95,6 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String recallStateKey; // 调回状态key
     @ApiModelProperty("调回状态value")
     private String recallStateValue; // 调回状态value
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-base(内申请管理) <br/>
  * File: BaseInternalPurchaseVehicleVo.java <br/>
@@ -95,4 +97,6 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String recallStateKey; // 调回状态key
     @ApiModelProperty("调回状态value")
     private String recallStateValue; // 调回状态value
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehiclePurchaseVo.java

@@ -6,6 +6,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/22 8:49

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -14,6 +14,8 @@
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT
         bv.*,
+        bmc.*,
+        bvm.*,
         bvc.sid AS vehModelConfigSid,
         bvc.`guidedPrice`,
         bvcf.certificateStateValue

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

@@ -106,16 +106,16 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         BaseVehicleCertificate entity = new BaseVehicleCertificate();
         dto.fillEntity(entity);
         List<String> list = dto.getCertificatePhoto();
-        if (list.size() != 0){
+        if (list.size() != 0) {
             String certificatePhoto = "";
             for (int i = 0; i < list.size(); i++) {
                 certificatePhoto += list.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
             }
-            entity.setCertificatePhoto(certificatePhoto.substring(0, certificatePhoto.length()-1));
+            entity.setCertificatePhoto(certificatePhoto.substring(0, certificatePhoto.length() - 1));
         }
-       String certificationNo = dto.getCertificationNo();
+        String certificationNo = dto.getCertificationNo();
         int i1 = baseVehicleCertificateService.checkByCertificationNo(certificationNo);
-        if (i1 > 0){
+        if (i1 > 0) {
             return rb.setMsg("该合格证编码已存在");
         }
         boolean isSave = baseVehicleCertificateService.save(entity);
@@ -153,13 +153,17 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
                 return rb.fail().setMsg("附件保存失败");
             }
         }
-        int i = baseVehicleCertificateService.updateBySid(dto.toMap(), sid);
         String vinNo = dto.getVinNo();
-        if (vinNo.length() == 17){
-            baseVehicleService.updateVinNoByVehSid(vinNo,baseVehicleCertificate.getVehicleSid());
-        }
-        if (i == 0) {
-            return rb.fail().setMsg("修改失败");
+        if (vinNo.length() == 17) {
+            BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleCertificate.getVehicleSid());
+            String vinNo1 = baseVehicle.getVinNo();
+            if (!vinNo.substring(vinNo.length() - 8).equals(vinNo1)) {
+                return rb.setMsg("该车架号后八位与车辆台账中车架号不符，无法修改");
+            }
+            baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
+            baseVehicleCertificateService.updateBySid(dto.toMap(), sid);
+        } else if (vinNo.length() == 8) {
+            baseVehicleCertificateService.updateBySid(dto.toMap(), sid);
         }
         return rb.success().setMsg("修改成功");
     }