pc端车型查询接口，手机端车型查询接口

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

@@ -0,0 +1,79 @@
+package com.yxt.anrui.base.api.basemodelconfig;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppModelConfigListQuery implements Query {
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @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 wheelbase;
+
+    @ApiModelProperty("鞍座")
+    private String saddle;
+
+    @ApiModelProperty("护轮罩")
+    private String protectTireCover;
+
+    @ApiModelProperty("座椅")
+    private String seat;
+
+    @ApiModelProperty("悬架")
+    private String suspension;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("分公司")
+    private String useOrg;
+
+}

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

@@ -1,10 +1,13 @@
 package com.yxt.anrui.base.api.basemodelconfig;
 
+import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
 
+import java.util.List;
+
 @Data
 public class AppModelConfigListVo implements Vo {
 
@@ -57,24 +60,36 @@ public class AppModelConfigListVo implements Vo {
     @ApiModelProperty(value = "有效期")
     private String priceValidity;
 
-    @ApiModelProperty(value = "辆")
-    private String vehicleQuantity;
-
     @ApiModelProperty(value = "指导价")
     private String guidedPrice;
 
-    @ApiModelProperty(value = "参考价")
+    @ApiModelProperty(value = "现车")
-    private String salesReferencePrice;
+    private String nowCarNum;
 
-    @ApiModelProperty(value = "车型")
+    @ApiModelProperty(value = "排产车")
-    private String model;
+    private String produceCarNum;
+
+    @ApiModelProperty(value = "更多配置")
+    private List<AppMoreConfigVo> moreConfig;
+
+    @ApiModelProperty(value = "辆(已废弃)")
+    private String vehicleQuantity;
 
     @ApiModelProperty(value = "车型sid")
     private String modelSid;
 
-    @ApiModelProperty(value = "品牌")
+    @ApiModelProperty(value = "车型名称")
+    private String modelName;
+
+    @ApiModelProperty(value = "车型名称")
+    private String model;
+
+    @ApiModelProperty(value = "品牌名称")
     private String brand;
 
+    @ApiModelProperty(value = "更多配置")
+    private String otherConfig;
+
     @ApiModelProperty(value = "品牌sid")
     private String brandSid;
 }

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

@@ -0,0 +1,66 @@
+package com.yxt.anrui.base.api.basemodelconfig;
+
+import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppModelConfigVo implements Vo {
+    @ApiModelProperty("车型图片")
+    private List<String> modelImage;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("指导价")
+    private String price;
+    @ApiModelProperty("车型list")
+    private List<ConfigInfo> configList;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("版本")
+    private String vehicleVersionValue;
+
+    @ApiModelProperty("配置列表")
+    private List<AppModelConfigListVo> modelConfigList;
+
+    @ApiModelProperty(value = "功能")
+    private String vehicleTypeValue;
+
+    @ApiModelProperty(value = "系列")
+    private String productLineValue;
+
+    @ApiModelProperty(value = "驱动")
+    private String driveFormValue;
+
+    @ApiModelProperty(value = "马力")
+    private String powerValue;
+
+    @ApiModelProperty(value = "燃料")
+    private String fuelTypeValue;
+
+    @ApiModelProperty(value = "变速箱")
+    private String gearboxTypeValue;
+
+    @ApiModelProperty(value = "细分市场")
+    private String marketSegments;
+
+    @ApiModelProperty(value = "系别")
+    private String department;
+
+    @ApiModelProperty(value = "发动机型号")
+    private String engineTypeValue;
+
+    @ApiModelProperty(value = "公告型号")
+    private String announcementModel;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specifications;
+
+    @ApiModelProperty(value = "货箱")
+    private String packingCase;
+
+    @ApiModelProperty(value = "内部编码")
+    private String insideCode;
+}

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

@@ -117,15 +117,26 @@ public interface BaseModelConfigFeign {
     public ResultBean<BaseModelConfigVo> getByVeSid(@RequestParam("sid") String sid);
 
     /**
-     * pc端车型库配置分页列表(改)
+     * 车型配置分页列表(新)
      *
      * @param pagerQuery
      * @return
      */
-    @ApiOperation("pc端车型库配置分页列表(改)")
+    @ApiOperation("车型配置分页列表(新)")
     @PostMapping("/configPageList")
     ResultBean<PagerVo<BaseModelConfigListVo>> configPageList(@Valid @RequestBody PagerQuery<BaseModelConfigListQuery> pagerQuery);
 
+    /**
+     * 更多配置分页列表(非本公司的)
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @ApiOperation("更多配置分页列表(非本公司的)")
+    @PostMapping("/notTheCompanyConfigPageList")
+    ResultBean<PagerVo<BaseModelConfigListVo>> notTheCompanyConfigPageList(@Valid @RequestBody PagerQuery<BaseModelConfigListQuery> pagerQuery);
+
+
     @Deprecated
     /**
      * @see com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign.selectExiCarConfig
@@ -140,5 +151,13 @@ public interface BaseModelConfigFeign {
     @GetMapping("/getAppDetailByModelConfigSid")
     public ResultBean<AppModelConfigDetailsVo> getAppDetailByModelConfigSid(@RequestParam("sid") String sid);
 
+    @ApiOperation("App车型报价-获取当前车型配置（新）")
+    @PostMapping("/getModelConfigList")
+    public ResultBean<AppModelConfigVo> getModelConfigList(@Valid @RequestBody PagerQuery<AppModelConfigListQuery> pagerQuery);
+
+    @ApiOperation("App车型报价-获取现车配置列表（新）")
+    @PostMapping("/getNowConfigList")
+    public ResultBean<AppModelConfigVo> getNowConfigList(@Valid @RequestBody PagerQuery<AppModelConfigListQuery> pagerQuery);
+
 
 }

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

@@ -89,6 +89,11 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseModelConfigListVo>> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<BaseModelConfigDetailsVo> selectDetails(String sid, String modelSid) {
         return null;
@@ -98,4 +103,14 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
     public ResultBean<AppModelConfigDetailsVo> getAppDetailByModelConfigSid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppModelConfigVo> getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppModelConfigVo> getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+        return null;
+    }
 }

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

@@ -15,9 +15,10 @@ import javax.validation.constraints.NotBlank;
 public class BaseModelConfigListQuery implements Query {
     private static final long serialVersionUID = 932522587144455873L;
 
-    @ApiModelProperty(value = "车型sid",required = true)
+    @ApiModelProperty(value = "车型sid", required = true)
     @NotBlank(message = "请选择车型")
-    private String sid;
+    private String modelSid;
+
     @ApiModelProperty(value = "颜色")
     private String carColor;
 
@@ -33,9 +34,12 @@ public class BaseModelConfigListQuery implements Query {
     @ApiModelProperty(value = "燃料箱")
     private String fuelTank;
 
-    @ApiModelProperty(value = "车型配置sid")
-    private String configSid;
-
     @ApiModelProperty(value = "常用配置")
     private String configName;
+
+    @ApiModelProperty(value = "分公司")
+    private String useOrg;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
 }

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

@@ -36,6 +36,29 @@ public class BaseModelConfigListVo implements Vo {
     @ApiModelProperty(value = "排产车")
     private String productionCarNum;
 
+    @ApiModelProperty(value = "分公司")
+    private String company;
+
+
+    /*配置名称字段*/
+    private String slowMachine;
+    private String rearViewMirror;
+    private String tireSize;
+    private String specification;
+    private String rearAxleRatio;
+    private String airConditioner;
+    private String hubMaterial;
+    private String baffleModel;
+    private String suspension;
+    private String seat;
+    private String tireCover;
+    private String saddle;
+    private String wheelbase;
+    private String bumper;
+    private String configuringBao;
+    private String independentSources;
+    private String fuelTank;
+    private String multimedia;
 
 
 }

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

@@ -47,4 +47,7 @@ public class AppVehicleModelPriceQuery implements Query {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty(value = "分公司")
+    private String useOrg;
 }

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

@@ -26,4 +26,10 @@ public class BaseExistingCarPageQuery implements Query {
 
     @ApiModelProperty(value = "锁定状态")
     private String lockedState;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "分公司")
+    private String useOrg;
 }

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.basevehicle;
 
+import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -161,9 +162,9 @@ public interface BaseVehicleFeign {
      * @param configSid 配置sid
      * @return
      */
-    @ApiOperation("车型详细配置接口")
+    @ApiOperation("车型详细配置接口（新）")
-    @GetMapping("/selectExiCarConfig/{modelSid}/{configSid}")
+    @GetMapping("/selectExiCarConfig/{modelSid}/{configSid}/{userSid}")
-    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
+    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
 
     /**
      * 现车分页列表（新）
@@ -190,7 +191,15 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVins/{modelSid}/{configSid}")
     public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
 
-    @ApiOperation("手机端业务-车型报价-列表")
+    @ApiOperation("手机端业务-车型报价-列表(新)")
     @PostMapping("/getModelList")
     public ResultBean<PagerVo<AppVehicleModelPriceVo>> getModelList(@RequestBody PagerQuery<AppVehicleModelPriceQuery> pagerQuery);
+
+    @ApiOperation("手机端业务-现车列表(新)虚拟订单选择车辆")
+    @PostMapping("/getNowModelList")
+    public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(@RequestBody PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery);
+
+    @ApiOperation("获取车型配置总结（即常用配置一句话描述）")
+    @GetMapping("/carConfigSummary/{modelSid}/{configSid}")
+    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
 }

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.basevehicle;
 
+import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -89,7 +90,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(String modelSid, String configSid) {
+    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(String modelSid, String configSid, String userSid) {
         return null;
     }
 
@@ -117,4 +118,15 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     public ResultBean getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/getModelList无法访问");
     }
+
+    @Override
+    public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(String modelSid, String configSid) {
+        return null;
+    }
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -161,4 +161,14 @@ public interface BaseVehicleModelFeign {
     @PostMapping("/modelPageList")
     ResultBean<PagerVo<BaseVehicleModelListVo>> modelPageList(@RequestBody PagerQuery<BaseVehicleModelListQuery> query);
 
+    /**
+     * 更多车型分页列表(非本公司的)
+     *
+     * @param query
+     * @return
+     */
+    @ApiOperation("更多车型分页列表(非本公司的)")
+    @PostMapping("/notTheCompanyModelPageList")
+    ResultBean<PagerVo<BaseVehicleModelListVo>> notTheCompanyModelPageList(@RequestBody PagerQuery<BaseVehicleModelListQuery> query);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -91,6 +91,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleModelListVo>> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
+        return null;
+    }
+
     /*@Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListQuery.java

@@ -33,4 +33,6 @@ public class BaseVehicleModelListQuery implements Query {
     private String gearboxType;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty(value = "分公司sid")
+    private String useOrg;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java

@@ -34,5 +34,7 @@ public class BaseVehicleModelListVo implements Vo {
     private String nowCarNum;
     @ApiModelProperty(value = "排产车")
     private String productionCarNum;
+    @ApiModelProperty(value = "分公司")
+    private String company;
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -25,7 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.busvehicleorder;
 
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -81,7 +81,7 @@ public interface BusVehicleOrderFeign {
      * @param pq 查询条件
      * @return
      */
