Merge remote-tracking branch 'origin/master'

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

@@ -106,7 +106,7 @@ public class BaseVehicleDto implements Dto {
     @ApiModelProperty(value = "运费")
     private Integer freight;
     @ApiModelProperty(value = "合格证状态key")
-    private String certificateState = "0001";
+    private String certificateState = "001";
     @ApiModelProperty(value = "合格证状态value")
     private String certificateStateValue = "虚拟";
 }

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

@@ -121,6 +121,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             baseVehicleCertificate.setVinNo(dto.getVinNo());
             baseVehicleCertificate.setCertificateState(dto.getCertificateState());
             baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
+            baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
+            baseVehicleCertificate.setTransferStateKey("001");
+            baseVehicleCertificate.setTransferStateValue("未接收");
             baseVehicleCertificateService.save(baseVehicleCertificate);
         }else {
             return rb.setMsg("车架号不能为空");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -203,12 +203,12 @@
     </select>
 
     <select id="getContractPrice" resultType="java.lang.String">
-        SELECT bvad.contractPrice
-        FROM anrui_base.bus_vehicle_apply_detail bvad
-                     LEFT JOIN anrui_base.bus_vehicle_order bvo
-                ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
-                     LEFT JOIN anrui_scm.`scm_apply_inbound` sai
-                ON sai.vehicleOrderSid = bvo.`sid`
-        WHERE bvad.applySid = #{sid}
+        SELECT
+                bvad.contractPrice
+        FROM
+                anrui_base.bus_vehicle_apply_detail bvad
+                        LEFT JOIN anrui_base.bus_vehicle_order bvo
+                        ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
+        WHERE bvad.sid = #{sid}
     </select>
 </mapper>