车型报价详情里的 排产列表接口，现车列表接口，车型报价接口，品牌数据字典接口

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

@@ -20,4 +20,7 @@ public class AppBaseConfigNowCarVo implements Vo {
 
     @ApiModelProperty("常用配置")
     private String commonlyConfig;
+
+    @ApiModelProperty("页数")
+    private Long pages;
 }

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class AppBaseConfigOrderCarVo implements Vo {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+
+    @ApiModelProperty("销售指导价")
+    private String price;
+
+    @ApiModelProperty("排产列表")
+    private List<AppBaseNowProduceCarVo> records;
+
+    @ApiModelProperty("常用配置")
+    private String commonlyConfig;
+
+    @ApiModelProperty("页数")
+    private Long pages;
+
+}

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

@@ -0,0 +1,31 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBaseNowProduceCarVo implements Vo {
+
+    @ApiModelProperty("订单编号")
+    private String orderId;
+
+    @ApiModelProperty("状态")
+    private String state;
+
+    @ApiModelProperty("订单日期")
+    private String date;
+
+    @ApiModelProperty("预计上线日期")
+    private String forecastDate;
+
+    @ApiModelProperty("上线日期")
+    private String upDate;
+
+    @ApiModelProperty("下线日期")
+    private String downDate;
+
+    @ApiModelProperty("采购数量")
+    private String number;
+
+}

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

@@ -0,0 +1,31 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCarConfigSummaryDto implements Dto {
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("其他配置说明")
+    private String otherConfig;
+
+    @ApiModelProperty("常用配置")
+    private String config;
+
+    @ApiModelProperty("更多配置")
+    private String moreConfig;
+
+    @ApiModelProperty("车型名称")
+    private String model;
+
+}

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

@@ -241,4 +241,12 @@ public interface BaseVehicleFeign {
     @ApiOperation("手机端-配置列表获取现车列表")
     @PostMapping("/getModelNowCarList")
     public ResultBean<AppBaseConfigNowCarVo> getModelNowCarList(@RequestBody PagerQuery<AppBaseConfigNowCarQuery> pagerQuery);
+
+    @ApiOperation("手机端-配置列表获取排产列表")
+    @PostMapping("/getModelOrderCarList")
+    public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(@RequestBody PagerQuery<AppBaseConfigNowCarQuery> pagerQuery);
+
+    @ApiOperation("手机端-保存 询价 其他配置说明")
+    @PostMapping("/saveCarConfigSummaryInfo")
+    public ResultBean saveCarConfigSummaryInfo(@Valid @RequestBody AppCarConfigSummaryDto dto);
 }

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