-    @ApiOperation("排产车型列表(改)")
+    @ApiOperation("排产车型列表(新)")
     @PostMapping("/selectPage")
     ResultBean<PagerVo<BusVehicleOrderListVo>> selectPage(@RequestBody PagerQuery<BusVehicleOrderListQuery> pq);
 
@@ -101,7 +101,7 @@ public interface BusVehicleOrderFeign {
 
     @ApiOperation("手机端排产车详细配置")
     @GetMapping("/appProductionScheduling/{modelSid}/{configSid}")
-    public ResultBean<AppCurrentCarDetailCongfigVo> getAppProductionSchedulingDetailConfigVo(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppProductionSchedulingDetailConfigVo(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -25,7 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.base.api.busvehicleorder;
 
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -86,7 +86,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
     }
 
     @Override
-    public ResultBean<AppCurrentCarDetailCongfigVo> getAppProductionSchedulingDetailConfigVo(String modelSid, String configSid) {
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppProductionSchedulingDetailConfigVo(String modelSid, String configSid) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderListQuery.java

@@ -28,4 +28,10 @@ public class BusVehicleOrderListQuery implements Query {
     @ApiModelProperty(value = "配置sid")
     private String configSid;
 
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "分公司")
+    private String useOrg;
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basemodelconfig.*;
+import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -144,10 +145,10 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      * @param configSid
      * @return
      */
-    AppModelConfigDetailsVo getAppModelConfigDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+    AppModelConfigDetailsVo getAppModelConfigDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid ,@Param("useOrg") String useOrg);
 
     /**
-     * pc端车型库配置分页列表(改)
+     * 车型配置分页列表(新)
      *
      * @param page 分页
      * @param qw   查询条件
@@ -155,6 +156,15 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      */
     IPage<BaseModelConfigListVo> configPageList(IPage<BaseModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelConfigListVo> qw);
 
+    /**
+     * 更多配置分页列表(非本公司的)
+     *
+     * @param page 分页
+     * @param qw   查询条件
+     * @return
+     */
+    IPage<BaseModelConfigListVo> notTheCompanyConfigPageList(IPage<BaseModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelConfigListVo> qw);
+
     /**
      * 根据车型配置sid查询配置详情
      *
@@ -171,4 +181,13 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      * @return
      */
     AppModelConfigDetailsVo getAppProductionSchedulingDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+
+    //查询车型信息
+    AppModelConfigVo getModelConfigList(String modelSid);
+
+    List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
+
+    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
+
+    AppModelConfigListVo getCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 }

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

@@ -170,25 +170,25 @@
     <select id="selectDown" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseVehicleModelConfigDownVo">
         SELECT bmc.sid<!--, bmc.vehicleCode-->
         FROM base_model_config bmc
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getAppChooseListByModelSid"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppChooseBaseModelConfigVo">
         SELECT bmc.sid,
-               <!--bmc.vehicleCode,-->
+        <!--bmc.vehicleCode,-->
-               bmc.carColor,
+        bmc.carColor,
-               bmc.specification,
+        bmc.specification,
-               bmc.fuelTank,
+        bmc.fuelTank,
-               bmc.baffleModel,
+        bmc.baffleModel,
-               bmc.independentSources,
+        bmc.independentSources,
-               bmc.tireCover,
+        bmc.tireCover,
-               bmc.saddle,
+        bmc.saddle,
-               bmc.airConditioner,
+        bmc.airConditioner,
-               bmc.otherConfig,
+        bmc.otherConfig,
-               bmc.remarks
+        bmc.remarks
         FROM base_model_config bmc
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectAppConfigListByModelSid"
@@ -295,49 +295,64 @@
                  LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
+          AND bvc.useOrg = #{useOrg}
     </select>
 
     <select id="configPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
         SELECT bc.sid,
-        <!-- 常用配置名称-->
+               bc.slowMachine,
-        CONCAT_WS(
+               bc.rearViewMirror,
-        '/',
+               bc.tireSize,
-        IF(LENGTH(trim(GROUP_CONCAT(slowMachine))) > 0, GROUP_CONCAT(slowMachine), NULL),
+               bc.specification,
-        IF(LENGTH(trim(GROUP_CONCAT(rearViewMirror))) > 0, GROUP_CONCAT(rearViewMirror), NULL),
+               bc.rearAxleRatio,
-        IF(LENGTH(trim(GROUP_CONCAT(tireSize))) > 0, GROUP_CONCAT(tireSize), NULL),
+               bc.airConditioner,
-        IF(LENGTH(trim(GROUP_CONCAT(specification))) > 0, GROUP_CONCAT(specification), NULL),
+               bc.hubMaterial,
-        IF(LENGTH(trim(GROUP_CONCAT(rearAxleRatio))) > 0, GROUP_CONCAT(rearAxleRatio), NULL),
+               bc.baffleModel,
-        IF(LENGTH(trim(GROUP_CONCAT(airConditioner))) > 0, GROUP_CONCAT(airConditioner), NULL),
+               bc.suspension,
-        IF(LENGTH(trim(GROUP_CONCAT(hubMaterial))) > 0, GROUP_CONCAT(hubMaterial), NULL),
+               bc.seat,
-        IF(LENGTH(trim(GROUP_CONCAT(baffleModel))) > 0, GROUP_CONCAT(baffleModel), NULL),
+               bc.tireCover,
-        IF(LENGTH(trim(GROUP_CONCAT(suspension))) > 0, GROUP_CONCAT(suspension), NULL),
+               bc.saddle,
-        IF(LENGTH(trim(GROUP_CONCAT(seat))) > 0, GROUP_CONCAT(seat), NULL),
+               bc.wheelbase,
-        IF(LENGTH(trim(GROUP_CONCAT(tireCover))) > 0, GROUP_CONCAT(tireCover), NULL),
+               bc.bumper,
-        IF(LENGTH(trim(GROUP_CONCAT(saddle))) > 0, GROUP_CONCAT(saddle), NULL),
+               bc.configuringBao,
-        IF(LENGTH(trim(GROUP_CONCAT(wheelbase))) > 0, GROUP_CONCAT(wheelbase), NULL),
+               bc.independentSources,
-        IF(LENGTH(trim(GROUP_CONCAT(bumper))) > 0, GROUP_CONCAT(bumper), NULL),
+               bc.fuelTank,
-        IF(LENGTH(trim(GROUP_CONCAT(configuringBao))) > 0, GROUP_CONCAT(configuringBao), NULL),
+               bc.multimedia,
-        IF(LENGTH(trim(GROUP_CONCAT(independentSources))) > 0, GROUP_CONCAT(independentSources), NULL),
+               bc.carColor,
-        IF(LENGTH(trim(GROUP_CONCAT(fuelTank))) > 0, GROUP_CONCAT(fuelTank), NULL),
+               bvc.guidedPrice,
-        IF(LENGTH(trim(GROUP_CONCAT(multimedia))) > 0, GROUP_CONCAT(multimedia), NULL)
+               bvc.priceValidity,
-        ) AS configName,
+               (SELECT count(*)
-        <!--颜色-->
+                FROM base_vehicle bv
-        bc.carColor,
+                WHERE bv.modelSid = bvc.modelSid
-        <!--销售指导价-->
+                  AND bv.modelConfigSid =
-        bvc.guidedPrice,
+                      bvc.configurationItemsSid
-        <!--价格有效期-->
+                  and bv.useOrg = bvc.useOrg)    AS nowCarNum,
-        bvc.priceValidity,
+               (SELECT count(*)
+                FROM bus_vehicle_apply_detail bvad
+                WHERE bvad.vehicleSid = bvc.modelSid
+                  AND bvad.configSid =
+                      bvc.configurationItemsSid) AS productionCarNum
+        FROM base_model_config bc
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bc.sid
+            ${ew.customSqlSegment}
+        ORDER BY
+            bvc.priceValidity ASC,
+            nowCarNum,
+            productionCarNum DESC
+    </select>
+
+    <select id="notTheCompanyConfigPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
+        SELECT
         ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid =
-        bvc.configurationItemsSid ) AS nowCarNum,
+        bvc.configurationItemsSid and bv.useOrg = bvc.useOrg ) AS nowCarNum,
         ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid AND bvad.configSid =
