添加车型查询条件以及修复资方下拉框报错

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

@@ -8,91 +8,85 @@ import lombok.Data;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 移动端、pc的车型配置列表返回数据集
+ */
 @Data
 public class AppModelConfigListVo implements Vo {
 
+    private static final long serialVersionUID = -1356572673475067402L;
     @ApiModelProperty(value = "配置sid")
     private String configSid;
 
     @ApiModelProperty(value = "常用配置名称")
     private String configName;
+    @ApiModelProperty(value = "颜色")
+    private String carColor;
+    @ApiModelProperty(value = "现车")
+    private String nowCarNum;
+    @ApiModelProperty(value = "排产车")
+    private String produceCarNum;
+    @ApiModelProperty(value = "指导价")
+    private String price;
+    @ApiModelProperty(value = "更多配置")
+    private List<MoreConfigVo> moreList = new ArrayList<>();
+
     //常用配置名称拼接字段
-    @ApiModelProperty(value = "缓冲器")
+    @ApiModelProperty(value = "缓冲器：后端内部使用")
     private String slowMachine;
-    @ApiModelProperty(value = "后视镜")
+    @ApiModelProperty(value = "后视镜：后端内部使用")
     private String rearViewMirror;
-    @ApiModelProperty(value = "轮胎")
+    @ApiModelProperty(value = "轮胎：后端内部使用")
     private String tireSize;
-    @ApiModelProperty(value = "驾驶室")
+    @ApiModelProperty(value = "驾驶室：后端内部使用")
     private String specification;
-    @ApiModelProperty(value = "后桥速比")
+    @ApiModelProperty(value = "后桥速比：后端内部使用")
     private String rearAxleRatio;
-    @ApiModelProperty(value = "空调")
+    @ApiModelProperty(value = "空调：后端内部使用")
     private String airConditioner;
-    @ApiModelProperty(value = "轮毂材质")
+    @ApiModelProperty(value = "轮毂材质：后端内部使用")
     private String hubMaterial;
-    @ApiModelProperty(value = "导流罩")
+    @ApiModelProperty(value = "导流罩：后端内部使用")
     private String baffleModel;
-    @ApiModelProperty(value = "悬架")
+    @ApiModelProperty(value = "悬架：后端内部使用")
     private String suspension;
-    @ApiModelProperty(value = "座椅")
+    @ApiModelProperty(value = "座椅：后端内部使用")
     private String seat;
-    @ApiModelProperty(value = "护轮罩")
+    @ApiModelProperty(value = "护轮罩：后端内部使用")
     private String tireCover;
-    @ApiModelProperty(value = "鞍座")
+    @ApiModelProperty(value = "鞍座：后端内部使用")
     private String saddle;
-    @ApiModelProperty(value = "轴距")
+    @ApiModelProperty(value = "轴距：后端内部使用")
     private String wheelbase;
-    @ApiModelProperty(value = "保险杠")
+    @ApiModelProperty(value = "保险杠：后端内部使用")
     private String bumper;
-    @ApiModelProperty(value = "配置包")
+    @ApiModelProperty(value = "配置包：后端内部使用")
     private String configuringBao;
-    @ApiModelProperty(value = "独立热源")
+    @ApiModelProperty(value = "独立热源：后端内部使用")
     private String independentSources;
-    @ApiModelProperty(value = "燃料箱")
+    @ApiModelProperty(value = "燃料箱：后端内部使用")
     private String fuelTank;
-    @ApiModelProperty(value = "多媒体")
+    @ApiModelProperty(value = "多媒体：后端内部使用")
     private String multimedia;
 
-    @ApiModelProperty(value = "颜色")
-    private String carColor;
 
-    @ApiModelProperty(value = "有效期")
+    @ApiModelProperty(value = "有效期：移动")
     private String priceValidity;
 
-//    @ApiModelProperty(value = "指导价")
+    //    @ApiModelProperty(value = "指导价")
 //    private String guidedPrice;
-
-    @ApiModelProperty(value = "指导价")
-    private String price;
-
-    @ApiModelProperty(value = "现车")
-    private String nowCarNum;
-
-    @ApiModelProperty(value = "排产车")
-    private String produceCarNum;
-
-    @ApiModelProperty(value = "更多配置")
-    private List<MoreConfigVo> moreList = new ArrayList<>();
-
     @ApiModelProperty(value = "辆(已废弃)")
     private String vehicleQuantity;
-
-    @ApiModelProperty(value = "车型sid")
+    @ApiModelProperty(value = "车型sid：内部")
     private String modelSid;
-
-    @ApiModelProperty(value = "车型名称")
+    @ApiModelProperty(value = "车型名称:移动")
     private String modelName;
-
-    @ApiModelProperty(value = "车型名称")
+    @ApiModelProperty(value = "车型名称：移动")
     private String model;
-
-    @ApiModelProperty(value = "品牌名称")
+    @ApiModelProperty(value = "品牌名称：移动")
     private String brand;
-
-    @ApiModelProperty(value = "更多配置")
+    @ApiModelProperty(value = "更多配置：移动")
     private String otherConfig;
-
-    @ApiModelProperty(value = "品牌sid")
+    @ApiModelProperty(value = "品牌sid：移动")
     private String brandSid;
 }

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