@@ -169,4 +169,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
+        return null;
+    }
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDictionariesVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.base.api.basevehiclebrand;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseVehicleBrandDictionariesVo implements Vo {
+
+    @ApiModelProperty("品牌sid")
+    private String sid;
+
+    @ApiModelProperty("品牌key")
+    private String dictKey;
+
+    @ApiModelProperty("品牌value")
+    private String dictValue;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java

@@ -108,4 +108,9 @@ public interface BaseVehicleBrandFeign {
     @ApiOperation("手机端根据厂商sid查询品牌列表")
     @GetMapping("/selectAppListByManufacturerSid")
     ResultBean<List<AppResultData>> selectAppListByManufacturerSid(@RequestParam(value = "manufacturerSid",required = false) String manufacturerSid);
+
+    @ApiOperation("手机端-获取品牌数据字典")
+    @GetMapping("/selectAppListByUserSid/{userSid}")
+    ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(@PathVariable("userSid") String userSid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeignFallback.java

@@ -76,5 +76,10 @@ public class BaseVehicleBrandFeignFallback implements BaseVehicleBrandFeign {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehiclebrand/selectAppListByManufacturerSid无法访问");
     }
 
+    @Override
+    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiry.java

@@ -68,4 +68,10 @@ public class BusVehicleInquiry extends BaseEntity {
     private String customerSid;
     @ApiModelProperty("品牌名称")
     private String brandName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("更多配置")
+    private String moreConfig;
 }

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

@@ -327,8 +327,38 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     /**
      * 根据车型配置及车型查询现车的数量
+     *
      * @param qw 查询条件
      * @return
      */
     Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    /**
+     * 根据车型sid配置sid分公司sid查询车型名称等
+     *
+     * @param modelSid
+     * @param configSid
+     * @param useOrg
+     * @return
+     */
+    AppBaseConfigNowCarVo selectByModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
+
+    /**
+     * 根据车型sid配置sid分公司sid查询车型名称等
+     *
+     * @param modelSid
+     * @param configSid
+     * @param useOrg
+     * @return
+     */
+    AppBaseConfigOrderCarVo getModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
+
+    /**
+     *  手机端-配置列表获取现车列表
+     *
+     * @param page
+     * @param qw
+     * @return
+     */
+    IPage<AppBaseNowProduceCarVo> getModelOrderCarList(IPage<AppBaseNowProduceCarVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseNowProduceCarVo> qw);
 }

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

@@ -663,17 +663,63 @@
     </select>
 
     <select id="fetchVehicle" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
-        SELECT * FROM base_vehicle
+        SELECT *
-                ${ew.customSqlSegment}
+        FROM base_vehicle ${ew.customSqlSegment}
     </select>
 
     <select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
+        SELECT vinNo             AS vin,
+               vehicleStateValue AS `state`,
+               carColor          AS color,
+               location          AS address
+        FROM base_vehicle bv
+                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+            ${ew.customSqlSegment}
 
     </select>
 
     <select id="selectVehicleCount" resultType="java.lang.Integer">
         select count(*)
         from base_vehicle bv
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectByModelSidAndConfigSid"
+            resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
+        select bvm.vehicleAlias AS modelName,
+               bv.guidedPrice   AS price,
+               bmc.configName   AS commonlyConfig
+        from base_vehicle bv
+                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        where bv.modelSid = #{modelSid}
+          AND bv.modelConfigSid = #{configSid}
+          AND bv.useOrg = #{useOrg}
+    </select>
+
+    <select id="getModelSidAndConfigSid"
+            resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
+        select bvm.vehicleAlias AS modelName,
+               bvc.guidedPrice  AS price,
+               bmc.configName   AS commonlyConfig
+        from base_vehmodel_config bvc
+                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+        where bvc.modelSid = #{modelSid}
+          AND bvc.configurationItemsSid = #{configSid}
+          AND bvc.useOrgSid = #{useOrg}
+    </select>
+    <select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
+        select bvo.orderNo AS orderId,
+        bvo.orderStatus AS state,
+        bvo.orderDate AS `date`,
+        bvo.expectLaunchDate AS forecastDate,
+        bvo.launchDate AS `upDate`,
+        bvo.offlineDate AS downDate,
+        bvo.platformNo AS `number`
+        from bus_vehicle_order bvo
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -73,6 +74,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     @Autowired
     private BaseModelConfigService baseModelConfigService;
 
+    @Autowired
+    private BusVehicleInquiryService busVehicleInquiryService;
+
     @Override
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
@@ -547,5 +551,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
+        ResultBean<AppBaseConfigOrderCarVo> rb = ResultBean.fireFail();
+        AppBaseConfigOrderCarVo vo = baseVehicleService.getModelOrderCarList(pagerQuery);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        busVehicleInquiryService.saveCarConfigSummaryInfo(dto);
+        return rb.success();
+    }
+
 
 }

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

@@ -6,9 +6,12 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
@@ -54,6 +57,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     @Autowired
     private BaseModelConfigService baseModelConfigService;
     @Autowired
+    private BaseVehicleModelService baseVehicleModelService;
+    @Autowired
     private CommonAppendixService commonAppendixService;
     @Autowired
     private BaseVehicleAppendixService baseVehicleAppendixService;
@@ -1166,32 +1171,32 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (query.getSidList().size() > 0) {
                 qw.notIn("bv.sid", query.getSidList());
             }
-            if(StringUtils.isNotBlank(query.getLinkNo())){
+            if (StringUtils.isNotBlank(query.getLinkNo())) {
-                qw.like("bv.vinNo",query.getLinkNo());
+                qw.like("bv.vinNo", query.getLinkNo());
             }
         }
         return qw;
     }
 
-    public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid,String modelSid) {
+    public ResultBean<BaseVehicleVo> fetchVehicle(String vehicleSid, String modelSid) {
         ResultBean rb = ResultBean.fireFail();
-        QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid,modelSid);
+        QueryWrapper<BaseVehicleVo> qw = vehicleActualWrapper1(vehicleSid, modelSid);
         BaseVehicleVo baseVehicleVo = baseMapper.fetchVehicle(qw);
         return rb.success().setData(baseVehicleVo);
     }
 