-        bvc.configurationItemsSid ) AS productionCarNum
+        bvc.configurationItemsSid and bvad.useOrg = bvc.useOrg ) AS productionCarNum
         FROM base_model_config bc
         LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bc.sid
         <where>
             ${ew.customSqlSegment}
         </where>
         ORDER BY
-        bvc.priceValidity ASC,
         nowCarNum DESC,
         productionCarNum DESC
     </select>
@@ -447,4 +462,111 @@
         WHERE bmc.sid = #{configSid}
           AND bvm.sid = #{modelSid}
     </select>
+
+    <select id="getModelConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigVo">
+        SELECT bvm.vehicleAlias                                        AS modelName,
+               bvm.brandName,
+               bvm.vehicleVersionValue,
+               CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) AS price,
+               bvm.vehicleTypeValue,
+               bvm.productLineValue,
+               bvm.powerValue,
+               bvm.driveFormValue,
+               bvm.fuelTypeValue,
+               bvm.gearboxTypeValue,
+               bvm.marketSegments,
+               bvm.department,
+               bvm.engineTypeValue,
+               bvm.announcementModel,
+               bvm.specifications,
+               bvm.insideCode
+        FROM base_vehicle_model bvm
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
+        where bvm.sid = #{modelSid}
+    </select>
+
+    <select id="getModelConfigPageList"
+            resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
+        SELECT
+        bmc.sid,
+        bmc.carColor,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.tireSize,
+        bmc.specification,
+        bmc.rearAxleRatio,
+        bmc.airConditioner,
+        bmc.hubMaterial,
+        bmc.baffleModel,
+        bmc.suspension,
+        bmc.seat,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.wheelbase,
+        bmc.bumper,
+        bmc.configuringBao,
+        bmc.independentSources,
+        bmc.fuelTank,
+        bmc.multimedia,
+        bvc.guidedPrice,
+        bvc.priceValidity,
+        bvm.sid as modelSid,
+        bvm.vehicleAlias as modelName,
+        bvm.brandName as brand,
+        bvm.carBrand as brandSid,
+        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid AND
+        lockedState = '0004' ) AS nowCarNum,
+        ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid and bvad.configSid =
+        bmc.sid) AS produceCarNum
+        FROM base_vehmodel_config bvc
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        ORDER BY
+        nowCarNum DESC
+    </select>
+    <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
+        SELECT (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvc.sid AND lockedState = '0004') AS nowCarNum,
+               (SELECT count(*)
+                FROM bus_vehicle_apply_detail bvad
+                WHERE bvad.vehicleSid = bvc.sid)                                                           AS produceCarNum
+        FROM base_vehmodel_config bvc
+        WHERE bvc.modelSid = #{modelSid}
+          AND bvc.configurationItemsSid = #{configSid}
+          AND bvc.useOrg != #{useOrg}
+    </select>
+    <select id="getCarConfigSummary" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
+        SELECT bmc.sid,
+               bvm.sid          AS modelSid,
+               bvm.vehicleAlias AS model,
+               bvm.carBrand     AS brandSid,
+               bvm.brandName    AS brand,
+               bmc.carColor,
+               bmc.slowMachine,
+               bmc.rearViewMirror,
+               bmc.tireSize,
+               bmc.specification,
+               bmc.rearAxleRatio,
+               bmc.airConditioner,
+               bmc.hubMaterial,
+               bmc.baffleModel,
+               bmc.suspension,
+               bmc.seat,
+               bmc.tireCover,
+               bmc.saddle,
+               bmc.wheelbase,
+               bmc.bumper,
+               bmc.configuringBao,
+               bmc.independentSources,
+               bmc.fuelTank,
+               bmc.multimedia,
+               bv.guidedPrice,
+               bmc.otherConfig
+        FROM base_vehicle bv
+                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        WHERE bvm.sid = #{modelSid}
+    </select>
 </mapper>

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

@@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.basemodelconfig;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
@@ -195,7 +196,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     }
 
     /**
-     * pc端车型库配置分页列表(改)
+     * 车型配置分页列表(新)
      *
      * @param pagerQuery 查询条件
      * @return
@@ -209,6 +210,21 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         return rb.success().setData(pv1);
     }
 
+    /**
+     * 更多配置分页列表(非本公司的)
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @Override
+    public ResultBean<PagerVo<BaseModelConfigListVo>> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
+        ResultBean<PagerVo<BaseModelConfigListVo>> rb = ResultBean.fireFail();
+        IPage<BaseModelConfigListVo> page = baseModelConfigService.notTheCompanyConfigPageList(pagerQuery);
+        PagerVo<BaseModelConfigListVo> pv = new PagerVo<>();
+        PagerVo<BaseModelConfigListVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
+
     @Override
     public ResultBean<BaseModelConfigDetailsVo> selectDetails(String sid, String modelSid) {
         ResultBean<BaseModelConfigDetailsVo> rb = ResultBean.fireFail();
@@ -224,4 +240,18 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     public ResultBean<AppModelConfigDetailsVo> getAppDetailByModelConfigSid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<AppModelConfigVo> getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+        ResultBean<AppModelConfigVo> rb = ResultBean.fireFail();
+        AppModelConfigVo 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.getModelConfigList(pagerQuery);
+        return rb.success().setData(vo);
+    }
 }

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

@@ -3,12 +3,21 @@ package com.yxt.anrui.base.biz.basemodelconfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarByPageListQuery;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
+import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
+import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 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.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,6 +35,10 @@ import java.util.List;
  */
 @Service
 public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMapper, BaseModelConfig> {
+
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
     /**
      * 车型配置信息分页列表
      *
@@ -250,21 +263,96 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      * @param configSid
      * @return
      */
-    public AppModelConfigDetailsVo getAppModelConfigDetailsVo(String modelSid, String configSid) {
+    public AppModelConfigDetailsVo getAppModelConfigDetailsVo(String modelSid, String configSid, String useOrg) {
-        AppModelConfigDetailsVo appModelConfigDetailsVo = baseMapper.getAppModelConfigDetailsVo(modelSid, configSid);
+        AppModelConfigDetailsVo appModelConfigDetailsVo = baseMapper.getAppModelConfigDetailsVo(modelSid, configSid, useOrg);
         return appModelConfigDetailsVo;
     }
 
     /**
-     * pc端车型库配置分页列表(改)
+     * 车型配置分页列表(新)
      *
      * @param pagerQuery 查询条件
      * @return
      */
     public IPage<BaseModelConfigListVo> configPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
+        String userSid = pagerQuery.getParams().getUserSid();
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
         IPage<BaseModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseModelConfigListVo> qw = createBuildQueryWrapper(pagerQuery.getParams());
-        return baseMapper.configPageList(page, qw);
+        IPage<BaseModelConfigListVo> iPage = baseMapper.configPageList(page, qw);
+        List<BaseModelConfigListVo> records = iPage.getRecords();
+        getConfigName(records);
+        return iPage;
+    }
+
+    public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
+        for (BaseModelConfigListVo record : records) {
+            String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getSlowMachine()) ? (record.getSlowMachine() + "/") : "";
+
+            String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getRearViewMirror()) ? (record.getRearViewMirror() + "/") : "";
+
+            String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getTireSize()) ? (record.getTireSize() + "/") : "";
+
+            String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getSpecification()) ? (record.getSpecification() + "/") : "";
+
+            String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getRearAxleRatio()) ? (record.getRearAxleRatio() + "/") : "";
+
+            String airConditioner = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getAirConditioner()) && com.yxt.common.base.utils.StringUtils.equals(record.getAirConditioner(), "有") ? ("空调" + "/") : "";
+
+            String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getHubMaterial()) ? (record.getHubMaterial() + "/") : "";
+
+            String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getBaffleModel()) && com.yxt.common.base.utils.StringUtils.equals(record.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
+
+            String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getSuspension()) ? (record.getSuspension() + "/") : "";
+
+            String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getSeat()) ? (record.getSeat() + "/") : "";
+
+            String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getTireCover()) && com.yxt.common.base.utils.StringUtils.equals(record.getTireCover(), "有") ? ("护轮罩" + "/") : "";
+
+            String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getSaddle()) ? (record.getSaddle() + "/") : "";
+
+            String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getWheelbase()) ? (record.getWheelbase() + "/") : "";
+
+            String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getBumper()) ? (record.getBumper() + "/") : "";
+
+            String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getConfiguringBao()) ? (record.getConfiguringBao() + "/") : "";
+
+            String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getIndependentSources()) && com.yxt.common.base.utils.StringUtils.equals(record.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
+
+            String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getFuelTank()) ? (record.getFuelTank() + "/") : "";
+
+            String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(record.getMultimedia()) && com.yxt.common.base.utils.StringUtils.equals(record.getMultimedia(), "有") ? ("多媒体") : "";
+
+            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+                    baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
+            record.setConfigName(configName);
+        }
+        return records;
+
+    }
+
+    /**
+     * 更多配置分页列表(非本公司的)
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<BaseModelConfigListVo> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
+        String userSid = pagerQuery.getParams().getUserSid();
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
+        IPage<BaseModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<BaseModelConfigListVo> qw = createBuildQueryWrapper(pagerQuery.getParams());
+        IPage<BaseModelConfigListVo> iPage = baseMapper.notTheCompanyConfigPageList(page, qw);
+        for (BaseModelConfigListVo record : iPage.getRecords()) {
+            record.setCompany(data.getName());
+        }
+        return iPage;
     }
 
     /**
@@ -299,8 +387,14 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         if (StringUtils.isNotBlank(query.getConfigName())) {
             qw.like("bc.configName", query.getConfigName());
         }
-        qw.eq("bv.modelSid", query.getSid());
+        //车型sid
-        qw.groupBy("bc.sid");
+        if (StringUtils.isNotBlank(query.getModelSid())) {
+            qw.eq("bvc.modelSid", query.getModelSid());
+        }
+        //分公司
+        if (StringUtils.isNotBlank(query.getUseOrg())) {
+            qw.eq("bvc.useOrg", query.getUseOrg());
+        }
         return qw;
     }
 
@@ -318,4 +412,205 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         AppModelConfigDetailsVo appModelConfigDetailsVo = baseMapper.getAppProductionSchedulingDetailsVo(modelSid, configSid);
         return appModelConfigDetailsVo;
     }
+
+    public AppModelConfigVo getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
+
+        String userSid = pagerQuery.getParams().getUserSid();
+        // 1、根据业务员部门sid查询分公司 查询orgSidPath（部门路径）
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            // 2) 根据orgSidPath（部门路径）判断分公司sid
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
+        String modelSid = pagerQuery.getParams().getModelSid();
+        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid);
+        List<String> modelImages = new ArrayList<>();
+        modelImages.add("123123");
+        modelImages.add("324");
+        modelImages.add("345");
+        vo.setModelImage(modelImages);
+
+        //基础配置拼接
+        List<ConfigInfo> list = new ArrayList<>();
+        list.add(getConfigValue("品牌", vo.getBrandName()));
+        list.add(getConfigValue("功能", vo.getVehicleTypeValue()));
+        list.add(getConfigValue("系列", vo.getProductLineValue()));
+        list.add(getConfigValue("驱动", vo.getDriveFormValue()));
+        list.add(getConfigValue("马力", vo.getPowerValue()));
+        list.add(getConfigValue("版本", vo.getVehicleVersionValue()));
+        list.add(getConfigValue("燃料", vo.getFuelTypeValue()));
+        list.add(getConfigValue("变速箱", vo.getGearboxTypeValue()));
+        list.add(getConfigValue("细分市场", vo.getMarketSegments()));
+        list.add(getConfigValue("系别", vo.getDepartment()));
+        list.add(getConfigValue("发动机型号", vo.getEngineTypeValue()));
+        list.add(getConfigValue("公告型号", vo.getAnnouncementModel()));
+        list.add(getConfigValue("规格型号", vo.getSpecifications()));
+        list.add(getConfigValue("货箱", vo.getPackingCase()));
+        list.add(getConfigValue("内部编码", vo.getInsideCode()));
+        vo.setConfigList(list);
+        //配置列表
+        IPage<AppModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
+        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw);
+        //分公司配置列表查询
+        for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
+            String useOrg = data.getSid();
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getSid(), useOrg);
+            for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
+                moreConfigVo.setCompanyName(data.getName());
+            }
+            appModelConfigListVo.setMoreConfig(moreConfigVos);
+        }
+        addDonfigName(appModelConfigListVos);
+        vo.setModelConfigList(appModelConfigListVos);
+        return vo;
+    }
+
+    /**
+     * 拼接常用车型字段（configName）
+     *
+     * @param appModelConfigListVos
+     * @return
+     */
+    public List<AppModelConfigListVo> addDonfigName(List<AppModelConfigListVo> appModelConfigListVos) {
+        for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
+            String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
+
+            String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
+
+            String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
+
+            String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
+
+            String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
+
+            String airConditioner = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
+
+            String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
+
+            String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
+
+            String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
+
+            String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
+
+            String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
+
+            String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
+
+            String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
+
+            String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
+
+            String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
+
+            String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
+
+            String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
+
+            String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
+
+            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+                    baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
+            appModelConfigListVo.setConfigName(configName);
+        }
+        return appModelConfigListVos;
+    }
+
+
+    /**
+     * 用于车型详情页面数据key，value形式回显
+     *
+     * @param configName
+     * @param configValue
+     * @return
+     */
+    private ConfigInfo getConfigValue(String configName, String configValue) {
+        ConfigInfo configInfo = new ConfigInfo();
+        configInfo.setConfigName(configName);
+        if (configValue == null) {
+            configInfo.setConfigValue("");
+        } else {
+            configInfo.setConfigValue(configValue);
+        }
+        return configInfo;
+    }
+
+    private QueryWrapper<AppModelConfigListVo> modelConfigQueryWrapper(AppModelConfigListQuery pagerQuery) {
+        QueryWrapper<AppModelConfigListVo> qw = new QueryWrapper<>();
+        if (pagerQuery != null) {
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//名称
+                qw.like("bvc.vehicleAlias", pagerQuery.getName());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getBodyColor())) {//颜色
+                qw.like("bmc.carColor", pagerQuery.getBodyColor());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSlowMachine())) {//缓速器
+                qw.eq("bmc.slowMachine", pagerQuery.getSlowMachine());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getRearViewMirror())) {//后视镜
+                qw.eq("bmc.rearViewMirror", pagerQuery.getRearViewMirror());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getTireSize())) {//轮胎
+                qw.eq("bmc.tireSize", pagerQuery.getTireSize());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSpecification())) {//驾驶室
+                qw.eq("bmc.specification", pagerQuery.getSpecification());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getRearAxleRatio())) {//后桥速比
+                qw.eq("bmc.rearAxleRatio", pagerQuery.getRearAxleRatio());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getAirConditioner())) {//空调
+                qw.eq("bmc.airConditioner", pagerQuery.getAirConditioner());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getHubMaterial())) {//轮毂材质
+                qw.eq("bmc.hubMaterial", pagerQuery.getHubMaterial());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getDiversionCover())) {//导流罩
+                qw.eq("bmc.baffleModel", pagerQuery.getDiversionCover());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
+                qw.eq("bvc.modelSid", pagerQuery.getModelSid());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getMultiMedia())) {//多媒体
+                qw.eq("bvm.multimedia", pagerQuery.getMultiMedia());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getFuelTank())) {//燃料箱
+                qw.eq("bvm.fuelTank", pagerQuery.getFuelTank());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getIndependentSources())) {//独立热源
+                qw.eq("bvm.independentSources", pagerQuery.getIndependentSources());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getConfiguringBao())) {//配置包
+                qw.eq("bvm.configuringBao", pagerQuery.getConfiguringBao());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getBumper())) {//保险杠
+                qw.eq("bvm.bumper", pagerQuery.getBumper());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getWheelbase())) {//轴距
+                qw.eq("bvm.wheelbase", pagerQuery.getWheelbase());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSaddle())) {//鞍座
+                qw.eq("bvm.saddle", pagerQuery.getSaddle());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getProtectTireCover())) {//护轮罩
+                qw.eq("bvm.tireCover", pagerQuery.getProtectTireCover());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSeat())) {//座椅
+                qw.eq("bvm.seat", pagerQuery.getSeat());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSuspension())) {//悬架
+                qw.eq("bvm.suspension", pagerQuery.getSuspension());
+            }
+            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrg())) {//分公司
+                qw.eq("bvc.useOrg", pagerQuery.getUseOrg());
+            }
+        }
+        return qw;
+    }
+
+    public AppModelConfigListVo getCarConfigSummary(String modelSid, String configSid) {
+        AppModelConfigListVo vo = baseMapper.getCarConfigSummary(modelSid, configSid);
+        return vo;
+    }
 }

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

@@ -174,7 +174,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid
      * @return
      */
-    AppCurrentCarDetailVo getAppCurrentCarDetailConfigVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+    AppCurrentCarDetailVo getAppCurrentCarDetailConfigVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     /**
      * 现车分页列表
@@ -192,7 +192,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid 配置sid
      * @return
      */
-    ExiCarConfigDetailVo selectExiCarConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+    ExiCarConfigDetailVo selectExiCarConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     BusDepositVehListVo getBusDepositVehByVehSid(@Param("sid") String sid);
 
@@ -212,5 +212,41 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<BaseExistingCarListPageVo> selExistingCarPageList(IPage<BaseExistingCarPageQuery> page,@Param(Constants.WRAPPER) QueryWrapper<BaseExistingCarListPageVo> qw);
+    IPage<BaseExistingCarListPageVo> selExistingCarPageList(IPage<BaseExistingCarPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseExistingCarListPageVo> qw);
+
+    /**
+     * 手机端业务-车型报价-列表
+     *
+     * @param page
+     * @param qw
+     * @return
+     */
+    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw);
+
+    /**
+     * 手机端查询不本公司的现车，排产车
+     *
+     * @param modelSid
+     * @param sid
+     * @return
+     */
+    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg);
+
+    /**
+     * 手机端现车详细配置(新)
+     *
+     * @param modelSid
+     * @param configSid
+     * @return
+     */
+    AppCurrentCarDetailConfigVo getAppModelConfig(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
+
+    /**
+     * 手机端现车列表（新）
+     *
+     * @param page
+     * @param qw
+     * @return
+     */
+    IPage<AppBaseVehicleNowModelVo> getNowModelList(IPage<AppBaseVehicleNowModelQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseVehicleNowModelVo> qw);
 }

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

@@ -351,6 +351,7 @@
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
+          AND bvc.useOrg = #{useOrg}
     </select>
 
     <select id="exiCarPagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleListVo">
@@ -419,8 +420,9 @@
         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 bvm.sid = #{modelSid}
+        WHERE bvc.modelSid = #{modelSid}
-          AND bmc.sid = #{configSid}
+          AND bvc.configurationItemsSid = #{configSid}
+          AND bvc.useOrg = #{useOrg}
     </select>
     <select id="getBusDepositVehByVehSid" resultType="com.yxt.anrui.base.api.basevehicle.BusDepositVehListVo">
         SELECT
@@ -481,10 +483,84 @@
         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>
+        ${ew.customSqlSegment}
-            ${ew.customSqlSegment}
-        </where>>
         ORDER BY
         bv.priceDate desc
     </select>
