新增字段

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

@@ -26,6 +26,8 @@ import java.util.Date;
 @Data
 public class BaseVehicleVo implements Vo {
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
     @ApiModelProperty(value = "备注")
     private String remarks;
     @ApiModelProperty(value = "车型与配置关联表sid")
@@ -62,6 +64,8 @@ public class BaseVehicleVo implements Vo {
     private Date solidDate;
     @ApiModelProperty(value = "成交价")
     private Integer salePrice;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
     @ApiModelProperty("创建组织名称(陕汽必须的字段)")
     private String createOrgName;
     @ApiModelProperty("使用组织名称")
@@ -102,6 +106,8 @@ public class BaseVehicleVo implements Vo {
     private String insideCode;
     @ApiModelProperty("销售指导价")
     private String guidedPrice;
+    @ApiModelProperty("销售指导价（贷款）")
+    private String manufactorSettlementPrice;
     @ApiModelProperty(value = "调车状态value")
     private String witPinStateValue;
     @ApiModelProperty(value = "合格证状态value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java

@@ -17,6 +17,10 @@ public class BaseVehmodelVo implements Vo {
     @ApiModelProperty(value = "单台指导价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String guidedPrice;
+
+    @ApiModelProperty(value = "销售指导价(贷款)")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String manufactorSettlementPrice;
     @ApiModelProperty(value = "车型配置")
     private String modelName;
     @ApiModelProperty(value = "更多配置")

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

@@ -14,11 +14,13 @@ import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -89,6 +91,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     @Autowired
     private BaseVehicleCertificateService baseVehicleCertificateService;
+
+    @Autowired
+    private BaseVehmodelConfigService baseVehmodelConfigService;
     /**
      * 财务模块中的金蝶接口
      */
@@ -134,6 +139,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (StringUtils.isNotBlank(vinNo)){
                 record.setLastVinNo(vinNo.substring(vinNo.length() - 8));
             }
+            String modelSid = record.getModelSid();
+            String modelConfigSid = record.getModelConfigSid();
+            String createOrgSid = record.getCreateOrgSid();
+            BaseVehmodelVo data = baseVehmodelConfigService.selectOne(modelSid, modelConfigSid, createOrgSid).getData();
+            record.setManufactorSettlementPrice(data.getManufactorSettlementPrice());
         }
         PagerVo<BaseVehicleVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -218,7 +218,7 @@
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
-        select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid, bmc.configName
+        select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid, bmc.configName,bvc.manufactorSettlementPrice
         from base_vehmodel_config bvc
                      left join base_vehicle_model bm on bvc.modelSid = bm.sid
                      left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid