Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java

@@ -29,8 +29,8 @@ public class BaseModelConfig extends BaseEntity {
   /*  @ApiModelProperty("车型sid(陕汽必须的字段)")
     private String vehicleSid;*/
 
-    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
+/*    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
-    private String vehicleCode;
+    private String vehicleCode;*/
 
     @ApiModelProperty("车身颜色key")
     private String carColorKey;
@@ -169,4 +169,10 @@ public class BaseModelConfig extends BaseEntity {
 
     @ApiModelProperty("简述配置名称")
     private String configName;
+
+    @ApiModelProperty("导流罩key")
+    private String baffleModelKey;
+
+    @ApiModelProperty("多媒体key")
+    private String multimediaKey;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java

@@ -25,11 +25,11 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class BaseModelConfigDto implements Dto {
 
-    @ApiModelProperty(value = "车型sid", required = true)
+/*    @ApiModelProperty(value = "车型sid", required = true)
-    private String vehicleSid;
+    private String vehicleSid;*/
 
-    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
+/*    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
-    private String vehicleCode;
+    private String vehicleCode;*/
 
     @ApiModelProperty("车身颜色key")
     private String carColorKey;
@@ -168,4 +168,10 @@ public class BaseModelConfigDto implements Dto {
 
     @ApiModelProperty("简述配置名称")
     private String configName;
+
+    @ApiModelProperty("导流罩key")
+    private String baffleModelKey;
+
+    @ApiModelProperty("多媒体key")
+    private String multimediaKey;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java

@@ -23,16 +23,48 @@ import lombok.Data;
 @Data
 public class BaseModelConfigQuery implements Query {
 
-
+/*    @ApiModelProperty("车型sid(陕汽必须的字段)")
-    @ApiModelProperty("车型sid(陕汽必须的字段)")
+    private String vehicleSid;*/
-    private String vehicleSid;
+/*    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
-
+    private String vehicleCode;*/
-    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
+    @ApiModelProperty("车身颜色key")
-    private String vehicleCode;
+    private String carColorKey;
-
+    @ApiModelProperty("缓速器key")
-    @ApiModelProperty("驾驶室")
+    private String slowMachineKey;
-    private String specification;
+    @ApiModelProperty("后视镜key")
-
+    private String rearViewMirrorKey;
-    @ApiModelProperty("鞍座")
+    @ApiModelProperty("轮胎规格key")
-    private String saddle;
+    private String tireSizeKey;
+    @ApiModelProperty("驾驶室规格key")
+    private String specificationKey;
+    @ApiModelProperty("后桥速比key")
+    private String rearAxleRatioKey;
+    @ApiModelProperty("空调key")
+    private String airConditionerKey;
+    @ApiModelProperty("轮毂材质key")
+    private String hubMaterialKey;
+    @ApiModelProperty("导流罩key")
+    private String baffleModelKey;
+    @ApiModelProperty("悬架key")
+    private String suspensionKey;
+    @ApiModelProperty("座椅key")
+    private String seatKey;
+    @ApiModelProperty("护轮罩key（有、无）")
+    private String tireCoverKey;
+    @ApiModelProperty("鞍座key")
+    private String saddleKey;
+    @ApiModelProperty("轴距key")
+    private String wheelbaseKey;
+    @ApiModelProperty("保险杠key")
+    private String bumperKey;
+    @ApiModelProperty("配置包key")
+    private String configuringBaoKey;
+    @ApiModelProperty("独立热源key(1有、0无)")
+    private String independentSourcesKey;
+    @ApiModelProperty("油箱/气罐key")
+    private String fuelTankKey;
+    @ApiModelProperty("多媒体key")
+    private String multimediaKey;
+    @ApiModelProperty("简述配置名称")
+    private String configName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java

@@ -13,34 +13,52 @@ import lombok.Data;
 public class BaseModelConfigSelectVo implements Vo {
     private static final long serialVersionUID = -664880268264639714L;
 
-    @ApiModelProperty(value = "车型配置代码")
+    @ApiModelProperty("车身颜色key")
-    private String vehicleCode;
+    private String carColorKey;
 
-    @ApiModelProperty(value = "车身颜色")
+    @ApiModelProperty("车身颜色(陕汽必须的字段)")
     private String carColor;
 
-    @ApiModelProperty(value = "驾驶室规格")
+    @ApiModelProperty("驾驶室规格key")
+    private String specificationKey;
+
+    @ApiModelProperty("驾驶室规格(陕汽必须的字段)")
     private String specification;
 
-    @ApiModelProperty(value = "油箱/气罐")
+    @ApiModelProperty("油箱/气罐key")
+    private String fuelTankKey;
+
+    @ApiModelProperty("油箱/气罐(陕汽必须的字段)")
     private String fuelTank;
 
-    @ApiModelProperty(value = "导流罩")
+    @ApiModelProperty("导流罩(陕汽必须的字段)")
     private String baffleModel;
 
-    @ApiModelProperty(value = "独立热源")
+    @ApiModelProperty("独立热源key(1有、0无)")
+    private String independentSourcesKey;
+
+    @ApiModelProperty("独立热源（有、无）")
     private String independentSources;
 
-    @ApiModelProperty(value = "独轮罩")
+    @ApiModelProperty("护轮罩key（有、无）")
+    private String tireCoverKey;
+
+    @ApiModelProperty("护轮罩（有、无）")
     private String tireCover;
 
-    @ApiModelProperty(value = "鞍座")
+    @ApiModelProperty("鞍座key")
+    private String saddleKey;
+
+    @ApiModelProperty("鞍座（陕汽必须的字段）")
     private String saddle;
 
-    @ApiModelProperty(value = "空调")
+    @ApiModelProperty("空调key")
+    private String airConditionerKey;
+
+    @ApiModelProperty("空调（陕汽必须的字段）")
     private String airConditioner;
 
-    @ApiModelProperty(value = "其他配置")
+    @ApiModelProperty("其他配置")
     private String otherConfig;
 
 /*    @ApiModelProperty("彩色仪表盘（是、否）")
@@ -52,45 +70,75 @@ public class BaseModelConfigSelectVo implements Vo {
     @ApiModelProperty("公司指导价（陕汽必须的字段）")
     private String companyGuidePrice;*/
 
+    @ApiModelProperty("后桥速比key")
+    private String rearAxleRatioKey;
+
     @ApiModelProperty("后桥速比")
     private String rearAxleRatio;
 
-    @ApiModelProperty("委改厂（欧曼）")
+   /* @ApiModelProperty("委改厂（欧曼）")
-    private String appointToFactory;
+    private String appointToFactory;*/
+
+    @ApiModelProperty("轮胎规格key")
+    private String tireSizeKey;
 
     @ApiModelProperty("轮胎规格")
     private String tireSize;
 
+    @ApiModelProperty("缓速器key")
+    private String slowMachineKey;
+
     @ApiModelProperty("缓速器")
     private String slowMachine;
 
+    @ApiModelProperty("后视镜key")
+    private String rearViewMirrorKey;
+
     @ApiModelProperty("后视镜")
     private String rearViewMirror;
 
+    @ApiModelProperty("轴距key")
+    private String wheelbaseKey;
+
     @ApiModelProperty("轴距（重汽、欧曼）")
     private String wheelbase;
 
+    @ApiModelProperty("悬架key")
+    private String suspensionKey;
+
     @ApiModelProperty("悬架（重汽、欧曼）")
     private String suspension;
 
     @ApiModelProperty("货箱（重汽、欧曼）")
     private String packingCase;
 
-    @ApiModelProperty("上装装置（欧曼）")
+  /*  @ApiModelProperty("上装装置（欧曼）")
-    private String installingDevice;
+    private String installingDevice;*/
+
+    @ApiModelProperty("座椅key")
+    private String seatKey;
 
     @ApiModelProperty("座椅（陕汽、欧曼）")
     private String seat;
 
+    @ApiModelProperty("轮毂材质key")
+    private String hubMaterialKey;
+
     @ApiModelProperty("轮毂材质（重汽）")
     private String hubMaterial;
 
+    @ApiModelProperty("配置包key")
+    private String configuringBaoKey;
+
     @ApiModelProperty("配置包（陕汽）")
     private String configuringBao;
 
     @ApiModelProperty("多媒体（陕汽）")
     private String multimedia;
 
+    @ApiModelProperty("保险杠key")
+    private String bumperKey;
+
     @ApiModelProperty("保险杠（欧曼）")
     private String bumper;
 
@@ -101,7 +149,13 @@ public class BaseModelConfigSelectVo implements Vo {
     private Integer isDel;
 
     @ApiModelProperty("简述配置名称")
-    private Integer configName;
+    private String configName;
+
+    @ApiModelProperty("导流罩key")
+    private String baffleModelKey;
+
+    @ApiModelProperty("多媒体key")
+    private String multimediaKey;
 
     @ApiModelProperty(value = "备注")
     private String remarks;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java

@@ -23,156 +23,110 @@ import lombok.Data;
 @Data
 public class BaseModelConfigVo implements Vo {
 
-    @ApiModelProperty(value = "车型配置sid")
+    @ApiModelProperty(value = "常用配置sid")
     private String sid;
-    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
+/*    @ApiModelProperty("车型配置代码(陕汽必须的字段)")
-    private String vehicleCode;
+    private String vehicleCode;*/
-
     @ApiModelProperty("车身颜色key")
     private String carColorKey;
-
     @ApiModelProperty("车身颜色(陕汽必须的字段)")
     private String carColor;
-
     @ApiModelProperty("驾驶室规格key")
     private String specificationKey;
-
     @ApiModelProperty("驾驶室规格(陕汽必须的字段)")
     private String specification;
-
     @ApiModelProperty("油箱/气罐key")
     private String fuelTankKey;
-
     @ApiModelProperty("油箱/气罐(陕汽必须的字段)")
     private String fuelTank;
-
+    @ApiModelProperty("导流罩key")
+    private String baffleModelKey;
     @ApiModelProperty("导流罩(陕汽必须的字段)")
     private String baffleModel;
-
     @ApiModelProperty("独立热源key(1有、0无)")
     private String independentSourcesKey;
-
     @ApiModelProperty("独立热源（有、无）")
     private String independentSources;
-
     @ApiModelProperty("护轮罩key（有、无）")
     private String tireCoverKey;
-
     @ApiModelProperty("护轮罩（有、无）")
     private String tireCover;
-
     @ApiModelProperty("鞍座key")
     private String saddleKey;
-
     @ApiModelProperty("鞍座（陕汽必须的字段）")
     private String saddle;
-
     @ApiModelProperty("空调key")
     private String airConditionerKey;
-
     @ApiModelProperty("空调（陕汽必须的字段）")
     private String airConditioner;
-
     @ApiModelProperty("其他配置")
     private String otherConfig;
-
 /*    @ApiModelProperty("彩色仪表盘（是、否）")
     private String isColorPanel;
-
     @ApiModelProperty("基础单位")
     private String basedUnit;
-
     @ApiModelProperty("公司指导价（陕汽必须的字段）")
     private String companyGuidePrice;*/
-
     @ApiModelProperty("后桥速比key")
     private String rearAxleRatioKey;
-
     @ApiModelProperty("后桥速比")
     private String rearAxleRatio;
-
    /* @ApiModelProperty("委改厂（欧曼）")
     private String appointToFactory;*/
-
     @ApiModelProperty("轮胎规格key")
     private String tireSizeKey;
-
     @ApiModelProperty("轮胎规格")
     private String tireSize;
-
     @ApiModelProperty("缓速器key")
     private String slowMachineKey;
-
     @ApiModelProperty("缓速器")
     private String slowMachine;
-
     @ApiModelProperty("后视镜key")
     private String rearViewMirrorKey;
-
     @ApiModelProperty("后视镜")
     private String rearViewMirror;
-
     @ApiModelProperty("轴距key")
     private String wheelbaseKey;
-
     @ApiModelProperty("轴距（重汽、欧曼）")
     private String wheelbase;
-
     @ApiModelProperty("悬架key")
     private String suspensionKey;
-
     @ApiModelProperty("悬架（重汽、欧曼）")
     private String suspension;
-
     @ApiModelProperty("货箱（重汽、欧曼）")
     private String packingCase;
-
   /*  @ApiModelProperty("上装装置（欧曼）")
     private String installingDevice;*/
-
     @ApiModelProperty("座椅key")
     private String seatKey;
-
     @ApiModelProperty("座椅（陕汽、欧曼）")
     private String seat;
-
     @ApiModelProperty("轮毂材质key")
     private String hubMaterialKey;
-
     @ApiModelProperty("轮毂材质（重汽）")
     private String hubMaterial;
-
     @ApiModelProperty("配置包key")
     private String configuringBaoKey;
-
     @ApiModelProperty("配置包（陕汽）")
     private String configuringBao;
-
+    @ApiModelProperty("多媒体key")
+    private String multimediaKey;
     @ApiModelProperty("多媒体（陕汽）")
     private String multimedia;
-
     @ApiModelProperty("保险杠key")
     private String bumperKey;
-
     @ApiModelProperty("保险杠（欧曼）")
     private String bumper;
-
     @ApiModelProperty("品牌名称")
     private String brandName;
-
     @ApiModelProperty("是否可以删除（1是，0否）")
     private Integer isDel;
-
     @ApiModelProperty("简述配置名称")
     private String configName;
-
     @ApiModelProperty(value = "备注")
     private String remarks;
-
-
 /*    @ApiModelProperty(value = "车型名称")
     private String modelName;
-
     @ApiModelProperty(value = "发动机型号")
     private String engineTypeValue;*/
 }

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

@@ -60,9 +60,9 @@ public class BaseVehmodelConfigVo implements Vo {
 	@ApiModelProperty("简述配置名称")
 	private String configName; // 简述配置名称
 	@ApiModelProperty("厂家结算价")
-    private BigDecimal manufactorSettlementPrice; // 厂家结算价
+    private String manufactorSettlementPrice; // 厂家结算价
 	@ApiModelProperty("销售参考价")
-    private BigDecimal salesReferencePrice; // 销售参考价
+    private String salesReferencePrice; // 销售参考价
 	@ApiModelProperty("价格有效期")
     private String priceValidity; // 价格有效期
 	@ApiModelProperty(value = "是否常用车型")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -39,4 +39,6 @@ public class BusVehicleApply extends BaseEntity {
     private String applicationCode;
 	@ApiModelProperty("创建组织sid")
     private String createByDeptSid;
+    @ApiModelProperty("当前订金金额")
+    private BigDecimal currentAmount;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -46,6 +47,8 @@ public class BusVehicleApplyDto implements Dto {
     private String applicationCode;
     @ApiModelProperty("创建组织sid")
     private String createByDeptSid;
+    @ApiModelProperty("当前订金金额")
+    private String currentAmount;
     @ApiModelProperty("车辆排产申请详情")
     private List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList; // 车辆排产申请详情
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java

@@ -54,7 +54,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      * @param vehicleCode 车型配置代码
      * @return
      */
-    int selectBySidAndCode(@Param("vehicleSid") String vehicleSid, @Param("vehicleCode") String vehicleCode);
+    /*int selectBySidAndCode(@Param("vehicleSid") String vehicleSid, @Param("vehicleCode") String vehicleCode);*/
 
     /**
      * 根据车型sid和车型配置代码查询除该车型配置外其他的配置信息个数

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -5,51 +5,68 @@
     <select id="selectByVehicleSid" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo">
         SELECT bmc.sid,
         <!--车型配置代码-->
-        bmc.vehicleCode,
+        <!--bmc.vehicleCode,-->
         <!--车身颜色-->
         bmc.carColor,
+        bmc.carColorKey,
         <!--驾驶室规格-->
         bmc.specification,
+        bmc.specificationKey,
         <!--油箱/气罐-->
         bmc.fuelTank,
+        bmc.fuelTankKey,
         <!--导流罩-->
         bmc.baffleModel,
+        bmc.baffleModelKey,
         <!--独立热源-->
         bmc.independentSources,
+        bmc.independentSourcesKey,
         <!--独轮罩-->
         bmc.tireCover,
+        bmc.tireCoverKey,
         <!--鞍座-->
         bmc.saddle,
+        bmc.saddleKey,
         <!--空调-->
         bmc.airConditioner,
+        bmc.airConditionerKey,
         <!--其他配置-->
         bmc.otherConfig,
         <!--后桥速比-->
         bmc.rearAxleRatio,
-        <!--委改厂（欧曼）-->
+        bmc.rearAxleRatioKey,
-        bmc.appointToFactory,
         <!--轮胎规格-->
         bmc.tireSize,
+        bmc.tireSizeKey,
         <!--缓速器-->
         bmc.slowMachine,
+        bmc.slowMachineKey,
         <!--后视镜-->
         bmc.rearViewMirror,
+        bmc.rearViewMirrorKey,
         <!--轴距（重汽、欧曼）-->
         bmc.wheelbase,
+        bmc.wheelbaseKey,
         <!--悬架（重汽、欧曼）-->
         bmc.suspension,
+        bmc.suspensionKey,
         <!--货箱（重汽、欧曼）-->
         bmc.packingCase,
         <!--座椅（陕汽、欧曼）-->
         bmc.seat,
+        bmc.seatKey,
         <!--轮毂材质（重汽）-->
         bmc.hubMaterial,
+        bmc.hubMaterialKey,
         <!--配置包（陕汽）-->
         bmc.configuringBao,
+        bmc.configuringBaoKey,
         <!--多媒体（陕汽）-->
         bmc.multimedia,
+        bmc.multimediaKey,
         <!--保险杠（欧曼）-->
         bmc.bumper,
+        bmc.bumperKey,
         <!--品牌名称-->
         bmc.brandName,
         <!--是否可以删除（1是，0否）-->
@@ -151,7 +168,7 @@
     </select>
 
     <select id="selectDown" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseVehicleModelConfigDownVo">
-        SELECT bmc.sid, bmc.vehicleCode
+        SELECT bmc.sid<!--, bmc.vehicleCode-->
         FROM base_model_config bmc
             ${ew.customSqlSegment}
     </select>
@@ -159,7 +176,7 @@
     <select id="getAppChooseListByModelSid"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppChooseBaseModelConfigVo">
         SELECT bmc.sid,
-               bmc.vehicleCode,
+               <!--bmc.vehicleCode,-->
                bmc.carColor,
                bmc.specification,
                bmc.fuelTank,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -58,13 +58,13 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     public ResultBean save(BaseModelConfigDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //车型sid
-        String vehicleSid = dto.getVehicleSid();
+        /*String vehicleSid = dto.getVehicleSid();
-        String vehicleCode = dto.getVehicleCode();
+        String vehicleCode = dto.getVehicleCode();*/
         //根据车型sid和整车编码查询是否存在
-        int count = baseModelConfigService.selectBySidAndCode(vehicleSid, vehicleCode);
+       /* int count = baseModelConfigService.selectBySidAndCode(vehicleSid, vehicleCode);
         if (count > 0) {
             return rb.setMsg("该车型已存在该车型配置代码的车型配置信息");
-        }
+        }*/
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
@@ -85,14 +85,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
             return rb.setMsg("该车型配置信息不存在");
         }
         //车型sid
-        String vehicleSid = dto.getVehicleSid();
+        /*String vehicleSid = dto.getVehicleSid();*/
         //车型配置信息
-        String vehicleCode = dto.getVehicleCode();
+        /*String vehicleCode = dto.getVehicleCode();*/
         //根据车型sid和整车编码查询是否存在
-        int count = baseModelConfigService.selectByVeSidAndCodeAndSid(vehicleSid, vehicleCode, sid);
+        /*int count = baseModelConfigService.selectByVeSidAndCodeAndSid(vehicleSid, vehicleCode, sid);
         if (count > 0) {
             return rb.setMsg("该车型已存在该车型配置代码的车型配置信息");
-        }
+        }*/
         String configName = "";
         configName += dto.getCarColor() + "+" + dto.getSpecification() + "+" + dto.getFuelTank() + "+" + dto.getBaffleModel() + "+" + dto.getIndependentSources() + "+" + dto.getTireCover() + "+" + dto.getSaddle() + "+" + dto.getAirConditioner() + "+" + dto.getRearAxleRatio() + "+" + dto.getTireSize() + "+" + dto.getSlowMachine() + "+" + dto.getRearViewMirror() + "+" + dto.getWheelbase() + "+" + dto.getSuspension() + "+" + dto.getPackingCase() + "+" + dto.getSeat() + "+" + dto.getHubMaterial() + "+" + dto.getConfiguringBao() + "+" + dto.getMultimedia() + "+" + dto.getBumper();
         dto.setConfigName(configName);
@@ -140,17 +140,17 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean<PagerVo<AppChooseBaseModelConfigVo>> getAppChooseListByModelSid(PagerQuery<BaseModelConfigQuery> pagerQuery) {
         ResultBean<PagerVo<AppChooseBaseModelConfigVo>> rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(pagerQuery.getParams().getVehicleSid())) {
+       /* if (StringUtils.isBlank(pagerQuery.getParams().getVehicleSid())) {
             return rb.setMsg("车型sid不能为空");
-        }
+        }*/
         IPage<AppChooseBaseModelConfigVo> page = baseModelConfigService.getAppChooseListByModelSid(pagerQuery);
         PagerVo<AppChooseBaseModelConfigVo> pv = new PagerVo<>();
         PagerVo<AppChooseBaseModelConfigVo> pv1 = PagerUtil.pageToVo(page, pv);
         pv1.setMsg("查询到以下" + page.getTotal() + "种配置");
-        BaseVehicleModel vehicleModel = baseVehicleModelService.fetchBySid(pagerQuery.getParams().getVehicleSid());
+        /*BaseVehicleModel vehicleModel = baseVehicleModelService.fetchBySid(pagerQuery.getParams().getVehicleSid());
         Map<String, Object> map = new HashMap<>();
         map.put("modelName", vehicleModel.getModelName());
-        pv1.setMap(map);
+        pv1.setMap(map);*/
         return rb.success().setData(pv1);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -48,18 +48,71 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         QueryWrapper<BaseModelConfigVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
             qw.eq("bmc.isDelete", "0");
-            if (StringUtils.isNotBlank(pagerQuery.getVehicleCode())) {//整车编码
+            /*if (StringUtils.isNotBlank(pagerQuery.getVehicleCode())) {//整车编码
                 qw.like("bmc.vehicleCode", pagerQuery.getVehicleCode());
             }
             if (StringUtils.isNotBlank(pagerQuery.getVehicleSid())) {//车型sid
                 qw.eq("bmc.vehicleSid", pagerQuery.getVehicleSid());
+            }*/
+            if (StringUtils.isNotBlank(pagerQuery.getCarColorKey())) {//车身颜色
+                qw.like("bmc.carColorKey", pagerQuery.getCarColorKey());
             }
-            if (StringUtils.isNotBlank(pagerQuery.getSaddle())) {//鞍座
+            if (StringUtils.isNotBlank(pagerQuery.getSlowMachineKey())) {//缓速器key
-                qw.like("bmc.saddle", pagerQuery.getSaddle());
+                qw.like("bmc.slowMachineKey", pagerQuery.getSlowMachineKey());
             }
-            if (StringUtils.isNotBlank(pagerQuery.getSpecification())) {//驾驶室
+            if (StringUtils.isNotBlank(pagerQuery.getRearViewMirrorKey())) {//后视镜key
-                qw.like("bmc.specification", pagerQuery.getSpecification());
+                qw.like("bmc.rearViewMirrorKey", pagerQuery.getRearViewMirrorKey());
-
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getTireSizeKey())) {//轮胎规格key
+                qw.like("bmc.tireSizeKey", pagerQuery.getTireSizeKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getSpecificationKey())) {//驾驶室规格key
+                qw.like("bmc.specificationKey", pagerQuery.getSpecificationKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getRearAxleRatioKey())) {//后桥速比key
+                qw.like("bmc.rearAxleRatioKey", pagerQuery.getRearAxleRatioKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getAirConditionerKey())) {//空调key
+                qw.like("bmc.airConditionerKey", pagerQuery.getAirConditionerKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getHubMaterialKey())) {//轮毂材质key
+                qw.like("bmc.hubMaterialKey", pagerQuery.getHubMaterialKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getBaffleModelKey())) {//导流罩key
+                qw.like("bmc.baffleModelKey", pagerQuery.getBaffleModelKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getSuspensionKey())) {//悬架key
+                qw.like("bmc.suspensionKey", pagerQuery.getSuspensionKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getSeatKey())) {//座椅key
+                qw.like("bmc.seatKey", pagerQuery.getSeatKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getTireCoverKey())) {//护轮罩key
+                qw.like("bmc.tireCoverKey", pagerQuery.getTireCoverKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getSaddleKey())) {//鞍座key
+                qw.like("bmc.saddleKey", pagerQuery.getSaddleKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getWheelbaseKey())) {//轴距key
+                qw.like("bmc.wheelbaseKey", pagerQuery.getWheelbaseKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getBumperKey())) {//保险杠key
+                qw.like("bmc.bumperKey", pagerQuery.getBumperKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getConfiguringBaoKey())) {//配置包key
+                qw.like("bmc.configuringBaoKey", pagerQuery.getConfiguringBaoKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getIndependentSourcesKey())) {//独立热源key
+                qw.like("bmc.independentSourcesKey", pagerQuery.getIndependentSourcesKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getFuelTankKey())) {//油箱/气罐key
+                qw.like("bmc.fuelTankKey", pagerQuery.getFuelTankKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getMultimediaKey())) {//多媒体key
+                qw.like("bmc.multimediaKey", pagerQuery.getMultimediaKey());
+            }
+            if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//简述配置名称
+                qw.like("bmc.configName", pagerQuery.getConfigName());
             }
         }
         return qw;
@@ -82,9 +135,9 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      * @param vehicleCode 车型配置代码
      * @return
      */
-    public int selectBySidAndCode(String vehicleSid, String vehicleCode) {
+   /* public int selectBySidAndCode(String vehicleSid, String vehicleCode) {
         return baseMapper.selectBySidAndCode(vehicleSid, vehicleCode);
-    }
+    }*/
 
     /**
      * @param vehicleSid  车型sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -149,7 +149,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
 			busVehicleApplyDetail.setApplySid(sid);
 			busVehicleApplyDetailService.saveOrUpdate(busVehicleApplyDetail);
 		}
-
+		BigDecimal bigDecimal = new BigDecimal(dto.getCurrentAmount());
+		entity.setCurrentAmount(bigDecimal);
 		this.saveOrUpdate(entity);
 	}