+
+    <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
+        SELECT
+        bvm.sid AS modelSid,
+        bvm.vehicleAlias AS modelName,
+        bvm.carBrand AS brandSid,
+        bvm.brandName,
+        bvm.vehicleVersionValue AS versionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue,
+        bvc.priceValidity,
+        ( SELECT count( * ) FROM base_vehmodel_config WHERE bvc.modelSid = bvm.sid ) AS configNum,
+        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004' ) AS nowCarNum,
+        ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvm.sid ) AS produceCarNum
+        FROM
+        base_vehicle_model bvm
+        LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        ORDER BY
+        nowCarNum DESC
+    </select>
+
+    <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
+        SELECT (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
+               (SELECT count(*)
+                FROM bus_vehicle_apply_detail bvad
+                WHERE bvad.vehicleSid = bvm.sid)                                                           AS produceCarNum
+        FROM base_vehicle_model bvm
+                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+        WHERE bvc.modelSid = #{modelSid}
+          AND bvc.useOrg != #{useOrg}
+    </select>
+
+    <select id="getAppModelConfig"
+            resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo">
+        SELECT bvc.guidedPrice   AS price,
+               bvc.priceValidity AS `date`,
+               bvm.vehicleAlias  AS model,
+               bvm.brandName     AS brand,
+               bvm.carBrand      AS brandSid,
+               (
+                       (SELECT count(*)
+                        FROM base_vehicle bv
+                        WHERE bv.modelSid = bvm.sid
+                          AND bv.modelConfigSid = bvc.configurationItemsSid
+                          AND lockedState = '0004')
+                       +
+                       (SELECT count(*)
+                        FROM bus_vehicle_apply_detail bvad
+                        WHERE bvad.vehicleSid = bvm.sid
+                          AND bvad.configSid = bvc.configurationItemsSid)
+                   )             AS num
+        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.useOrg = #{useOrg}
+    </select>
+
+    <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
+        SELECT bvm.sid                                                                                     AS modelSid,
+               bvm.vehicleAlias                                                                            AS modelName,
+               bvm.brandName,
+               bvm.carBrand                                                                                AS brandSid,
+               bvm.vehicleVersionValue                                                                     AS versionValue,
+               bvm.fuelTypeValue,
+               bvm.gearboxTypeValue,
+               (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid)                AS configNum,
+               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum
+        FROM base_vehicle bv
+                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
@@ -267,9 +268,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      * @return
      */
     @Override
-    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(String modelSid, String configSid) {
+    public ResultBean<ExiCarConfigDetailVo> selectExiCarConfig(String modelSid, String configSid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
-        ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfig(modelSid, configSid);
+        ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleService.selectExiCarConfig(modelSid, configSid, userSid);
         return rb.success().setData(exiCarConfigDetailVo);
     }
 
@@ -284,7 +285,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     public ResultBean<PagerVo<BaseExistingCarListPageVo>> selExistingCarPageList(PagerQuery<BaseExistingCarPageQuery> pagerQuery) {
         ResultBean<PagerVo<BaseExistingCarListPageVo>> rb = ResultBean.fireFail();
         IPage<BaseExistingCarListPageVo> page = baseVehicleService.selExistingCarPageList(pagerQuery);
-        return null;
+        PagerVo<BaseExistingCarListPageVo> pv = new PagerVo<>();
+        PagerVo<BaseExistingCarListPageVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
     }
 
     /**
@@ -440,6 +443,12 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return obj;
     }
 
+    /**
+     * 手机端业务-车型报价-列表
+     *
+     * @param pagerQuery
+     * @return
+     */
     @Override
     public ResultBean<PagerVo<AppVehicleModelPriceVo>> getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
         ResultBean<PagerVo<AppVehicleModelPriceVo>> rb = ResultBean.fireFail();
@@ -447,9 +456,31 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         if (StringUtils.isBlank(userSid)) {
             return rb.setMsg("用户sid不能为空");
         }
-        IPage<AppVehicleModelPriceVo> page = baseVehicleService.getModelList(pagerQuery);
+        PagerVo<AppVehicleModelPriceVo> page = new PagerVo<>();
-        PagerVo<AppVehicleModelPriceVo> pv = new PagerVo<>();
+        IPage<AppVehicleModelPriceVo> iPage = baseVehicleService.getModelList(pagerQuery);
-        PagerVo<AppVehicleModelPriceVo> pv1 = PagerUtil.pageToVo(page, pv);
+        PagerVo<AppVehicleModelPriceVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return rb.success().setData(pagerVo);
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppBaseVehicleNowModelVo>> getNowModelList(PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery) {
+        ResultBean<PagerVo<AppBaseVehicleNowModelVo>> rb = ResultBean.fireFail();
+        String userSid = pagerQuery.getParams().getUserSid();
+        if (StringUtils.isBlank(userSid)) {
+            return rb.setMsg("用户sid不能为空");
+        }
+        IPage<AppBaseVehicleNowModelVo> page = baseVehicleService.getNowModelList(pagerQuery);
+        PagerVo<AppBaseVehicleNowModelVo> pv = new PagerVo<>();
+        PagerVo<AppBaseVehicleNowModelVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);
     }
+
+    @Override
+    public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(String modelSid, String configSid) {
+        ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
+        AppCarConfigSummaryVo vo = baseVehicleService.getCarConfigSummary(modelSid, configSid);
+        return rb.success().setData(vo);
+    }
+
+
 }

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

@@ -3,24 +3,26 @@ package com.yxt.anrui.base.biz.basevehicle;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.basemodelszconfig.BaseModelSzconfigVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
-import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -474,16 +476,20 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     }
 
     /**
+     * 手机端现车详细配置(新)
      * 车型详细配置(九宫格)
      *
      * @param modelSid
      * @param configSid
      * @return
      */
-    public AppCurrentCarDetailCongfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid) {
+    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) {
-        AppCurrentCarDetailCongfigVo configDetailVo = new AppCurrentCarDetailCongfigVo();
+
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        String useOrg = data.getSid();
+        AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
         //车型详细配置数据
-        AppCurrentCarDetailVo currentCarVo = baseMapper.getAppCurrentCarDetailConfigVo(modelSid, configSid);
+        AppCurrentCarDetailVo currentCarVo = baseMapper.getAppCurrentCarDetailConfigVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> modelInfoList = new ArrayList<>();
         List<ConfigInfoSpanSize> list1 = new ArrayList<>();
         list1.add(getConfigValueSpanSize("品牌", currentCarVo.getBrandName(), 1));
@@ -505,9 +511,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         list2.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1));
         modelInfoList.add(list1);
         modelInfoList.add(list2);
-        configDetailVo.setModleInfo(modelInfoList);
+        configDetailVo.setModelInfo(modelInfoList);
         //配置详细数据
-        AppModelConfigDetailsVo configVo = baseModelConfigService.getAppModelConfigDetailsVo(modelSid, configSid);
+        AppModelConfigDetailsVo configVo = baseModelConfigService.getAppModelConfigDetailsVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
         List<ConfigInfoSpanSize> list3 = new ArrayList<>();
         list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1));
@@ -529,38 +535,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1));
         list3.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1));
         list3.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1));
-        configDetailVo.setCommonConfigInfo(list3);
+        configDetailVo.setConfigInfo(list3);
         //更多配置
         String otherConfig = configVo.getOtherConfig();
-        configDetailVo.setMoreConfigDescibe(otherConfig);
+        configDetailVo.setMoreConfig(otherConfig);
-        /*//上装详细配置数据
-        AppBaseModelSzconfigDetailsVo szConfigVo = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(modelSid);
-        List<List<ConfigInfoSpanSize>> trailerInfoList = new ArrayList<>();
-        List<ConfigInfoSpanSize> list4 = new ArrayList<>();
-        list4.add(getConfigValueSpanSize("委改方式", szConfigVo.getRefitMethod(), 1));
-        list4.add(getConfigValueSpanSize("委改厂", szConfigVo.getRefitFactory(), 1));
-        list4.add(getConfigValueSpanSize("上装名称", szConfigVo.getTopName(), 1));
-        list4.add(getConfigValueSpanSize("上装价格", szConfigVo.getRefitPrice(), 1));
-        list4.add(getConfigValueSpanSize("公共型号", szConfigVo.getAnnouncementModel(), 1));
-        list4.add(getConfigValueSpanSize("外廓尺寸", szConfigVo.getOverallDimension(), 1));
-        list4.add(getConfigValueSpanSize("板材材质", szConfigVo.getPlateMaterial(), 1));
-        list4.add(getConfigValueSpanSize("板材厚度", szConfigVo.getPlateThickness(), 1));
-        list4.add(getConfigValueSpanSize("其他配置（举升方式）", szConfigVo.getOtherConfig(), 1));
-        trailerInfoList.add(list4);
-        configDetailVo.setTrailerInfo(trailerInfoList);
-        //挂车详细配置数据
-        AppBaseTrailerDetailsVo trailerVo = baseTrailerService.getAppBaseTrailerDetailsVo(modelSid);
-        List<List<ConfigInfoSpanSize>> topInfoList = new ArrayList<>();
-        List<ConfigInfoSpanSize> list5 = new ArrayList<>();
-        list5.add(getConfigValueSpanSize("车型名称", trailerVo.getModelName(), 1));
-        list5.add(getConfigValueSpanSize("车辆型号", trailerVo.getModel(), 1));
-        list5.add(getConfigValueSpanSize("车辆品牌", trailerVo.getCarBrand(), 1));
-        list5.add(getConfigValueSpanSize("厂商名称", trailerVo.getSettlement(), 1));
-        list5.add(getConfigValueSpanSize("挂车车架号", trailerVo.getVinNo(), 1));
-        list5.add(getConfigValueSpanSize("挂车价格", trailerVo.getTrailerPrince(), 1));
-        list5.add(getConfigValueSpanSize("更多配置", trailerVo.getOtherConfig(), 1));
-        topInfoList.add(list5);
-        configDetailVo.setTopInfo(topInfoList);*/
         return configDetailVo;
     }
 