-    private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid,String modelSid) {
+    private QueryWrapper<BaseVehicleVo> vehicleActualWrapper1(String vehicleSid, String modelSid) {
         QueryWrapper<BaseVehicleVo> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotBlank(vehicleSid)){
+        if (StringUtils.isNotBlank(vehicleSid)) {
             String[] split = vehicleSid.split(",");
             for (String s : split) {
-                qw.ne("sid",s);
+                qw.ne("sid", s);
             }
         }
-        qw.eq("modelSid",modelSid);
+        qw.eq("modelSid", modelSid);
-        qw.eq("vehicleState",0005);
+        qw.eq("vehicleState", 0005);
-        qw.eq("lockedState",03);
+        qw.eq("lockedState", 03);
         return qw;
     }
 
@@ -1204,8 +1209,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public AppBaseConfigNowCarVo getModelNowCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
         AppBaseConfigNowCarQuery query = pagerQuery.getParams();
         SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData();
-        String useOrg = data.getSid();
+        query.setUseOrg(data.getSid());
-        AppBaseConfigNowCarVo appBaseConfigNowCarVo = new AppBaseConfigNowCarVo();
+        AppBaseConfigNowCarVo appBaseConfigNowCarVo = baseMapper.selectByModelSidAndConfigSid(query.getModelSid(), query.getConfigSid(), query.getUseOrg());
         List<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>();
         QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(query);
         IPage<AppBaseVinNowCarVo> page = PagerUtil.queryToPage(pagerQuery);
@@ -1214,6 +1219,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             vinNowCarVos.add(record);
         }
         appBaseConfigNowCarVo.setRecords(vinNowCarVos);
+        long pages = pagging.getPages();
+        appBaseConfigNowCarVo.setPages(pages);
         return appBaseConfigNowCarVo;
     }
 
@@ -1221,23 +1228,66 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         QueryWrapper<AppBaseVinNowCarVo> qw = new QueryWrapper<>();
         if (query != null) {
             if (StringUtils.isNotBlank(query.getNames())) {
-                qw.eq("bv.modelSid", query.getModelSid());//车型sid
+                qw.like("bv.vinNo", query.getNames());//车架号
             }
             if (StringUtils.isNotBlank(query.getNames())) {
-                qw.eq("bv.modelConfigSid", query.getConfigSid());//配置sid
+                qw.like("bv.vehicleStateValue", query.getNames());//状态
             }
             if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bv.vinNo", query.getNames());//车架号
+                qw.like("bmc.carColor", query.getNames());//车身颜色
             }
-            if (StringUtils.isNotBlank(query.getUseOrg())) {
+            if (StringUtils.isNotBlank(query.getNames())) {
+                qw.like("bv.location", query.getNames());//存放地点
+            }
+            if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bv.useOrg", query.getUseOrg());
             }
         }
         return qw;
     }
 
+    /**
+     * 手机端-配置列表获取排产列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public AppBaseConfigOrderCarVo getModelOrderCarList(PagerQuery<AppBaseConfigNowCarQuery> pagerQuery) {
+        AppBaseConfigNowCarQuery query = pagerQuery.getParams();
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(query.getUserSid()).getData();
+        query.setUseOrg(data.getSid());
+        AppBaseConfigOrderCarVo appBaseConfigOrderCarVo = baseMapper.getModelSidAndConfigSid(query.getModelSid(), query.getConfigSid(), query.getUseOrg());
+        List<AppBaseNowProduceCarVo> vinNowCarVos = new ArrayList<>();
+        QueryWrapper<AppBaseNowProduceCarVo> qw = nowProduceWrapper(query);
+        IPage<AppBaseNowProduceCarVo> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AppBaseNowProduceCarVo> pagging = baseMapper.getModelOrderCarList(page, qw);
+        List<AppBaseNowProduceCarVo> records = pagging.getRecords();
+        for (AppBaseNowProduceCarVo record : records) {
+            vinNowCarVos.add(record);
+        }
+        appBaseConfigOrderCarVo.setRecords(vinNowCarVos);
+        long pages = pagging.getPages();
+        appBaseConfigOrderCarVo.setPages(pages);
+        return appBaseConfigOrderCarVo;
+    }
+
+
+    private QueryWrapper<AppBaseNowProduceCarVo> nowProduceWrapper(AppBaseConfigNowCarQuery query) {
+        QueryWrapper<AppBaseNowProduceCarVo> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getNames())) {
+                qw.like("bvo.orderStatus", query.getNames());//订单状态
+            }
+            if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
+                qw.eq("bvo.useOrg", query.getUseOrg());
+            }
+        }
+        return qw;
+    }
+
     /**
      * 根据车型及车型配置查询
+     *
      * @param query 查询条件
      * @return
      */

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java

