移动车型查询与pc车型查询使用一个接口

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

@@ -1,10 +1,9 @@
 package com.yxt.anrui.base.api.basemodelconfig;
 
-import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
+import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
 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.ArrayList;
 import java.util.List;
@@ -74,7 +73,7 @@ public class AppModelConfigListVo implements Vo {
     private String produceCarNum;
 
     @ApiModelProperty(value = "更多配置")
-    private List<AppMoreConfigVo> moreList = new ArrayList<>();
+    private List<MoreConfigVo> moreList = new ArrayList<>();
 
     @ApiModelProperty(value = "辆(已废弃)")
     private String vehicleQuantity;

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

@@ -131,11 +131,10 @@ public interface BaseModelConfigFeign {
      * @param pagerQuery
      * @return
      */
-    @ApiOperation("更多配置分页列表(非本公司的)")
+   /* @ApiOperation("更多配置分页列表(非本公司的)")
     @PostMapping("/notTheCompanyConfigPageList")
     ResultBean<PagerVo<BaseModelConfigListVo>> notTheCompanyConfigPageList(@Valid @RequestBody PagerQuery<BaseModelConfigListQuery> pagerQuery);
-
-
+*/
     @Deprecated
     /**
      * @see com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign.selectExiCarConfig

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

@@ -22,7 +22,7 @@ import java.util.Map;
  * @since 1.0
  */
 @Component
-public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
+public  class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
 
 
     @Override
@@ -90,10 +90,10 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
         return null;
     }
 
-    @Override
+  /*  @Override
     public ResultBean<PagerVo<BaseModelConfigListVo>> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<BaseModelConfigDetailsVo> selectDetails(String sid, String modelSid) {

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

@@ -77,13 +77,10 @@ public class BaseModelConfigListQuery implements Query {
 
     @ApiModelProperty(value = "多媒体key")
     private String multimediaKey;
-
     @ApiModelProperty(value = "常用配置")
     private String configName;
-
-    @ApiModelProperty(value = "分公司")
-    private String useOrg;
-
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @ApiModelProperty(value = "分公司:后端内部使用")
+    private String useOrg;
 }

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

@@ -2,10 +2,14 @@ package com.yxt.anrui.base.api.basemodelconfig;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/2/23 19:06
@@ -14,55 +18,69 @@ import lombok.Data;
 @Data
 public class BaseModelConfigListVo implements Vo {
     private static final long serialVersionUID = -7133730282237562436L;
+
+    @ApiModelProperty(value = "查看更多")
+    private List<MoreConfigVo> moreList = new ArrayList<>();
     @ApiModelProperty(value = "配置sid")
     private String sid;
-
     @ApiModelProperty(value = "常用配置名称")
     private String configName;
-
     @ApiModelProperty(value = "颜色")
     private String carColor;
-
     @ApiModelProperty(value = "销售指导价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String guidedPrice;
-
-    @ApiModelProperty(value = "价格有效期")
-    private String priceValidity;
-
     @ApiModelProperty(value = "现车")
     private String nowCarNum;
-
     @ApiModelProperty(value = "排产车")
     private String productionCarNum;
-
-    @ApiModelProperty(value = "分公司")
-    private String company;
-
-
     /*配置名称字段*/
+    @ApiModelProperty(value = "后端内部使用")
     private String slowMachine;
+    @ApiModelProperty(value = "后端内部使用")
     private String rearViewMirror;
+    @ApiModelProperty(value = "后端内部使用")
     private String tireSize;
+    @ApiModelProperty(value = "后端内部使用")
     private String specification;
+    @ApiModelProperty(value = "后端内部使用")
     private String rearAxleRatio;
+    @ApiModelProperty(value = "后端内部使用")
     private String airConditioner;
+    @ApiModelProperty(value = "后端内部使用")
     private String hubMaterial;
+    @ApiModelProperty(value = "后端内部使用")
     private String baffleModel;
+    @ApiModelProperty(value = "后端内部使用")
     private String suspension;
+    @ApiModelProperty(value = "后端内部使用")
     private String seat;
+    @ApiModelProperty(value = "后端内部使用")
     private String tireCover;
+    @ApiModelProperty(value = "后端内部使用")
     private String saddle;
+    @ApiModelProperty(value = "后端内部使用")
     private String wheelbase;
+    @ApiModelProperty(value = "后端内部使用")
     private String bumper;
+    @ApiModelProperty(value = "后端内部使用")
     private String configuringBao;
+    @ApiModelProperty(value = "后端内部使用")
     private String independentSources;
+    @ApiModelProperty(value = "后端内部使用")
     private String fuelTank;
+    @ApiModelProperty(value = "后端内部使用")
     private String multimedia;
-    @ApiModelProperty(value = "厂家结算价")
-    private String manufactorSettlementPrice;
+ /*   @ApiModelProperty(value = "厂家结算价")
+    private String manufactorSettlementPrice;*/
+
+/*    @ApiModelProperty(value = "更多配置")
+    private String otherConfig;*/
+
+      /*  @ApiModelProperty(value = "分公司")
+    private String company;*/
 
-    @ApiModelProperty(value = "更多配置")
-    private String otherConfig;
+      /*  @ApiModelProperty(value = "价格有效期")
+    private String priceValidity;*/
 
 }

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