@@ -649,8 +627,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid 配置sid
      * @return
      */
-    public ExiCarConfigDetailVo selectExiCarConfig(String modelSid, String configSid) {
+    public ExiCarConfigDetailVo selectExiCarConfig(String modelSid, String configSid, String userSid) {
-        return baseMapper.selectExiCarConfig(modelSid, configSid);
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        String useOrg = data.getSid();
+        return baseMapper.selectExiCarConfig(modelSid, configSid, useOrg);
     }
 
     /**
@@ -672,6 +652,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @return
      */
     public IPage<BaseExistingCarListPageVo> selExistingCarPageList(PagerQuery<BaseExistingCarPageQuery> pagerQuery) {
+        String userSid = pagerQuery.getParams().getUserSid();
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
         IPage<BaseExistingCarPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseExistingCarListPageVo> qw = existingCarBuildQW(pagerQuery.getParams());
         return baseMapper.selExistingCarPageList(page, qw);
@@ -696,38 +681,203 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.like("bmc.carColor", pagerQuery.getCarColor());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) { //车辆状态
-            qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0005"));
+            qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0004").or().eq("bv.vehicleState", "0005"));
         }
         if (StringUtils.isNotBlank(pagerQuery.getLockedState())) { //锁定状态
             qw.and(wrapper -> wrapper.eq("bv.lockedState", "0").or().isNull("bv.lockedState").or().eq("bv.lockedStateValue", ""));
         }
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
+            qw.eq("bv.useOrg", pagerQuery.getUseOrg());
+        }
         return qw;
     }
 
     /**
      * 手机端业务-车型报价-列表
+     *
      * @param pagerQuery
      * @return
      */
     public IPage<AppVehicleModelPriceVo> getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
-        // 1、根据业务员部门sid查询分公司
+        // 1、根据业务员部门sid查询分公司 查询orgSidPath（部门路径）
-        //  1) 根据userSid查询orgSidPath（部门路径）
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
-        ResultBean<AppUserOrgInfoVo> orgInfoResultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid);
+        if (data != null) {
-        if (!orgInfoResultBean.getSuccess()) {
+            // 2) 根据orgSidPath（部门路径）判断分公司sid
-            return new Page<>();
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
+        IPage<AppVehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppVehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
+        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw);
+        // 3、 查询更多配置（其它分公司）
+        for (AppVehicleModelPriceVo record : iPage.getRecords()) {
+            record.setModelImage("http//:192.168.1.101:8111/aaa.com");
+            String useOrg = data.getSid();
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), useOrg);
+            for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
+                moreConfigVo.setCompanyName(data.getName());
+            }
+            record.setMoreConfigList(moreConfigVos);
         }
-        String orgSidPath = orgInfoResultBean.getData().getOrgSidPath();
+        return iPage;
-        ResultBean<List<SysOrgVo>> listOrgResultBean = sysOrganizationFeign.getListOrg();
+    }
 
+    private QueryWrapper<AppVehicleModelPriceVo> appExistingCarBuildQW(AppVehicleModelPriceQuery pagerQuery) {
+        QueryWrapper<AppVehicleModelPriceVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(pagerQuery.getName())) { // 车型名称
+            qw.like("bvm.vehicleAlias", pagerQuery.getName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
+            qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getDriver())) { // 驱动
+            qw.eq("bvm.driveForm", pagerQuery.getDriver());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getGearbox())) { // 变速箱
+            qw.eq("bvm.gearboxType", pagerQuery.getGearbox());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSeries())) { // 产品系别
+            qw.eq("bvm.department", pagerQuery.getSeries());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleFunction())) { // 功能
+            qw.eq("bvm.vehicleType", pagerQuery.getVehicleFunction());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) { // 细分市场
+            qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) { // 版本
+            qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getFuelType())) { // 燃料
+            qw.eq("bvm.fuelType", pagerQuery.getFuelType());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getHorsepower())) { // 马力
+            qw.eq("bvm.power", pagerQuery.getHorsepower());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
+            qw.eq("bvc.useOrg", pagerQuery.getUseOrg());
+        }
+        return qw;
+    }
 
-        //  2) 根据orgSidPath（部门路径）判断分公司sid
+    public IPage<AppBaseVehicleNowModelVo> getNowModelList(PagerQuery<AppBaseVehicleNowModelQuery> pagerQuery) {
-        // 2、 根据分公司sid查询 车型与简述配置关联表（base_vehmodel_config）表中 车型信息
+        String userSid = pagerQuery.getParams().getUserSid();
-        // 3、 查询更多配置（其它分公司）
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
+        IPage<AppBaseVehicleNowModelQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppBaseVehicleNowModelVo> qw = nowModelQueryWrapper(pagerQuery.getParams());
+        return baseMapper.getNowModelList(page, qw);
+    }
 
+    private QueryWrapper<AppBaseVehicleNowModelVo> nowModelQueryWrapper(AppBaseVehicleNowModelQuery pagerQuery) {
+        QueryWrapper<AppBaseVehicleNowModelVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(pagerQuery.getName())) { // 名称
+            qw.like("bvm.vehicleAlias", pagerQuery.getName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
+            qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getDriver())) { // 驱动
+            qw.eq("bvm.driveForm", pagerQuery.getDriver());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getGearbox())) { // 变速箱
+            qw.eq("bvm.gearboxType", pagerQuery.getGearbox());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getSeries())) { // 产品系列
+            qw.eq("bvm.department", pagerQuery.getSeries());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleFunction())) { // 功能
+            qw.eq("bvm.vehicleType", pagerQuery.getVehicleFunction());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) { // 细分市场
+            qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) { // 版本
+            qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getFuelType())) { // 燃料
+            qw.eq("bvm.fuelType", pagerQuery.getFuelType());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getHorsepower())) { // 马力
+            qw.eq("bvm.power", pagerQuery.getHorsepower());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBrand())) { // 品牌
+            qw.eq("bvm.carBrand", pagerQuery.getBrand());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
+            qw.eq("bv.useOrg", pagerQuery.getUseOrg());
+        }
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0004").or().eq("bv.vehicleState", "0005"));
+        qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
+        return qw;
+    }
+
+    /**
+     * 获取车型配置总结（即 常用配置一句话描述）
+     *
+     * @param modelSid
+     * @param configSid
+     * @return
+     */
+    public AppCarConfigSummaryVo getCarConfigSummary(String modelSid, String configSid) {
+        AppModelConfigListVo appModelConfigListVo = baseModelConfigService.getCarConfigSummary(modelSid, configSid);
+        AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
+        return configSummaryVo;
+    }
+
+    /**
+     * 拼接常用配置字段
+     *
+     * @param
+     * @return
+     */
+    public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
+        AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
+        String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
+
+        String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
 
+        String tireSize = StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
 
+        String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
 
-        return null;
+        String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
+
+        String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
+
+        String hubMaterial = StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
+
+        String baffleModel = StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
+
+        String suspension = StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
+
+        String seat = StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
+
+        String tireCover = StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
+
+        String saddle = StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
+
+        String wheelbase = StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
+
+        String bumper = StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
+
+        String configuringBao = StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
+
+        String independentSources = StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
+
+        String fuelTank = StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
+
+        String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
+
+        String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
+                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
+        vo.setConfig(configName);
+        vo.setModel(appModelConfigListVo.getModel());
+        vo.setMoreConfig(appModelConfigListVo.getOtherConfig());
+        return vo;
     }
+
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -135,4 +135,15 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
      * @return
      */
     IPage<BaseVehicleModelListVo> modelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw);
+
+    /**
+     * 更多车型分页列表(非本公司的)
+     *
+     * @param page 分页
+     * @param qw   查询条件
+     * @return
+     */
+    IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw);
+
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -328,15 +328,34 @@
     </select>
 
     <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
-        SELECT
+        SELECT bm.sid,
-        bm.sid,
         bm.brandName,
         bm.vehicleAlias,
         bm.vehicleVersionValue,
         bm.fuelTypeValue,
         bm.gearboxTypeValue,
-        CONCAT( MIN( guidedPrice ), '-', MAX( guidedPrice ) ) AS guidedPrice,
+        (SELECT count(*)
-        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid ) AS nowCarNum,
+        FROM base_vehicle bv
+        WHERE bv.modelSid = bm.sid
+        and bv.useOrg = bvc.useOrg) AS nowCarNum,
+        (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
+        FROM base_vehicle_model bm
+        LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bm.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        ORDER BY
+        bm.brandName,
+        bm.productLine,
+        bm.vehicleType,
+        bm.vehicleVersion,
+        nowCarNum,
+        productionCarNum DESC
+    </select>
+
+    <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
+        SELECT
+        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid and bv.useOrg = bvc.useOrg) AS nowCarNum,
         ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid ) AS productionCarNum
         FROM
         base_vehicle_model bm
@@ -345,11 +364,7 @@
             ${ew.sqlSegment}
         </where>
         ORDER BY
-        bm.brandName DESC,
+        productionCarNum,
-        bm.productLine DESC,
+        nowCarNum DESC
-        bm.vehicleType DESC,
-        bm.vehicleVersion DESC,
-        nowCarNum DESC,
-        productionCarNum DESC
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -193,6 +193,15 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseVehicleModelListVo>> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
+        ResultBean<PagerVo<BaseVehicleModelListVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseVehicleModelListVo> pv = new PagerVo<>();
+        IPage<BaseVehicleModelListVo> page = baseVehicleModelService.notTheCompanyModelPageList(query);
+        PagerVo<BaseVehicleModelListVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return rb.success().setData(pv1);
+    }
+
 
 //    @Override
 //    public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -54,8 +54,6 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