@@ -121,9 +121,9 @@ public interface BaseModelConfigFeign {
      * @param pagerQuery
      * @return
      */
-    @ApiOperation("车型配置分页列表(新)")
+   /* @ApiOperation("车型配置分页列表(新)")
     @PostMapping("/configPageList")
-    ResultBean<PagerVo<BaseModelConfigListVo>> configPageList(@Valid @RequestBody PagerQuery<BaseModelConfigListQuery> pagerQuery);
+    ResultBean<PagerVo<BaseModelConfigListVo>> configPageList(@Valid @RequestBody PagerQuery<BaseModelConfigListQuery> pagerQuery);*/
 
     /**
      * 更多配置分页列表(非本公司的)
@@ -149,13 +149,13 @@ public interface BaseModelConfigFeign {
     @GetMapping("/getAppDetailByModelConfigSid")
     public ResultBean<AppModelConfigDetailsVo> getAppDetailByModelConfigSid(@RequestParam("sid") String sid);
 
-    @ApiOperation("App车型报价-获取当前车型配置（新）")
+    @ApiOperation("App车型报价获取当前车型配置（新)以及pc端车型查询配置")
     @PostMapping("/getModelConfigList")
-    public ResultBean<AppModelConfigVo> getModelConfigList(@Valid @RequestBody PagerQuery<AppModelConfigListQuery> pagerQuery);
+    public ResultBean<ModelConfigVo> getModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
 
     @ApiOperation("App车型报价-获取现车配置列表（新）")
     @PostMapping("/getNowConfigList")
-    public ResultBean<AppModelConfigVo> getNowConfigList(@Valid @RequestBody PagerQuery<AppModelConfigListQuery> pagerQuery);
+    public ResultBean<ModelConfigVo> getNowConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
 
 
 }

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

@@ -85,10 +85,10 @@ public  class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
         return null;
     }
 
-    @Override
+  /*  @Override
     public ResultBean<PagerVo<BaseModelConfigListVo>> configPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
         return null;
-    }
+    }*/
 
   /*  @Override
     public ResultBean<PagerVo<BaseModelConfigListVo>> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
@@ -106,12 +106,12 @@ public  class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
     }
 
     @Override
-    public ResultBean<AppModelConfigVo> getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+    public ResultBean<ModelConfigVo> getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
         return null;
     }
 
     @Override
-    public ResultBean<AppModelConfigVo> getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+    public ResultBean<ModelConfigVo> getNowConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
         return null;
     }
 }

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

@@ -4,8 +4,6 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @Author dimengzhe
  * @Date 2022/2/24 9:00
@@ -18,8 +16,8 @@ public class BaseModelConfigListQuery implements Query {
     @ApiModelProperty(value = "车型sid")
     private String modelSid;
 
-    @ApiModelProperty(value = "配置sid")
-    private String configSid;
+   /* @ApiModelProperty(value = "配置sid")
+    private String configSid;*/
 
     @ApiModelProperty(value = "颜色key")
     private String carColor;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListQuery.java → anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java

@@ -5,75 +5,57 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class AppModelConfigListQuery implements Query {
+public class ModelConfigListQuery implements Query {
 
-    @ApiModelProperty("名称")
-    private String name;
+    private static final long serialVersionUID = 5814288614943073722L;
 
     @ApiModelProperty("颜色")
     private String bodyColor;
-
     @ApiModelProperty("缓速器")
     private String slowMachine;
-
     @ApiModelProperty("后视镜")
     private String rearViewMirror;
-
     @ApiModelProperty("轮胎")
     private String tireSize;
-
     @ApiModelProperty("驾驶室")
     private String specification;
-
     @ApiModelProperty("后桥速比")
     private String rearAxleRatio;
-
     @ApiModelProperty("空调")
     private String airConditioner;
-
     @ApiModelProperty("轮毂材质")
     private String hubMaterial;
-
     @ApiModelProperty("导流罩")
     private String diversionCover;
-
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-
-    @ApiModelProperty("多媒体")
-    private String multiMedia;
-
-    @ApiModelProperty("燃料箱")
-    private String fuelTank;
-
-    @ApiModelProperty("独立热源")
-    private String independentSources;
-
-    @ApiModelProperty("配置包")
-    private String configuringBao;
-
-    @ApiModelProperty("保险杠")
-    private String bumper;
-
+    @ApiModelProperty("悬架")
+    private String suspension;
+    @ApiModelProperty("座椅")
+    private String seat;
+    @ApiModelProperty("护轮罩")
+    private String protectTireCover;
     @ApiModelProperty("轴距")
     private String wheelbase;
-
     @ApiModelProperty("鞍座")
     private String saddle;
+    @ApiModelProperty("配置包")
+    private String configuringBao;
+    @ApiModelProperty("保险杠")
+    private String bumper;
+    @ApiModelProperty("燃料箱")
+    private String fuelTank;
+    @ApiModelProperty("独立热源")
+    private String independentSources;
+    @ApiModelProperty("多媒体")
+    private String multiMedia;
 
-    @ApiModelProperty("护轮罩")
-    private String protectTireCover;
-
-    @ApiModelProperty("座椅")
-    private String seat;
-
-    @ApiModelProperty("悬架")
-    private String suspension;
-
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
     @ApiModelProperty("用户sid")
     private String userSid;
-
-    @ApiModelProperty("分公司")
+    @ApiModelProperty("分公司：后端内部使用")
     private String useOrg;
 
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigVo.java → anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigVo.java

@@ -8,69 +8,52 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class AppModelConfigVo implements Vo {
+public class ModelConfigVo implements Vo {
 
     private static final long serialVersionUID = 5814288614943073790L;
-    @ApiModelProperty("车型图片")
-    private List<String> modelImage;
-
     @ApiModelProperty("车型名称")
     private String modelName;
+    @ApiModelProperty("配置列表")
+    private List<AppModelConfigListVo> modelConfigList;
+    @ApiModelProperty(value = "页数")
+    private Integer pages;
 
-    @ApiModelProperty("指导价")
-    private String price;
-
-    @ApiModelProperty("车型list")
+    @ApiModelProperty("车型图片：移动端使用")
+    private List<String> modelImage;
+    @ApiModelProperty("车型list:移动端使用")
     private List<ConfigInfo> configList;
-
-    @ApiModelProperty("品牌名称")
+    @ApiModelProperty("指导价：移动端使用")
+    private String price;
+    @ApiModelProperty("品牌名称：移动端使用")
     private String brandName;
-
-    @ApiModelProperty("版本")
+    @ApiModelProperty("版本：移动端使用")
     private String vehicleVersionValue;
-
-    @ApiModelProperty("配置列表")
-    private List<AppModelConfigListVo> modelConfigList;
-
-    @ApiModelProperty(value = "功能")
+    @ApiModelProperty(value = "功能：移动端使用")
     private String vehicleTypeValue;
-
-    @ApiModelProperty(value = "系列")
+    @ApiModelProperty(value = "系列：移动端使用")
     private String productLineValue;
-
-    @ApiModelProperty(value = "驱动")
+    @ApiModelProperty(value = "驱动：移动端使用")
     private String driveFormValue;
-
-    @ApiModelProperty(value = "马力")
+    @ApiModelProperty(value = "马力：移动端使用")
     private String powerValue;
-
-    @ApiModelProperty(value = "燃料")
+    @ApiModelProperty(value = "燃料：移动端使用")
     private String fuelTypeValue;
-
-    @ApiModelProperty(value = "变速箱")
+    @ApiModelProperty(value = "变速箱：移动端使用")
     private String gearboxTypeValue;
-
-    @ApiModelProperty(value = "细分市场")
+    @ApiModelProperty(value = "细分市场：移动端使用")
     private String marketSegments;
-
-    @ApiModelProperty(value = "系别")
+    @ApiModelProperty(value = "系别：移动端使用")
     private String department;
-
-    @ApiModelProperty(value = "发动机型号")
+    @ApiModelProperty(value = "发动机型号：移动端使用")
     private String engineTypeValue;
-
-    @ApiModelProperty(value = "公告型号")
+    @ApiModelProperty(value = "公告型号：移动端使用")
     private String announcementModel;
-
-    @ApiModelProperty(value = "规格型号")
+    @ApiModelProperty(value = "规格型号：移动端使用")
     private String specifications;
-
-    @ApiModelProperty(value = "货箱")
+    @ApiModelProperty(value = "货箱：移动端使用")
     private String packingCase;
-
-    @ApiModelProperty(value = "内部编码")
+    @ApiModelProperty(value = "内部编码：移动端使用")
     private String insideCode;
 
-    @ApiModelProperty(value = "页数")
-    private Integer pages;
+
 }

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

@@ -54,4 +54,9 @@ public class VehicleModelPriceQuery implements Query {
 
     @ApiModelProperty(value = "分公司:后端内部使用")
     private String useOrg;
+
+    @ApiModelProperty(value = "系列")
+    private String productLine;
+    @ApiModelProperty(value = "发动机型号")
+    private String engineType;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefinbank/BaseFinBankService.java

@@ -177,7 +177,7 @@ public class BaseFinBankService extends MybatisBaseService<BaseFinBankMapper, Ba
     public List<Map<String, Object>> namesDown(String manageName) {
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(manageName)) {
-            qw.like("bb.manageName", manageName);
+            qw.like("bb.bankName", manageName);
         }
         return baseMapper.namesDown(qw);
     }

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

@@ -154,7 +154,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      * @param qw   查询条件
      * @return
      */
-    IPage<BaseModelConfigListVo> configPageList(IPage<BaseModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelConfigListVo> qw);
+//    IPage<BaseModelConfigListVo> configPageList(IPage<BaseModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelConfigListVo> qw);
 
     /**
      * 更多配置分页列表(非本公司的)
@@ -183,11 +183,11 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
     AppModelConfigDetailsVo getAppProductionSchedulingDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     //查询车型信息
-    AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid);
+    ModelConfigVo getModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid);
 
-    List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey,@Param("orgSid")String orgSid);
+    List<AppModelConfigListVo> getModelConfigPageList(IPage<ModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid")String orgSid);
 
-    List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw,@Param("orgSid")String orgSid,@Param("state")String state);
+    List<AppModelConfigListVo> getNowConfigList(IPage<ModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("orgSid")String orgSid, @Param("state")String state);
 
     List<MoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg, @Param("state")String state);
 

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

@@ -298,7 +298,7 @@
           AND bvc.useOrgSid = #{useOrg}
     </select>
 
-    <select id="configPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
+   <!-- <select id="configPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
         SELECT bc.sid,
                bc.slowMachine,
                bc.rearViewMirror,
@@ -343,7 +343,7 @@
             productionCarNum
         DESC
     </select>
-
+-->
    <!-- <select id="notTheCompanyConfigPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
         SELECT (SELECT count(*)
                 FROM base_vehicle bv
@@ -473,7 +473,7 @@
           AND bvm.sid = #{modelSid}
     </select>
 
-    <select id="getModelConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigVo">
+    <select id="getModelConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo">
         SELECT bvm.vehicleAlias                                        AS modelName,
                bvm.brandName,
                bvm.vehicleVersionValue,

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

@@ -371,14 +371,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
      * @param pagerQuery 查询条件
      * @return
      */
-    @Override
+ /*   @Override
     public ResultBean<PagerVo<BaseModelConfigListVo>> configPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
         ResultBean<PagerVo<BaseModelConfigListVo>> rb = ResultBean.fireFail();
         IPage<BaseModelConfigListVo> page = baseModelConfigService.configPageList(pagerQuery);
         PagerVo<BaseModelConfigListVo> pv = new PagerVo<>();
         PagerVo<BaseModelConfigListVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);
-    }
+    }*/
 
     /**
      * 更多配置分页列表(非本公司的)
@@ -412,8 +412,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     }
 
     @Override
-    public ResultBean<AppModelConfigVo> getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
-        ResultBean<AppModelConfigVo> rb = ResultBean.fireFail();
+    public ResultBean<ModelConfigVo> getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
+        ResultBean<ModelConfigVo> rb = ResultBean.fireFail();
         String modelSid = pagerQuery.getParams().getModelSid();
         String userSid = pagerQuery.getParams().getUserSid();
         if (StringUtils.isBlank(modelSid)) {
@@ -422,14 +422,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         if (StringUtils.isBlank(userSid)) {
             return rb.setMsg("参数错误，用户sid不允许为空");
         }
-        AppModelConfigVo vo = baseModelConfigService.getModelConfigList(pagerQuery);
+        ModelConfigVo vo = baseModelConfigService.getModelConfigList(pagerQuery);
         return rb.success().setData(vo);
     }
 
     @Override
-    public ResultBean<AppModelConfigVo> getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
-        ResultBean<AppModelConfigVo> rb = ResultBean.fireFail();
-        AppModelConfigVo vo = baseModelConfigService.getNowConfigList(pagerQuery);
+    public ResultBean<ModelConfigVo> getNowConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
+        ResultBean<ModelConfigVo> rb = ResultBean.fireFail();
+        ModelConfigVo vo = baseModelConfigService.getNowConfigList(pagerQuery);
         return rb.success().setData(vo);
     }
 }

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

@@ -293,7 +293,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      * @param pagerQuery 查询条件
      * @return
      */
-    public IPage<BaseModelConfigListVo> configPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
+  /*  public IPage<BaseModelConfigListVo> configPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         pagerQuery.getParams().setUseOrg(orgSid);
@@ -303,7 +303,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         List<BaseModelConfigListVo> records = iPage.getRecords();
         getConfigName(records);
         for (BaseModelConfigListVo vo : records) {
-            List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(pagerQuery.getParams().getModelSid(), pagerQuery.getParams().getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
+            List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(pagerQuery.getParams().getModelSid(), vo.getSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
             for (MoreConfigVo moreConfigVo : moreConfigVos) {
                 String sid = moreConfigVo.getUseOrgSid();
                 SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
@@ -312,7 +312,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             vo.setMoreList(moreConfigVos);
         }
         return iPage;
-    }
+    }*/
 
     public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
         for (BaseModelConfigListVo record : records) {
@@ -387,7 +387,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      * @param query 查询条件
      * @return
      */
-    private QueryWrapper<BaseModelConfigListVo> createBuildQueryWrapper(BaseModelConfigListQuery query) {
+   /* private QueryWrapper<BaseModelConfigListVo> createBuildQueryWrapper(BaseModelConfigListQuery query) {
         QueryWrapper<BaseModelConfigListVo> qw = new QueryWrapper<>();
         //颜色
         if (StringUtils.isNotBlank(query.getCarColor())) {
@@ -473,17 +473,13 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         if (StringUtils.isNotBlank(query.getModelSid())) {
             qw.eq("bvc.modelSid", query.getModelSid());
         }
-        //配置sid
-        if (StringUtils.isNotBlank(query.getConfigSid())) {
-            qw.eq("bc.sid", query.getConfigSid());
-        }
         //分公司
         if (StringUtils.isNotBlank(query.getUseOrg())) {
             qw.eq("bvc.useOrgSid", query.getUseOrg());
         }
         return qw;
     }
-
+*/
     /**
      * 根据配置sid查询车型库配置详情
      *
@@ -499,7 +495,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         return appModelConfigDetailsVo;
     }
 
-    public AppModelConfigVo getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+    public ModelConfigVo getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         // 1、根据业务员部门sid查询分公司sid
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
@@ -507,7 +503,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             pagerQuery.getParams().setUseOrg(orgSid);
         }
         String modelSid = pagerQuery.getParams().getModelSid();
-        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid);
+        ModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid);
         List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
         List<String> modelImagesList = new ArrayList<>();
         if (!modelImages.isEmpty()) {
@@ -518,7 +514,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             }
         }
         vo.setModelImage(modelImagesList);
-
         //基础配置拼接
         List<ConfigInfo> list = new ArrayList<>();
         list.add(getConfigValue("品牌", vo.getBrandName()));
@@ -538,7 +533,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         list.add(getConfigValue("内部编码", vo.getInsideCode()));
         vo.setConfigList(list);
         //配置列表
-        IPage<AppModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
         List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
         long pages = page.getPages();
@@ -561,12 +556,12 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         return vo;
     }
 
-    public AppModelConfigVo getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+    public ModelConfigVo getNowConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         // 1、根据业务员部门sid查询分公司 查询orgSidPath（部门路径）
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         String modelSid = pagerQuery.getParams().getModelSid();
-        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid);
+        ModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid);
         List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
         List<String> modelImagesList = new ArrayList<>();
         if (!modelImages.isEmpty()) {
@@ -597,7 +592,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         list.add(getConfigValue("内部编码", vo.getInsideCode()));
         vo.setConfigList(list);
         //配置列表
-        IPage<AppModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
         List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getNowConfigList(page, qw, orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
         long pages = page.getPages();
@@ -709,7 +704,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         return configInfo;
     }
 
-    private QueryWrapper<AppModelConfigListVo> modelConfigQueryWrapper(AppModelConfigListQuery pagerQuery) {
+    private QueryWrapper<AppModelConfigListVo> modelConfigQueryWrapper(ModelConfigListQuery pagerQuery) {
         QueryWrapper<AppModelConfigListVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//名称

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

@@ -793,6 +793,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getProductLine())) {
+            qw.eq("bvm.productLineValue", pagerQuery.getProductLine());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {
+            qw.eq("bvm.engineTypeValue", pagerQuery.getEngineType());
+
+        }
         return qw;
     }