@@ -231,10 +231,15 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVins/{modelSid}/{configSid}/{userSid}")
     public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
 
-
-    @ApiOperation("手机端业务-车型报价-列表(新)")
+    /**
+     * 2020-06-16已整理
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @ApiOperation("移动业务车型报价列表以及PC端业务管理车型查询")
     @PostMapping("/getModelList")
-    public ResultBean<PagerVo<AppVehicleModelPriceVo>> getModelList(@RequestBody PagerQuery<AppVehicleModelPriceQuery> pagerQuery);
+    public ResultBean<PagerVo<VehicleModelPriceVo>> getModelList(@RequestBody PagerQuery<VehicleModelPriceQuery> pagerQuery);
 
     @ApiOperation("手机端业务-现车列表(新)虚拟订单选择车辆")
     @PostMapping("/getNowModelList")

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

@@ -157,7 +157,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
+    public ResultBean getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/getModelList无法访问");
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppMoreConfigVo.java → anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/MoreConfigVo.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @ApiModel("更多配置")
 @Data
-public class AppMoreConfigVo {
+public class MoreConfigVo {
 
     @ApiModelProperty(value = "公司名称")
     private String companyName;

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

@@ -11,9 +11,9 @@ import lombok.Data;
  * @description
  * @date 2022/03/30
  */
-@ApiModel("手机端车型报价查询")
+@ApiModel("移动端车型报价车型查询、pc端业务管理车型查询")
 @Data