-    private SysUserFeign sysUserFeign;
-    @Autowired
     private BaseModelSzconfigService baseModelSzconfigService;
     @Autowired
     private BaseTrailerService baseTrailerService;
@@ -369,11 +367,25 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getFuelType())) {
             qw.eq("bm.fuelType", query.getFuelType());
         }
-        //变速箱
+        //判断不是本公司的
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getGearboxType())) {
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getUseOrg())) {
-            qw.eq("bm.gearboxType", query.getGearboxType());
+            qw.eq("bm.useOrg", query.getUseOrg());
+        }
+        return qw;
+    }
+
+    /**
+     * 查询条件
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<BaseVehicleModelListVo> notTheCompanyBuildQueryWrapper(BaseVehicleModelListQuery query) {
+        QueryWrapper<BaseVehicleModelListVo> qw = new QueryWrapper<>();
+        //判断不是本公司的
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getUseOrg())) {
+            qw.ne("bm.useOrg", query.getUseOrg());
         }
-        qw.groupBy("bm.sid");
         return qw;
     }
 
@@ -389,18 +401,57 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @return
      */
     public IPage<BaseVehicleModelListVo> modelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
+        String userSid = query.getParams().getUserSid();
+        //根据用户sid获取分公司sid
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            String sid = data.getSid();
+            if (StringUtils.isNotBlank(sid)) {
+                query.getParams().setUseOrg(sid);
+            }
+        }
         IPage<BaseVehicleModelListQuery> page = PagerUtil.queryToPage(query);
         QueryWrapper<BaseVehicleModelListVo> qw = createBuildQueryWrapper(query.getParams());
-        return baseMapper.modelPageList(page, qw);
+        IPage<BaseVehicleModelListVo> iPage = baseMapper.modelPageList(page, qw);
+        for (BaseVehicleModelListVo record : iPage.getRecords()) {
+            record.setCompany(data.getName());
+        }
+        return iPage;
+    }
+
+
+    /**
+     * 更多车型分页列表(非本公司的)
+     *
+     * @param query
+     * @return
+     */
+    public IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
+        String userSid = query.getParams().getUserSid();
+        //根据用户sid获取分公司sid
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            String sid = data.getSid();
+            if (StringUtils.isNotBlank(sid)) {
+                query.getParams().setUseOrg(sid);
+            }
+        }
+        IPage<BaseVehicleModelListQuery> page = PagerUtil.queryToPage(query);
+        QueryWrapper<BaseVehicleModelListVo> qw = notTheCompanyBuildQueryWrapper(query.getParams());
+        IPage<BaseVehicleModelListVo> iPage = baseMapper.notTheCompanyModelPageList(page, qw);
+        for (BaseVehicleModelListVo record : iPage.getRecords()) {
+            record.setCompany(data.getName());
+        }
+        return iPage;
     }
 
     public ResultBean saveOrUpdateAll(BaseVehicleModelDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
-        if (StringUtils.isBlank(sid)){
+        if (StringUtils.isBlank(sid)) {
             BaseVehicleModel entity = new BaseVehicleModel();
             String sid1 = entity.getSid();
-            BeanUtil.copyProperties(dto,entity);
+            BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
             boolean isSave = save(entity);
             if (!isSave) {

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

@@ -30,9 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
-import com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -81,11 +79,9 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
      *
      * @param page
      * @param qw
-     * @param modelSid  车型sid
-     * @param configSid 配置sid
      * @return
      */
-    IPage<BusVehicleOrderListVo> pagerList(IPage<BusVehicleOrderListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleOrderListVo> qw, @Param("modelSid") String modelSid, @Param("configSid") String configSid);
+    IPage<BusVehicleOrderListVo> pagerList(IPage<BusVehicleOrderListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleOrderListVo> qw);
 
     /**
      * 排产车型配置详情

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

@@ -45,21 +45,16 @@
 
     <select id="pagerList" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderListVo">
         SELECT bvo.sid,
-        bvo.orderStatus,
+               bvo.orderStatus,
-        bvo.orderNo,
+               bvo.orderNo,
-        bvo.orderDate,
+               bvo.orderDate,
-        bvo.expectLaunchDate,
+               bvo.expectLaunchDate,
-        bvo.launchDate,
+               bvo.launchDate,
-        bvo.offlineDate,
+               bvo.offlineDate,
-        (bvo.platformNo - bvo.lockingNum) AS quantity
+               (bvo.platformNo - bvo.lockingNum) AS quantity
         FROM bus_vehicle_order bvo
-        LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
+                 LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
-        WHERE
+            ${ew.customSqlSegment}
-        bvad.vehicleSid = #{modeSid}
-        <if test="configSid != null and configSid != ''">
-            AND bvad.configSid = #{configSid}
-        </if>
-        ${ew.customSqlSegment}
     </select>
 
     <select id="selectDetails" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo">
@@ -166,13 +161,26 @@
     </select>
 
     <select id="selectBySid" resultType="com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo">
-        SELECT bvo.createOrgSid,bvo.orderNo,bvo.orderType,bvo.orderDate,bvo.purchaseApplyMediumModelSid,bvo.platformNo,bvo.coatPrice,
+        SELECT bvo.createOrgSid,
-               bvo.treasuryPrice,bvo.freight,bvo.salesGuidePrice,bvo.expectLaunchDate,bvo.launchDate,bvo.offlineDate,bvo.orderStatus,bvm.modelName,
+               bvo.orderNo,
+               bvo.orderType,
+               bvo.orderDate,
+               bvo.purchaseApplyMediumModelSid,
+               bvo.platformNo,
+               bvo.coatPrice,
+               bvo.treasuryPrice,
+               bvo.freight,
+               bvo.salesGuidePrice,
+               bvo.expectLaunchDate,
+               bvo.launchDate,
+               bvo.offlineDate,
+               bvo.orderStatus,
+               bvm.modelName,
                bva.applicationCode
         FROM bus_vehicle_order bvo
-        LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid=bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bvo.purchaseApplyMediumModelSid = bvm.sid
-        LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
+                 LEFT JOIN bus_vehicle_apply_detail bvad ON bvo.purchaseApplyMediumModelSid = bvad.sid
-        LEFT JOIN bus_vehicle_apply bva ON bvad.applySid=bva.sid
+                 LEFT JOIN bus_vehicle_apply bva ON bvad.applySid = bva.sid
-        WHERE bvo.sid=#{sid}
+        WHERE bvo.sid = #{sid}
     </select>
 </mapper>

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

@@ -26,7 +26,7 @@
 package com.yxt.anrui.base.biz.busvehicleorder;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -141,9 +141,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
     }
 
     @Override
-    public ResultBean<AppCurrentCarDetailCongfigVo> getAppProductionSchedulingDetailConfigVo(String modelSid, String configSid) {
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppProductionSchedulingDetailConfigVo(String modelSid, String configSid) {
-        AppCurrentCarDetailCongfigVo vo = busVehicleOrderService.getAppProductionSchedulingDetailConfigVo(modelSid, configSid);
+        AppCurrentCarDetailConfigVo vo = busVehicleOrderService.getAppProductionSchedulingDetailConfigVo(modelSid, configSid);
-        return new ResultBean<AppCurrentCarDetailCongfigVo>().success().setData(vo);
+        return new ResultBean<AppCurrentCarDetailConfigVo>().success().setData(vo);
     }
 
 }

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

@@ -29,13 +29,15 @@ 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.basemodelconfig.AppModelConfigDetailsVo;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailCongfigVo;
+import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
 import com.yxt.anrui.base.api.basevehicle.ConfigInfoSpanSize;
 import com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListQuery;
 import com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo;
 import com.yxt.anrui.base.api.busvehicleorder.*;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
@@ -74,6 +76,8 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
     @Autowired
     private BusVehicleApplyDetailService busVehicleApplyDetailService;
 */
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private FileUploadComponent fileUploadComponent;
 
@@ -144,6 +148,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
 
     /**
      * 保存或修改采购订单
+     *
      * @param dto
      */
     public ResultBean saveOrUpdateVehicleOrder(BusVehicleOrderDto dto) {
@@ -164,6 +169,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
 
     /**
      * 根据sid查询车辆采购订单
+     *
      * @param sid
      * @return
      */
@@ -248,9 +254,13 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
      * @return
      */
     public IPage<BusVehicleOrderListVo> pageList(PagerQuery<BusVehicleOrderListQuery> pq) {
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(pq.getParams().getUserSid()).getData();
+        if (data != null) {
+            pq.getParams().setUseOrg(data.getSid());
+        }
         IPage<BusVehicleOrderListQuery> page = PagerUtil.queryToPage(pq);
         QueryWrapper<BusVehicleOrderListVo> qw = buildQueryWrapper(pq.getParams());
-        return baseMapper.pagerList(page, qw, pq.getParams().getConfigSid(), pq.getParams().getModelSid());
+        return baseMapper.pagerList(page, qw);
     }
 
     /**
@@ -264,6 +274,15 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         if (StringUtils.isNotBlank(query.getOrderStatus())) { //状态
             qw.eq("bvo.orderStatus", query.getOrderStatus());
         }
+        if (StringUtils.isNotBlank(query.getUseOrg())) { //分公司
+            qw.eq("bvo.useOrg", query.getUseOrg());
+        }
+        if (StringUtils.isNotBlank(query.getModelSid())) { //车型sid
+            qw.eq("bvad.vehicleSid", query.getModelSid());
+        }
+        if (StringUtils.isNotBlank(query.getConfigSid())) { //配置sid
+            qw.eq("bvad.configSid", query.getConfigSid());
+        }
         String orderStartDate = query.getOrderStartDate();
         String orderEndDate = query.getOrderEndDate();
         qw.apply(StringUtils.isNotEmpty(orderStartDate), "date_format (bvo.orderDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')").
@@ -289,8 +308,8 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
      * @param configSid
      * @return
      */
-    public AppCurrentCarDetailCongfigVo getAppProductionSchedulingDetailConfigVo(String modelSid, String configSid) {
+    public AppCurrentCarDetailConfigVo getAppProductionSchedulingDetailConfigVo(String modelSid, String configSid) {
-        AppCurrentCarDetailCongfigVo configDetailVo = new AppCurrentCarDetailCongfigVo();
+        AppCurrentCarDetailConfigVo configDetailVo = new AppCurrentCarDetailConfigVo();
         //车型详细配置数据
         AppCurrentCarDetailVo currentCarVo = baseMapper.getAppProductionSchedulingDetailConfigVo(modelSid, configSid);
         List<List<ConfigInfoSpanSize>> modelInfoList = new ArrayList<>();
@@ -314,7 +333,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         list2.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1));
         modelInfoList.add(list1);
         modelInfoList.add(list2);
-        configDetailVo.setModleInfo(modelInfoList);
+        configDetailVo.setModelInfo(modelInfoList);
         //配置详细数据
         AppModelConfigDetailsVo configVo = baseModelConfigService.getAppProductionSchedulingDetailsVo(modelSid, configSid);
         List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
@@ -338,10 +357,10 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1));
         list3.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1));
         list3.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1));