@@ -122,4 +122,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper<BaseVehicleBrand> {
 
     @Select("select brandShortName from base_vehicle_brand where sid=#{sid}")
     String getBrandShortName(@Param("sid") String sid);
+
+    List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(@Param("useOrg") String useOrg);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@@ -98,4 +98,11 @@
         FROM base_vehicle_brand bvb
         where bvb.manufacturerSid = #{manufacturerSid}
     </select>
+    <!--根据分公司sid查询所有品牌列表-->
+    <select id="selectAppListByUserSid"
+            resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo">
+        SELECT bvb.brandName as dictValue, bvb.sid as dictKey, bvb.sid
+        FROM base_vehicle_brand bvb
+        where bvb.useOrg = #{useOrg}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java

@@ -170,4 +170,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign {
         List<AppResultData> resultData = baseVehicleBrandService.selectAppListByManufacturerSid(manufacturerSid);
         return new ResultBean<List<AppResultData>>().success().setData(resultData);
     }
+
+    @Override
+    public ResultBean<List<BaseVehicleBrandDictionariesVo>> selectAppListByUserSid(String userSid) {
+        List<BaseVehicleBrandDictionariesVo> list = baseVehicleBrandService.selectAppListByUserSid(userSid);
+        return  new ResultBean<List<BaseVehicleBrandDictionariesVo>>().success().setData(list);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@@ -60,7 +60,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
      */
     private QueryWrapper<BaseVehicleBrandVo> buildQueryWrapper(BaseVehicleBrandQuery pagerQuery) {
         QueryWrapper<BaseVehicleBrandVo> qw = new QueryWrapper<>();
-        qw.eq("bvb.isDelete",0);
+        qw.eq("bvb.isDelete", 0);
         if (pagerQuery != null) {
             if (StringUtils.isNotBlank(pagerQuery.getBrandName())) {//品牌名称
                 qw.like("bvb.brandName", pagerQuery.getBrandName());
@@ -123,8 +123,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
         if (StringUtils.isNotBlank(brandCode)) {//品牌编码
             qw.like("bvb.brandCode", brandCode);
         }
-        if(StringUtils.isNotBlank(query.getManufacturerName())){
+        if (StringUtils.isNotBlank(query.getManufacturerName())) {
-            qw.like("bm.manufacturerName",query.getManufacturerName());
+            qw.like("bm.manufacturerName", query.getManufacturerName());
         }
         return baseMapper.listExcel(qw);
     }
@@ -149,8 +149,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
                 if (resultBean.getSuccess()) {
                     list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
                 }
-               // s = new String[][]{list1};
+                // s = new String[][]{list1};
-                s[i]=list1;
+                s[i] = list1;
             }
             baseVehicleBrandDetailsVo.setUseOrg(s);
         }
@@ -222,10 +222,25 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
 
     /**
      * 根据sid查询品牌简称
+     *
      * @param sid
      * @return
      */
     public String getBrandShortName(String sid) {
         return baseMapper.getBrandShortName(sid);
-    };
+    }
+
+    ;
+
+    /**
+     * 手机端-获取品牌数据字典
+     *
+     * @param userSid
+     * @return
+     */
+    public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(String userSid) {
+        String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(useOrg);
+        return list;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java

@@ -28,15 +28,26 @@ package com.yxt.anrui.base.biz.busvehicleinquiry;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.AppCarConfigSummaryDto;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.busvehicleinquiry.*;
+import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.crypto.Data;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,83 +65,118 @@ import java.util.List;
  */
 @Service
 public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInquiryMapper, BusVehicleInquiry> {
-	public PagerVo<BusVehicleInquiry> listPage(PagerQuery<BusVehicleInquiryQuery> pq) {
-		BusVehicleInquiryQuery query = pq.getParams();
-		QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-		IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
-		IPage<BusVehicleInquiry> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<BusVehicleInquiry> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	public List<BusVehicleInquiry> listAll(BusVehicleInquiryQuery query) {
-		QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
-	private QueryWrapper<BusVehicleInquiry> createQueryWrapper(BusVehicleInquiryQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BusVehicleInquiry> qw = new QueryWrapper<>();
-
-
-		if (StringUtils.isNotBlank(query.getInquiryDate())) {
-			qw.eq("inquiryDate", query.getInquiryDate());
-		}
-
-		if (StringUtils.isNotBlank(query.getInquirer())) {
-			qw.eq("inquirer", query.getInquirer());
-		}
-
-		if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
-			qw.eq("createOrgSid", query.getCreateOrgSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getBrandSid())) {
-			qw.eq("brandSid", query.getBrandSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getModelName())) {
-			qw.eq("modelName", query.getModelName());
-		}
-
-		if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) {
-			qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration());
-		}
-
-		if (StringUtils.isNotBlank(query.getOtherConfig())) {
-			qw.eq("otherConfig", query.getOtherConfig());
-		}
-		return qw;
-	}
-	
-	public PagerVo<BusVehicleInquiryVo> listPageVo(PagerQuery<BusVehicleInquiryQuery> pq) {
-		BusVehicleInquiryQuery query = pq.getParams();
-		QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-		IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
-		IPage<BusVehicleInquiryVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BusVehicleInquiryVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public List<BusVehicleInquiryVo> listAllVo(BusVehicleInquiryQuery query) {
-		QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-	
-	public List<BusVehicleInquiryVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-	
-	public void saveOrUpdateDto(BusVehicleInquiryDto dto){
-		BusVehicleInquiry entity = new BusVehicleInquiry();
-		dto.fillEntity(entity);
-		this.saveOrUpdate(entity);
-	}
-	
-	public BusVehicleInquiryVo fetchByIdVo(String id){
-		BusVehicleInquiry entity = this.fetchById(id);
-		BusVehicleInquiryVo vo = new BusVehicleInquiryVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
 
+    @Autowired
+    SysUserFeign sysUserFeign;
+
+    @Autowired
+    BaseVehicleModelService baseVehicleModelService;
+
+    public PagerVo<BusVehicleInquiry> listPage(PagerQuery<BusVehicleInquiryQuery> pq) {
+        BusVehicleInquiryQuery query = pq.getParams();
+        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
+        IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
+        IPage<BusVehicleInquiry> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<BusVehicleInquiry> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BusVehicleInquiry> listAll(BusVehicleInquiryQuery query) {
+        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<BusVehicleInquiry> createQueryWrapper(BusVehicleInquiryQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusVehicleInquiry> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getInquiryDate())) {
+            qw.eq("inquiryDate", query.getInquiryDate());
+        }
+
+        if (StringUtils.isNotBlank(query.getInquirer())) {
+            qw.eq("inquirer", query.getInquirer());
+        }
+
+        if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
+            qw.eq("createOrgSid", query.getCreateOrgSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("brandSid", query.getBrandSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getModelName())) {
+            qw.eq("modelName", query.getModelName());
+        }
+
+        if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) {
+            qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration());
+        }
+
+        if (StringUtils.isNotBlank(query.getOtherConfig())) {
+            qw.eq("otherConfig", query.getOtherConfig());
+        }
+        return qw;
+    }
+
+    public PagerVo<BusVehicleInquiryVo> listPageVo(PagerQuery<BusVehicleInquiryQuery> pq) {
+        BusVehicleInquiryQuery query = pq.getParams();
+        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
+        IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
+        IPage<BusVehicleInquiryVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusVehicleInquiryVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BusVehicleInquiryVo> listAllVo(BusVehicleInquiryQuery query) {
+        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
+        return baseMapper.selectListAllVo(qw);
+    }
+
+    public List<BusVehicleInquiryVo> listVo() {
+        return baseMapper.selectListVo();
+    }
+
+    public void saveOrUpdateDto(BusVehicleInquiryDto dto) {
+        BusVehicleInquiry entity = new BusVehicleInquiry();
+        dto.fillEntity(entity);
+        this.saveOrUpdate(entity);
+    }
+
+    public BusVehicleInquiryVo fetchByIdVo(String id) {
+        BusVehicleInquiry entity = this.fetchById(id);
+        BusVehicleInquiryVo vo = new BusVehicleInquiryVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    /**
+     * 车型报价点击询价保存询价数据
+     *
+     * @param dto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) {
+        BusVehicleInquiry busVehicleInquiry = new BusVehicleInquiry();
+        busVehicleInquiry.setModelSid(dto.getModelSid());
+        busVehicleInquiry.setConfigSid(dto.getConfigSid());
+        busVehicleInquiry.setModelName(dto.getModel());
+        busVehicleInquiry.setOtherConfig(dto.getOtherConfig());
+        busVehicleInquiry.setModelBriefConfiguration(dto.getConfig());
+        busVehicleInquiry.setMoreConfig(dto.getMoreConfig());
+        String userSid = dto.getUserSid();
+        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
+        busVehicleInquiry.setInquirer(data.getStaffName());
+        busVehicleInquiry.setCreateOrgSid(data.getOrgSid());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String format = simpleDateFormat.format(new Date());
+        busVehicleInquiry.setInquiryDate(format);
+        BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid());
+        busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand());
+        busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName());
+        save(busVehicleInquiry);
+    }
 }