-public class AppVehicleModelPriceQuery implements Query {
+public class VehicleModelPriceQuery implements Query {
 
     private static final long serialVersionUID = 25512718614924226L;
     @ApiModelProperty(value = "名称（优先级最高，有值时 查询车型名称）")
@@ -52,6 +52,6 @@ public class AppVehicleModelPriceQuery implements Query {
     @ApiModelProperty(value = "用户sid")
     private String userSid;
 
-    @ApiModelProperty(value = "分公司")
+    @ApiModelProperty(value = "分公司:后端内部使用")
     private String useOrg;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceVo.java → anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceVo.java

@@ -10,13 +10,14 @@ import java.util.List;
 /**
  * @author liuguohui
  * @version 1.0
- * @description
+ * @description pc端车型查询及移动端车型报价车型查询
  * @date 2022/03/30
  */
 @ApiModel("手机端车型报价")
 @Data
-public class AppVehicleModelPriceVo implements Vo {
+public class VehicleModelPriceVo implements Vo {
 
+    private static final long serialVersionUID = -3970054112654498976L;
     @ApiModelProperty(value = "车型sid")
     private String modelSid;
 
@@ -50,9 +51,9 @@ public class AppVehicleModelPriceVo implements Vo {
     @ApiModelProperty(value = "现车数量")
     private String nowCarNum;
 
-    @ApiModelProperty(value = "排产数量")
+    @ApiModelProperty(value = "排产数量", example = "0")
     private String produceCarNum;
 
     @ApiModelProperty(value = "更多配置")
-    private List<AppMoreConfigVo> moreList;
+    private List<MoreConfigVo> moreList;
 }

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

@@ -170,20 +170,20 @@ public interface BaseVehicleModelFeign {
      * @param query
      * @return
      */
-    @ApiOperation("车型库分页列表(新)")
+   /* @ApiOperation("车型库分页列表(新)")
     @PostMapping("/modelPageList")
     ResultBean<PagerVo<BaseVehicleModelListVo>> modelPageList(@RequestBody PagerQuery<BaseVehicleModelListQuery> query);
-
+*/
     /**
      * 更多车型分页列表(非本公司的)
      *
      * @param query
      * @return
      */
-    @ApiOperation("更多车型分页列表(非本公司的)")
+ /*   @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

@@ -90,15 +90,15 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
-    @Override
+   /* @Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> modelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
         return null;
-    }
+    }*/
 
-    @Override
+   /* @Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<PagerVo<VehModelVo>> listPageByVehmodel(PagerQuery<VehModelQuery> pq) {

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

@@ -6,7 +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 com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -163,7 +163,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      * @param qw   查询条件
      * @return
      */
-    IPage<BaseModelConfigListVo> notTheCompanyConfigPageList(IPage<BaseModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelConfigListVo> qw);
+//    IPage<BaseModelConfigListVo> notTheCompanyConfigPageList(IPage<BaseModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelConfigListVo> qw);
 
     /**
      * 根据车型配置sid查询配置详情
@@ -189,7 +189,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw,@Param("orgSid")String orgSid,@Param("state")String state);
 
-    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg,@Param("state")String state);
+    List<MoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg, @Param("state")String state);
 
     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

@@ -344,7 +344,7 @@
         DESC
     </select>
 
-    <select id="notTheCompanyConfigPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
+   <!-- <select id="notTheCompanyConfigPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
         SELECT (SELECT count(*)
                 FROM base_vehicle bv
                 WHERE bv.modelSid = bvc.modelSid
@@ -364,7 +364,7 @@
         </where>
         ORDER BY nowCarNum DESC,
                  productionCarNum DESC
-    </select>
+    </select>-->
 
     <select id="selectDetails" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigDetailsVo">
         select
@@ -547,7 +547,7 @@
         </where>
         ORDER BY nowCarNum DESC
     </select>
-    <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
+    <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.MoreConfigVo">
         SELECT bvc.useOrgSid,
                (SELECT count(*)
                 FROM base_vehicle bv

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

@@ -386,14 +386,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
      * @param pagerQuery
      * @return
      */
-    @Override
+   /* @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) {

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

@@ -3,7 +3,7 @@ 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.AppMoreConfigVo;
+import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
 import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
@@ -295,15 +295,22 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      */
     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());
-        }
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        pagerQuery.getParams().setUseOrg(orgSid);
         IPage<BaseModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseModelConfigListVo> qw = createBuildQueryWrapper(pagerQuery.getParams());
         IPage<BaseModelConfigListVo> iPage = baseMapper.configPageList(page, qw);
         List<BaseModelConfigListVo> records = iPage.getRecords();
         getConfigName(records);
+        for (BaseModelConfigListVo vo : records) {
+            List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(pagerQuery.getParams().getModelSid(), pagerQuery.getParams().getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
+            for (MoreConfigVo moreConfigVo : moreConfigVos) {
+                String sid = moreConfigVo.getUseOrgSid();
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
+                moreConfigVo.setCompanyName(sysOrganization.getName());
+            }
+            vo.setMoreList(moreConfigVos);
+        }
         return iPage;
     }
 
@@ -359,7 +366,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      * @param pagerQuery
      * @return
      */
-    public IPage<BaseModelConfigListVo> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
+   /* public IPage<BaseModelConfigListVo> notTheCompanyConfigPageList(PagerQuery<BaseModelConfigListQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
         if (data != null) {
@@ -372,7 +379,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             record.setCompany(data.getName());
         }
         return iPage;
-    }
+    }*/
 
     /**
      * 封装查询条件
@@ -541,8 +548,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
                 appModelConfigListVo.setProduceCarNum("0");
             }
-            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
-            for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
+            List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
+            for (MoreConfigVo moreConfigVo : moreConfigVos) {
                 String sid = moreConfigVo.getUseOrgSid();
                 SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
                 moreConfigVo.setCompanyName(sysOrganization.getName());

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

@@ -231,7 +231,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey);
+    IPage<VehicleModelPriceVo> getModelList(IPage<VehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<VehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey);
 
     /**
      * 手机端查询不本公司的现车，排产车
@@ -240,7 +240,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param sid
      * @return
      */
-    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg, @Param("state") String state);
+    List<MoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg, @Param("state") String state);
 
     /**
      * 手机端现车详细配置(新)

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

@@ -471,7 +471,7 @@
             bv.priceDate desc
     </select>
 
-    <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
+    <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo">
         SELECT DISTINCT bvm.sid                              AS modelSid,
                         bvm.vehicleAlias                     AS modelName,
                         bvm.carBrand                         AS brandSid,
@@ -506,7 +506,7 @@
         ORDER BY nowCarNum DESC
     </select>
 
-    <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
+    <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.MoreConfigVo">
         SELECT bvc.useOrgSid,
                (SELECT count(*)
                 FROM base_vehicle bv

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

@@ -519,9 +519,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      * @return
      */
     @Override
-    public ResultBean<PagerVo<AppVehicleModelPriceVo>> getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
-        ResultBean<PagerVo<AppVehicleModelPriceVo>> rb = ResultBean.fireFail();
-        AppVehicleModelPriceQuery params = pagerQuery.getParams();
+    public ResultBean<PagerVo<VehicleModelPriceVo>> getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
+        ResultBean<PagerVo<VehicleModelPriceVo>> rb = ResultBean.fireFail();
+        VehicleModelPriceQuery params = pagerQuery.getParams();
         if (params == null) {
             return rb.setMsg("必传数据不能为空");
         }
@@ -529,9 +529,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         if (StringUtils.isBlank(userSid)) {
             return rb.setMsg("用户sid不能为空");
         }
-        PagerVo<AppVehicleModelPriceVo> page = new PagerVo<>();
-        IPage<AppVehicleModelPriceVo> iPage = baseVehicleService.getModelList(pagerQuery);
-        PagerVo<AppVehicleModelPriceVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        PagerVo<VehicleModelPriceVo> page = new PagerVo<>();
+        IPage<VehicleModelPriceVo> iPage = baseVehicleService.getModelList(pagerQuery);
+        PagerVo<VehicleModelPriceVo> pagerVo = PagerUtil.pageToVo(iPage, page);
         return rb.success().setData(pagerVo);
     }
 

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

@@ -726,25 +726,25 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param pagerQuery
      * @return
      */
-    public IPage<AppVehicleModelPriceVo> getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
+    public IPage<VehicleModelPriceVo> getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         // 1、根据业务员部门sid查询分公司sid
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         if (StringUtils.isNotBlank(orgSid)) {
             pagerQuery.getParams().setUseOrg(orgSid);
         }
-        IPage<AppVehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
-        QueryWrapper<AppVehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
-        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
+        IPage<VehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<VehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
+        IPage<VehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
         // 3、 查询更多配置（其它分公司）
-        for (AppVehicleModelPriceVo record : iPage.getRecords()) {
+        for (VehicleModelPriceVo record : iPage.getRecords()) {
             String modelSid = record.getModelSid();
             ResultBean image = baseVehicleModelAppendixService.selectImage(modelSid);
             if (image.getSuccess()) {
                 record.setModelImage(image.getData().toString());
             }
-            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
-            for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
+            List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
+            for (MoreConfigVo moreConfigVo : moreConfigVos) {
                 String sid = moreConfigVo.getUseOrgSid();
                 SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
                 moreConfigVo.setCompanyName(sysOrganization.getName());
@@ -755,8 +755,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return iPage;
     }
 
-    private QueryWrapper<AppVehicleModelPriceVo> appExistingCarBuildQW(AppVehicleModelPriceQuery pagerQuery) {
-        QueryWrapper<AppVehicleModelPriceVo> qw = new QueryWrapper<>();
+    private QueryWrapper<VehicleModelPriceVo> appExistingCarBuildQW(VehicleModelPriceQuery pagerQuery) {
+        QueryWrapper<VehicleModelPriceVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(pagerQuery.getName())) { // 车型名称
             qw.like("bvm.vehicleAlias", pagerQuery.getName());
         }

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

@@ -134,7 +134,7 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
      * @param qw   查询条件
      * @return
      */
-    IPage<BaseVehicleModelListVo> modelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey);
+//    IPage<BaseVehicleModelListVo> modelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey);
 
     /**
      * 更多车型分页列表(非本公司的)
@@ -143,7 +143,7 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
      * @param qw   查询条件
      * @return
      */
-    IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw);
+//    IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw);
 
 
     IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page, @Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);

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

@@ -327,7 +327,7 @@
                            ON bvm.`manufacturer` = bm.`sid`
     </select>
 
-    <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
+   <!-- <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
         SELECT DISTINCT bm.sid,
                         bm.brandName,
                         bm.carBrand                             as brandSid,
@@ -357,9 +357,9 @@
             ${ew.sqlSegment}
         </where>
         ORDER BY nowCarNum DESC
-    </select>
+    </select>-->
 
-    <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
+   <!-- <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
         SELECT bvc.useOrgSid,
                (SELECT count(*)
                 FROM base_vehicle bv
@@ -372,7 +372,7 @@
             ${ew.sqlSegment}
         </where>
         group by bvc.useOrgSid
-    </select>
+    </select>-->
 
     <select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
         SELECT bvm.`brandName`, bvm.`modelName`, bmc.`configName`, bmc.otherConfig, bvc.guidedPrice

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

@@ -244,23 +244,23 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return new ResultBean<AppVehicleModelBySidVo>().success().setData(vo);
     }
 
-    @Override
+   /* @Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> modelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
         ResultBean<PagerVo<BaseVehicleModelListVo>> rb = ResultBean.fireFail();
         PagerVo<BaseVehicleModelListVo> pv = new PagerVo<>();
         IPage<BaseVehicleModelListVo> page = baseVehicleModelService.modelPageList(query);
         PagerVo<BaseVehicleModelListVo> pv1 = PagerUtil.pageToVo(page, pv);
         return rb.success().setData(pv1);
-    }
+    }*/
 
-    @Override
+  /*  @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<VehModelVo>> listPageByVehmodel(PagerQuery<VehModelQuery> pq) {

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

@@ -15,10 +15,8 @@ import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
-import com.yxt.anrui.base.common.enums.VehicleState;
 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.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -343,11 +341,11 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param query 查询条件
      * @return
      */
-    public IPage<BaseVehicleModelListVo> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {
+  /*  public IPage<BaseVehicleModelListVo> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {
         IPage<BaseVehicleModelListQuery> page = PagerUtil.queryToPage(query);
         QueryWrapper<BaseVehicleModelListVo> qw = createBuildQueryWrapper(query.getParams());
         return baseMapper.selectPageList(page, qw);
-    }
+    }*/
 
     /**
      * 查询条件
@@ -355,7 +353,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param query
      * @return
      */
-    private QueryWrapper<BaseVehicleModelListVo> createBuildQueryWrapper(BaseVehicleModelListQuery query) {
+  /*  private QueryWrapper<BaseVehicleModelListVo> createBuildQueryWrapper(BaseVehicleModelListQuery query) {
         QueryWrapper<BaseVehicleModelListVo> qw = new QueryWrapper<>();
         if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getModelName())) {
             qw.like("bm.vehicleAlias", query.getModelName());
@@ -414,6 +412,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         return qw;
     }
+*/
 
     /**
      * 查询条件
@@ -421,7 +420,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param query
      * @return
      */
-    private QueryWrapper<BaseVehicleModelListVo> notTheCompanyBuildQueryWrapper(BaseVehicleModelListQuery query) {
+   /* private QueryWrapper<BaseVehicleModelListVo> notTheCompanyBuildQueryWrapper(BaseVehicleModelListQuery query) {
         QueryWrapper<BaseVehicleModelListVo> qw = new QueryWrapper<>();
         //判断不是本公司的
         if (StringUtils.isNotBlank(query.getUseOrg())) {
@@ -435,8 +434,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
 
         return qw;
-    }
-
+    }*/
     public List<BaseVehicleModelDownListVo> downList() {
         List<BaseVehicleModelDownListVo> baseVehicleModelDownListVo = baseMapper.downList();
         return baseVehicleModelDownListVo;
@@ -448,7 +446,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param query
      * @return
      */
-    public IPage<BaseVehicleModelListVo> modelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
+  /*  public IPage<BaseVehicleModelListVo> modelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
         String userSid = query.getParams().getUserSid();
         //根据用户sid获取分公司sid
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
@@ -464,7 +462,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         return iPage;
     }
-
+*/
 
     /**
      * 更多车型分页列表(非本公司的)
@@ -472,7 +470,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param query
      * @return
      */
-    public IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
+   /* public IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
         String userSid = query.getParams().getUserSid();
         //根据用户sid获取分公司sid
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
@@ -490,8 +488,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             }
         }
         return iPage;
-    }
-
+    }*/
     public ResultBean saveOrUpdateAll(BaseVehicleModelDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmbusiness/CrmBusinessService.java

@@ -43,9 +43,9 @@ public class CrmBusinessService extends MybatisBaseService<CrmBusinessMapper, Cr
         if (StringUtils.isNotBlank(query.getHallway_state())) {
             qw.eq("hallway_state", query.getHallway_state());
         }
-		if (StringUtils.isNotBlank(query.getHallway_state())) {
-			qw.eq("hallway_state", query.getHallway_state());
-		}
+        if (StringUtils.isNotBlank(query.getHallway_state())) {
+            qw.eq("hallway_state", query.getHallway_state());
+        }
 
         if (StringUtils.isNotBlank(query.getConsignmentType())) {
             qw.eq("consignmentType", query.getConsignmentType());
@@ -131,16 +131,16 @@ public class CrmBusinessService extends MybatisBaseService<CrmBusinessMapper, Cr
         return baseMapper.selByCustomerSid(sid);
     }
 
-	public ResultBean<AppCrmBusinessInfoVo> getAppBusinessInfoBySid(String customerSid) {
-		CrmBusinessVo crmBusinessVo = baseMapper.selectByCustomerSid(customerSid);
-		AppCrmBusinessInfoVo saveInfoVo = new AppCrmBusinessInfoVo();
-		saveInfoVo.setSid("");
-		saveInfoVo.setCustomerSid(customerSid);
-		if (crmBusinessVo != null) {
-			BeanUtil.copyProperties(crmBusinessVo, saveInfoVo);
-		}
-		return new ResultBean<AppCrmBusinessInfoVo>().success().setData(saveInfoVo);
-	}
+    public ResultBean<AppCrmBusinessInfoVo> getAppBusinessInfoBySid(String customerSid) {
+        CrmBusinessVo crmBusinessVo = baseMapper.selectByCustomerSid(customerSid);
+        AppCrmBusinessInfoVo saveInfoVo = new AppCrmBusinessInfoVo();
+        saveInfoVo.setSid("");
+        saveInfoVo.setCustomerSid(customerSid);
+        if (crmBusinessVo != null) {
+            BeanUtil.copyProperties(crmBusinessVo, saveInfoVo);
+        }
+        return new ResultBean<AppCrmBusinessInfoVo>().success().setData(saveInfoVo);
+    }
 
     public int updateBycustomerSid(PcCrmBusinessInfoDto pcCrmBusinessInfoDto, String sid) {
         return baseMapper.updateBycustomerSid(pcCrmBusinessInfoDto, sid);
@@ -169,7 +169,10 @@ public class CrmBusinessService extends MybatisBaseService<CrmBusinessMapper, Cr
      */
     public int updateByCusSid(CrmBusinessDto crmBusinessDto, String sid) {
         CrmBusinessVo crmBusiness = selectByCustomerSid(sid);
-        int count = updateBySid(crmBusinessDto, crmBusiness.getSid());
-        return count;
+        if (crmBusiness != null) {
+            int count = updateBySid(crmBusinessDto, crmBusiness.getSid());
+            return count;
+        }
+        return 0;
     }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -9,7 +9,6 @@ import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
 import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
 import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.*;
-import com.yxt.anrui.crm.api.crmfile.CrmFile;
 import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicledemandVo;
@@ -560,7 +559,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         customerTemp.setStaffSid(userOrgInfoVo.getStaffSid());
         customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
         customerTemp.setCustomerNo(map.get("code"));
-        customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "0003" : "02");
+        customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02");
         customerTemp.setCertificateType(customerTemp.getCustomerTypeKey().equals("1") ? "身份证" : "营业执照");
         ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
         if (resultBean.getSuccess() && resultBean.getData() != null) {
@@ -672,9 +671,6 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             } else {
                 //是否为当前用户的客户
                 if (crmCustomerTempVo.getStaffSid().equals(sysUserInfoVo.getStaffSid())) {
-                    /* Map<String, Object> map = new HashMap<>();*/
-                    /*map.put("sid", crmCustomerTempVo.getSid());*/
-                    /*   map.put("state", "211");*/
                     return rb.setCode(HttpStatusEnum.CRM_ERROR_EXIST.getCode()).setMsg(HttpStatusEnum.CRM_ERROR_EXIST.getMsg()).setData(crmCustomerTempVo.getSid());
                 } else {
                     //不是当前用户的客户，提示信息。