-        configDetailVo.setCommonConfigInfo(list3);
+        configDetailVo.setConfigInfo(list3);
         //更多配置
         String otherConfig = configVo.getOtherConfig();
-        configDetailVo.setMoreConfigDescibe(otherConfig);
+        configDetailVo.setMoreConfig(otherConfig);
         return null;
     }
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -93,6 +94,11 @@ public interface SysOrganizationFeign {
     @GetMapping("/getListOrg")
     ResultBean<List<SysOrgVo>> getListOrg();
 
+    @ApiOperation("根据业务员sid获取到分公司")
+    @ResponseBody
+    @GetMapping("/getUseOrgByUserSid")
+    ResultBean<SysOrganizationVo> getUseOrgByUserSid(@RequestParam("userSid") String userSid);
+
     @ApiOperation("根据部门sid查询组织信息")
     @ResponseBody
     @GetMapping("/selectBySid")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -23,91 +24,96 @@ import java.util.List;
 @Component
 public class SysOrganizationFeignFallback implements SysOrganizationFeign {
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<SysOrganizationVo>> listPage(PagerQuery<SysOrganizationQuery> pq){
+    public ResultBean<PagerVo<SysOrganizationVo>> listPage(PagerQuery<SysOrganizationQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/listPage无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/listPage无法访问");
-	}
+    }
-
+
-    @Override
+    @Override
-    public ResultBean<List<SysOrganizationVo>> listAll(SysOrganizationQuery query){
+    public ResultBean<List<SysOrganizationVo>> listAll(SysOrganizationQuery query) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/listAll无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/listAll无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<SysOrganizationVo>> list(){
+    public ResultBean<List<SysOrganizationVo>> list() {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/list无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/list无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean selectFirstOrgList() {
+    public ResultBean selectFirstOrgList() {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/selectFirstOrgList无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/selectFirstOrgList无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean selectChildrenListBySid(String sid) {
+    public ResultBean selectChildrenListBySid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean save(SysOrganizationDto dto){
+    public ResultBean save(SysOrganizationDto dto) {
-		return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问");
-	}
+    }
-      
+
-    @Override
+    @Override
-	public ResultBean update(SysOrganizationDto dto,String sid){
+    public ResultBean update(SysOrganizationDto dto, String sid) {
-		return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/update无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/update无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean del(String ids){
+    public ResultBean del(String ids) {
-		return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/del无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/del无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean delBySid(String sid) {
+    public ResultBean delBySid(String sid) {
-		return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/del无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/del无法访问");
-
+
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<SysOrganizationVo> fetch(String id){
+    public ResultBean<SysOrganizationVo> fetch(String id) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/fetch无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/fetch无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<SysOrganizationVo> fetchBySid(String sid) {
+    public ResultBean<SysOrganizationVo> fetchBySid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui_portal/sysorganization/fetchBySid无法访问");
+        return rb.setMsg("接口anrui_portal/sysorganization/fetchBySid无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean selectAppOrganization(String sid) {
+    public ResultBean selectAppOrganization(String sid) {
-		return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/selectAppOrganization无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/selectAppOrganization无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<SysOrgVo>> selectListOrg() {
+    public ResultBean<List<SysOrgVo>> selectListOrg() {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<SysOrgVo>> getListOrg() {
+    public ResultBean<List<SysOrgVo>> getListOrg() {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<SysOrganization> selectBySid(String sid) {
+    public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String staffSid) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<SysOrgListVo>> selectListOne() {
+    public ResultBean<SysOrganization> selectBySid(String sid) {
-		return null;
+        return null;
-	}
+    }
+
+    @Override
+    public ResultBean<List<SysOrgListVo>> selectListOne() {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysorganization.*;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -75,4 +76,20 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrganization selectByOrgCode(String substring);
 
     List<SysOrganizationVo> selectChildernList(String sid);
+
+    /**
+     * 根据业务员sid获取到分公司
+     *
+     * @param staffSid 业务员sid
+     * @return
+     */
+    SysStaffOrgVo getUseOrgByUserSid(@Param("staffSid") String staffSid);
+
+    /**
+     * 根据sid判断是否是分公司并获取公司名称
+     *
+     * @param sid
+     * @return
+     */
+    SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -48,8 +48,9 @@
     </select>
 
     <select id="selectChildrenListByPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        SELECT sid,name,psid,orgCode FROM sys_organization
+        SELECT sid, name, psid, orgCode
-        WHERE psid=#{psid}
+        FROM sys_organization
+        WHERE psid = #{psid}
         ORDER BY sort ASC
     </select>
 
@@ -87,7 +88,7 @@
     </select>
 
     <select id="treeList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgVo">
-        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath,so.orgCode
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE psid = #{psid}
     </select>
@@ -106,12 +107,11 @@
 
     <select id="selectOrgCodeByPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganization">
         SELECT *
-        FROM sys_organization
+        FROM sys_organization LIMIT 0,1
-        LIMIT 0,1
     </select>
 
     <select id="selectTreeList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgListVo">
-        SELECT so.name, so.psid, so.sid, so.orgSidPath,so.orgCode
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE psid = #{psid}
     </select>
@@ -123,8 +123,21 @@
     </select>
 
     <select id="selectChildernList" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
-        SELECT so.name, so.psid, so.sid, so.orgSidPath,so.orgCode
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE psid = #{psid}
     </select>
+
+    <select id="getUseOrgByUserSid" resultType="com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo">
+        select orgSidPath
+        from sys_staff_org
+        where staffSid = #{staffSid}
+    </select>
+
+    <select id="getUseOrgBySid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE sid = #{sid}
+          And isDept = 1
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -78,15 +78,15 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return rb.success();
     }
 
-	@Override
+    @Override
-	public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
-		return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectFirstOrgList());
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectFirstOrgList());
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(String sid) {
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(String sid) {
-		return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectChildrenListBySid(sid));
+        return new ResultBean<List<SysOrganizationVo>>().success().setData(sysOrganizationService.selectChildrenListBySid(sid));
-	}
+    }
 
     @Override
     public ResultBean update(SysOrganizationDto dto, String sid) {
@@ -193,6 +193,13 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return rb.success().setData(menuTree2VoList);
     }
 
+    @Override
+    public ResultBean<SysOrganizationVo> getUseOrgByUserSid(String userSid) {
+        ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
+        SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid);
+        return rb.success().setData(vo);
+    }
+
     @Override
     public ResultBean<SysOrganization> selectBySid(String sid) {
         SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
+import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -35,6 +39,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     @Autowired
     private SysStaffOrgService sysStaffOrgService;
     @Autowired
+    private SysUserService sysUserService;
+    @Autowired
     private FileUploadComponent fileUploadComponent;
 
     public PagerVo<SysOrganization> listPage(PagerQuery<SysOrganizationQuery> pq) {
@@ -328,4 +334,38 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public SysOrganization selectByOrgCode(String substring) {
         return baseMapper.selectByOrgCode(substring);
     }
+
+    /**
+     * 根据业务员sid获取到分公司
+     *
+     * @param userSid 业务员sid
+     * @return
+     */
+    public SysOrganizationVo getUseOrgByUserSid(String userSid) {
+        String staffSid = sysUserService.getUserOrgInfoByUserSid(userSid).getStaffSid();
+        SysStaffOrgVo sysOrgVo = baseMapper.getUseOrgByUserSid(staffSid);
+        String orgSidPath = sysOrgVo.getOrgSidPath();
+        SysOrganizationVo vo = getUseOrgBySid(orgSidPath);
+        return vo;
+    }
+
+    /**
+     * 根据sid判断是否是分公司并获取公司名称
+     *
+     * @param orgSidPath
+     * @return
+     */
+    public SysOrganizationVo getUseOrgBySid(String orgSidPath) {
+        SysOrganizationVo sysOrganizationVo = null;
+        String[] split = orgSidPath.split("/");
+        for (int i = 0; i < split.length; i++) {
+            String sid = split[i];
+            sysOrganizationVo = baseMapper.getUseOrgBySid(sid);
+        }
+        if (sysOrganizationVo == null) {
+            SysOrganizationVo sysOrganizationVo1 = new SysOrganizationVo();
+            return sysOrganizationVo1;
+        }
+        return sysOrganizationVo;
+    }
 }