Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
7785813640
  1. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListVo.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java
  4. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListQuery.java
  5. 52
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigListVo.java
  6. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  7. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  8. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/MoreConfigVo.java
  9. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceQuery.java
  10. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceVo.java
  11. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
  12. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java
  13. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java
  14. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java
  15. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
  16. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  17. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  18. 25
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  19. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  20. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  21. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  22. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  23. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
  24. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
  25. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java
  26. 23
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
  27. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
  28. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  29. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  30. 13
      anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
  31. 209
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
  32. 77
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
  33. 320
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue
  34. 58
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
  35. 33
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmbusiness/CrmBusinessService.java
  36. 6
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

5
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;

5
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

6
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) {

7
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;
}

52
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;*/
}

11
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")

2
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无法访问");
}

2
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;

6
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;
}

9
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;
}

8
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);
*/
/**
* 新增意向车型选择车型查询车型列表
*

8
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) {

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

@ -52,4 +52,10 @@ public class BaseVehmodelConfigQuerys implements Query {
private String useOrgSid;
@ApiModelProperty(value = "车型配置和常用配置")
private String[] sidList;
@ApiModelProperty(value = "车辆类型")
private String vehicleStateValue;
@ApiModelProperty(value = "车型别名")
private String vehicleAlias;
@ApiModelProperty(value = "常用配置名称")
private String configName;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java

@ -137,6 +137,8 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio
commonAppendix.setAttachType(CommonAttachTypeEnum.MANUFACTOR_SUB.getAttachType());
commonAppendix.setFileName(data.getSourceFileName());
commonAppendix.setFileSize(data.getSize());
String sourceFileName = data.getSourceFileName();
commonAppendix.setFileType(sourceFileName.substring(sourceFileName.lastIndexOf(".")));
commonAppendixService.save(commonAppendix);
baseManufactorSubscriptionService.updateWitMatUrl(data.getFilePath(),sid);
return rb.success().setMsg("上传成功");

6
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);

6
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

4
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) {

25
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());

4
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);
/**
* 手机端现车详细配置()

4
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

12
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);
}

18
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());
}

4
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);

8
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

8
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) {

23
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();

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@ -131,5 +131,5 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw,@Param("vehicleStateValue") String vehicleStateValue);
}

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@ -304,8 +304,10 @@
ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc
ON bvc.`configurationItemsSid` = bmc.`sid`
LEFT JOIN base_vehicle bv
ON bvc.`modelSid` = bv.`modelSid`
<if test="vehicleStateValue != null and vehicleStateValue != ''">
LEFT JOIN base_vehicle bv
ON bvc.`modelSid` = bv.`modelSid`
</if>
<where>
${ew.sqlSegment}
</where>

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@ -573,16 +573,24 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
public PagerVo<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
BaseVehmodelConfigQuerys query = pq.getParams();
QueryWrapper<BaseVehmodelConfigVos> qw = new QueryWrapper<>();
qw.eq("bvc.useOrgSid",query.getUseOrgSid());
qw.eq("bv.createOrg",query.getUseOrgSid());
qw.eq("bv.vehicleStateValue","库存");
qw.eq("bvc.useOrgSid", query.getUseOrgSid());
String[] sidList = query.getSidList();
if (sidList.length > 0){
if (sidList.length > 0) {
List<String> stringList = Arrays.asList(sidList);
qw.ne("bvc.modelSid",stringList.get(0)).ne("bvc.configurationItemsSid",stringList.get(1));
qw.ne("bvc.modelSid", stringList.get(0)).ne("bvc.configurationItemsSid", stringList.get(1));
}
if (StringUtils.isNotBlank(query.getVehicleStateValue())) {
qw.eq("bv.vehicleStateValue", query.getVehicleStateValue());
qw.eq("bv.createOrg", query.getUseOrgSid());
}
if (StringUtils.isNotBlank(query.getVehicleAlias())) {
qw.like("bvm.vehicleAlias", query.getVehicleAlias());
}
if (StringUtils.isNotBlank(query.getConfigName())) {
qw.like("bmc.configName", query.getConfigName());
}
IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw,query.getVehicleStateValue());
PagerVo<BaseVehmodelConfigVos> p = PagerUtil.pageToVo(pagging, null);
return p;
}

13
anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js

@ -1,9 +1,11 @@
import request from '@/utils/request'
// 车型库
// 根据条件分页查询数据的列表(车型)
export function modelPageList(data) {
return request({
url: '/base/v1/basevehiclemodel/modelPageList',
// url: '/base/v1/basevehiclemodel/modelPageList', // 旧接口
url: '/base/v1/basevehicle/getModelList',
method: 'post',
data: data,
headers: {
@ -31,6 +33,15 @@ export function dataDictionary(data) {
params: data
})
}
// 根据登陆人sid查询分公司 (孟哲写的接口)
export function getPathSidByUserSid(data) {
return request({
url: '/portal/v1/sysstafforg/getPathSidByUserSid',
method: 'get',
params: data
})
}
// 品牌下拉
export function brandDown(data) {
return request({

209
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue

@ -12,81 +12,76 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row>
<el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
<el-select v-model="listQuery.params.brand" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="listQuery.params.vehicleFunction" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="系列:" class="searchlist">
<el-form-item label="系列:" class="searchlist"> <!-- 接口上无此请求参数但原型上有 -->
<el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
<el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="驱动:" class="searchlist">
<el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
<el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="listQuery.params.driver" placeholder="请选择" filterable clearable>
<el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="马力:" class="searchlist">
<el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
<el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="listQuery.params.horsepower" placeholder="请选择" filterable clearable>
<el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="版本:" class="searchlist">
<el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="燃料:" class="searchlist">
<el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
<el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="车型编码:" class="searchlist">
<el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<!-- <el-form-item label="车型编码:" class="searchlist">&lt;!&ndash; 接口上无此请求参数但原型上有 &ndash;&gt;-->
<!-- <el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>-->
<!-- </el-form-item>-->
<el-form-item label="变速箱:" class="searchlist">
<el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
<el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="listQuery.params.gearbox" placeholder="请选择" filterable clearable>
<el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="排放标准:" class="searchlist">
<el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
<el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="发动机型号:" class="searchlist">
<el-form-item label="发动机型号:" class="searchlist"><!-- 接口上无此请求参数但原型上有 -->
<el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable>
<el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="细分市场:" class="searchlist">
<el-form-item label="细分市场:" class="searchlist"><!-- 无作用请求参数 -->
<el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable>
<el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="规格型号:" class="searchlist">
<el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-row>
<div class="searchbtns">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
<el-form-item label="规格型号:" class="searchlist">
<el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.name" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
@ -96,47 +91,52 @@
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="品牌" align="center">
<el-table-column width="120px" label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
<span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="版本" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehicleVersionValue }}</span>
<el-table-column width="100px" label="版本" align="center">
<template slot-scope="scope"> <!-- vehicleVersionValue-->
<span>{{ scope.row.versionValue }}</span>
</template>
</el-table-column>
<el-table-column label="燃料" align="center">
<el-table-column width="100px" label="燃料" align="center">
<template slot-scope="scope">
<span>{{ scope.row.fuelTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="变速箱" align="center">
<el-table-column width="100px" label="变速箱" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gearboxTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(万元)" align="center">
<el-table-column width="150px" label="销售指导价(万元)" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现车" align="center">
<el-table-column width="100px" label="车型图片" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handlookImg(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="110px" label="现车" align="center">
<template slot-scope="scope">
<span>{{ scope.row.nowCarNum }}</span>
</template>
</el-table-column>
<el-table-column label="排产" align="center">
<el-table-column width="110px" label="排产" align="center">
<template slot-scope="scope">
<span>{{ scope.row.productionCarNum }}</span>
<span>{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column width="100px" label="其他更多" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
</template>
@ -145,16 +145,23 @@
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<!-- 查看车型照片弹窗 -->
<el-dialog title="查看" :visible.sync="dialogImgVisible">
<el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"
:preview-src-list="srcList"/>
</el-dialog>
<!-- 其他更多配置弹窗 -->
<el-dialog :visible.sync="dialogVisible" width="50%">
<el-table :key="tableKey" :data="datalist" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="分公司名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.company }}</span>
<span>{{ scope.row.companyName }}</span>
</template>
</el-table-column>
<el-table-column label="现车" align="center">
@ -164,7 +171,7 @@
</el-table-column>
<el-table-column label="排产车" align="center">
<template slot-scope="scope">
<span>{{ scope.row.productionCarNum }}</span>
<span>{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
</el-table>
@ -175,7 +182,7 @@
</template>
<script>
import { modelPageList, dataDictionary, brandDown, notTheCompanyModelPageList } from '@/api/chexingchaxun/modelinquire.js'
import {brandDown, dataDictionary, getPathSidByUserSid, modelPageList} from '@/api/chexingchaxun/modelinquire.js'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import configuration from './vehiclelibraryconfiguration.vue'
@ -190,10 +197,12 @@ export default {
data() {
return {
isSearchShow: false,
dialogVisible: false,
dialogVisible: false, //
dialogImgVisible: false, //
searchxianshitit: '显示查询条件',
viewState: 1,
tableKey: 0,
srcList: [],
list: [],
datalist: [],
carBrand_list: [],
@ -221,16 +230,16 @@ export default {
current: 1,
size: 10,
params: {
carBrand: '', //
driveForm: '', //
brand: '', //
driver: '', //
fuelType: '', //
gearboxType: '', //
gearbox: '', //
modelName: '', //
power: '', //
horsepower: '', //
productLine: '', //
useOrg: '', //
// useOrg: '', // 使
userSid: window.sessionStorage.getItem('userSid'), //
vehicleType: '', //
vehicleFunction: '', //
vehicleVersion: '', //
emissionStandard: '', //
engineType: '', //
@ -259,46 +268,60 @@ export default {
},
init() {
this.getList()
this.getPathSid()
},
// ------------------
//
Dictionary() {
brandDown().then((res) => {
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
// this.listQuery.params.createOrgSId = res.data
this.useOrg = res.data
this.getBrand(res.data)
}
})
},
// -
getBrand(useOrg) {
brandDown({useOrg: useOrg}).then((res) => {
if (res.code === '200') {
this.carBrand_list = res.data
}
})
dataDictionary({ type: 'vehicleFunction' }).then((res) => {
},
//
Dictionary() {
dataDictionary({type: 'vehicleFunction'}).then((res) => {
if (res.code === '200') {
this.vehicleType_list = res.data
}
})
dataDictionary({ type: 'productLine' }).then((res) => {
dataDictionary({type: 'productLine'}).then((res) => {
if (res.code === '200') {
this.productLine_list = res.data
}
})
dataDictionary({ type: 'driver' }).then((res) => {
dataDictionary({type: 'driver'}).then((res) => {
if (res.code === '200') {
this.driveForm_list = res.data
}
})
dataDictionary({ type: 'horsepower' }).then((res) => {
dataDictionary({type: 'horsepower'}).then((res) => {
if (res.code === '200') {
this.power_list = res.data
}
})
dataDictionary({ type: 'vehicleVersion' }).then((res) => {
dataDictionary({type: 'vehicleVersion'}).then((res) => {
if (res.code === '200') {
this.vehicleVersion_list = res.data
}
})
dataDictionary({ type: 'fuelType' }).then((res) => {
dataDictionary({type: 'fuelType'}).then((res) => {
if (res.code === '200') {
this.fuelType_list = res.data
}
})
dataDictionary({ type: 'gearbox' }).then((res) => {
dataDictionary({type: 'gearbox'}).then((res) => {
if (res.code === '200') {
this.gearboxType_list = res.data
}
@ -345,16 +368,16 @@ export default {
current: 1,
size: 10,
params: {
carBrand: '', //
driveForm: '', //
brand: '', //
driver: '', //
fuelType: '', //
gearboxType: '', //
gearbox: '', //
modelName: '', //
power: '', //
horsepower: '', //
productLine: '', //
useOrg: '', //
// useOrg: '', // 使
userSid: window.sessionStorage.getItem('userSid'), //
vehicleType: '', //
vehicleFunction: '', //
vehicleVersion: '', //
emissionStandard: '', //
engineType: '', //
@ -365,14 +388,23 @@ export default {
}
this.getList()
},
handlookImg(row) {
this.dialogImgVisible = true
console.log('图片列表', row.modelImage)
const imgList = []
imgList.push(row.modelImage)
this.srcList = imgList //
console.log('图片列表', this.srcList)
},
handlook(row) {
this.dialogVisible = true
this.dialogQuery.params.modelSid = row.sid
notTheCompanyModelPageList(this.dialogQuery).then((res) => {
if (res.code === '200') {
this.datalist = res.data.records
}
})
this.datalist = row.moreList
// this.dialogQuery.params.modelSid = row.sid
// notTheCompanyModelPageList(this.dialogQuery).then((res) => {
// if (res.code === '200') {
// this.datalist = res.data.records
// }
// })
},
handlink(row) {
this.viewState = 2
@ -401,8 +433,19 @@ export default {
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

77
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue

@ -12,7 +12,6 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row>
<el-form-item label="颜色:" class="searchlist">
<el-select v-model="listQuery.params.carColor" placeholder="请选择" filterable clearable>
<el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -43,8 +42,6 @@
<el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="空调:" class="searchlist">
<el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -75,8 +72,6 @@
<el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="鞍座:" class="searchlist">
<el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -107,22 +102,20 @@
<el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="多媒体:" class="searchlist">
<el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-row>
<div class="searchbtns">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
<el-form-item label="多媒体:" class="searchlist">
<el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
@ -157,11 +150,11 @@
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格有效期" align="center" width="110">
<template slot-scope="scope">
<span>{{ scope.row.priceValidity }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="价格有效期" align="center" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.priceValidity }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="其他更多" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
@ -180,7 +173,7 @@
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="分公司名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.company }}</span>
<span>{{ scope.row.companyName }}</span>
</template>
</el-table-column>
<el-table-column label="现车" align="center">
@ -190,7 +183,7 @@
</el-table-column>
<el-table-column label="排产车" align="center">
<template slot-scope="scope">
<span>{{ scope.row.productionCarNum }}</span>
<span>{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
</el-table>
@ -205,7 +198,7 @@
</template>
<script>
import { configPageList, dataDictionary, notTheCompanyModelPageList } from '@/api/chexingchaxun/modelinquire.js'
import {configPageList, dataDictionary} from '@/api/chexingchaxun/modelinquire.js'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import modelstandardconfiguration from './modelstandardconfiguration'
@ -409,7 +402,7 @@ export default {
showData(row) {
this.listQuery.params.modelSid = row.sid
this.modelSid = row.sid
this.modelName = row.vehicleAlias
this.modelName = row.modelName
this.Dictionary()
this.getList()
},
@ -462,13 +455,14 @@ export default {
},
handlook(row) {
this.dialogVisible = true
this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
this.dialogQuery.params.modelConfigSid = row.sid
notTheCompanyModelPageList(this.dialogQuery).then((res) => {
if (res.code === '200') {
this.datalist = res.data.records
}
})
this.datalist = row.moreList
// this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
// this.dialogQuery.params.modelConfigSid = row.sid
// notTheCompanyModelPageList(this.dialogQuery).then((res) => {
// if (res.code === '200') {
// this.datalist = res.data.records
// }
// })
},
handlink(row) {
this.viewState = 2
@ -508,8 +502,19 @@ export default {
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

320
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue

@ -12,138 +12,131 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row>
<el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName"
:value="item.brandName"/>
</el-select>
</el-form-item>
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="系列:" class="searchlist">
<el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
<el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="驱动:" class="searchlist">
<el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
<el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="马力:" class="searchlist">
<el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
<el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="版本:" class="searchlist">
<el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="燃料:" class="searchlist">
<el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
<el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="车型编码:" class="searchlist">
<el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="变速箱:" class="searchlist">
<el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
<el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="排放标准:" class="searchlist">
<el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
<el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="发动机型号:" class="searchlist">
<el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable>
<el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="细分市场:" class="searchlist">
<el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable>
<el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="规格型号:" class="searchlist">
<el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-row>
<div class="searchbtns">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
<el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.brand" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleFunction" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="系列:" class="searchlist"> <!-- 接口上无此请求参数但原型上有 -->
<el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
<el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="驱动:" class="searchlist">
<el-select v-model="listQuery.params.driver" placeholder="请选择" filterable clearable>
<el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="马力:" class="searchlist">
<el-select v-model="listQuery.params.horsepower" placeholder="请选择" filterable clearable>
<el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="版本:" class="searchlist">
<el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="燃料:" class="searchlist">
<el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
<el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="车型编码:" class="searchlist">&lt;!&ndash; 接口上无此请求参数但原型上有 &ndash;&gt;-->
<!-- <el-input v-model="listQuery.params.applyName" placeholder="" clearable style="width: 150px"/>-->
<!-- </el-form-item>-->
<el-form-item label="变速箱:" class="searchlist">
<el-select v-model="listQuery.params.gearbox" placeholder="请选择" filterable clearable>
<el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="排放标准:" class="searchlist">
<el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
<el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="发动机型号:" class="searchlist"><!-- 接口上无此请求参数但原型上有 -->
<el-select v-model="listQuery.params.engineType" placeholder="请选择" filterable clearable>
<el-option v-for="item in engineType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
<el-form-item label="细分市场:" class="searchlist"><!-- 无作用请求参数 -->
<el-select v-model="listQuery.params.marketSegments" placeholder="请选择" filterable clearable>
<el-option v-for="item in marketSegments_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="规格型号:" class="searchlist">
<el-input v-model="listQuery.params.specifications" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.name" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">车辆列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车型" align="center">
<el-table-column width="120px" label="品牌" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="版本" align="center">
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehicleVersionValue }}</span>
<span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column width="100px" label="版本" align="center">
<template slot-scope="scope"> <!-- vehicleVersionValue-->
<span>{{ scope.row.versionValue }}</span>
</template>
</el-table-column>
<el-table-column label="燃料" align="center">
<el-table-column width="100px" label="燃料" align="center">
<template slot-scope="scope">
<span>{{ scope.row.fuelTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="变速箱" align="center">
<el-table-column width="100px" label="变速箱" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gearboxTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(万元)" align="center">
<el-table-column width="150px" label="销售指导价(万元)" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现车" align="center">
<el-table-column width="100px" label="车型图片" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handlookImg(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="110px" label="现车" align="center">
<template slot-scope="scope">
<span>{{ scope.row.nowCarNum }}</span>
</template>
</el-table-column>
<el-table-column label="排产" align="center">
<el-table-column width="110px" label="排产" align="center">
<template slot-scope="scope">
<span>{{ scope.row.productionCarNum }}</span>
<span>{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column width="100px" label="其他更多" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
</template>
@ -157,12 +150,18 @@
</div>
</div>
</div>
<!-- 查看车型照片弹窗 -->
<el-dialog title="查看" :visible.sync="dialogImgVisible">
<el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"
:preview-src-list="srcList"/>
</el-dialog>
<!-- 其他更多配置弹窗 -->
<el-dialog :visible.sync="dialogVisible" width="50%">
<el-table :key="tableKey" :data="datalist" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="分公司名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.company }}</span>
<span>{{ scope.row.companyName }}</span>
</template>
</el-table-column>
<el-table-column label="现车" align="center">
@ -172,7 +171,7 @@
</el-table-column>
<el-table-column label="排产车" align="center">
<template slot-scope="scope">
<span>{{ scope.row.productionCarNum }}</span>
<span>{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
</el-table>
@ -183,12 +182,13 @@
</template>
<script>
import {
brandDown,
dataDictionary,
modelPageList,
notTheCompanyModelPageList
} from '@/api/chexingchaxun/modelinquire'
import {
brandDown,
dataDictionary,
getPathSidByUserSid,
modelPageList,
notTheCompanyModelPageList
} from '@/api/chexingchaxun/modelinquire'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import configuration from './vehiclelibraryconfiguration.vue'
@ -204,9 +204,11 @@
return {
isSearchShow: false,
dialogVisible: false,
dialogImgVisible: false, //
searchxianshitit: '隐藏查询条件',
viewState: 1,
tableKey: 0,
srcList: [],
list: [],
datalist: [],
carBrand_list: [],
@ -234,16 +236,16 @@
current: 1,
size: 10,
params: {
carBrand: '', //
driveForm: '', //
brand: '', //
driver: '', //
fuelType: '', //
gearboxType: '', //
gearbox: '', //
modelName: '', //
power: '', //
horsepower: '', //
productLine: '', //
useOrg: '', //
// useOrg: '', // 使
userSid: window.sessionStorage.getItem('userSid'), //
vehicleType: '', //
vehicleFunction: '', //
vehicleVersion: '', //
emissionStandard: '', //
engineType: '', //
@ -268,15 +270,29 @@
},
init() {
this.getList()
this.getPathSid()
},
// ------------------
//
Dictionary() {
brandDown().then((res) => {
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
// this.listQuery.params.createOrgSId = res.data
this.useOrg = res.data
this.getBrand(res.data)
}
})
},
// -
getBrand(useOrg) {
brandDown({useOrg: useOrg}).then((res) => {
if (res.code === '200') {
this.carBrand_list = res.data
}
})
},
//
Dictionary() {
dataDictionary({type: 'vehicleFunction'}).then((res) => {
if (res.code === '200') {
this.vehicleType_list = res.data
@ -359,16 +375,16 @@
current: 1,
size: 10,
params: {
carBrand: '', //
driveForm: '', //
brand: '', //
driver: '', //
fuelType: '', //
gearboxType: '', //
gearbox: '', //
modelName: '', //
power: '', //
horsepower: '', //
productLine: '', //
useOrg: '', //
// useOrg: '', // 使
userSid: window.sessionStorage.getItem('userSid'), //
vehicleType: '', //
vehicleFunction: '', //
vehicleVersion: '', //
emissionStandard: '', //
engineType: '', //
@ -379,14 +395,23 @@
}
this.getList()
},
handlookImg(row) {
this.dialogImgVisible = true
console.log('图片列表', row.modelImage)
const imgList = []
imgList.push(row.modelImage)
this.srcList = imgList //
console.log('图片列表', this.srcList)
},
handlook(row) {
this.dialogVisible = true
this.dialogQuery.params.modelSid = row.sid
notTheCompanyModelPageList(this.dialogQuery).then((res) => {
if (res.code === '200') {
this.datalist = res.data.records
}
})
this.datalist = row.moreList
// this.dialogQuery.params.modelSid = row.sid
// notTheCompanyModelPageList(this.dialogQuery).then((res) => {
// if (res.code === '200') {
// this.datalist = res.data.records
// }
// })
},
handlink(row) {
this.viewState = 2
@ -408,19 +433,34 @@
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

58
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue

@ -13,7 +13,6 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row>
<el-form-item label="颜色:" class="searchlist">
<el-select v-model="listQuery.params.carColor" placeholder="请选择" filterable clearable>
<el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue"
@ -50,8 +49,6 @@
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="空调:" class="searchlist">
<el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue"
@ -88,8 +85,6 @@
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="鞍座:" class="searchlist">
<el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue"
@ -126,8 +121,6 @@
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="多媒体:" class="searchlist">
<el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
@ -137,12 +130,11 @@
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.configName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-row>
<div class="searchbtns">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
</el-form>
<div class="btn">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
@ -183,11 +175,11 @@
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格有效期" align="center" width="110">
<template slot-scope="scope">
<span>{{ scope.row.priceValidity }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="价格有效期" align="center" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.priceValidity }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="其他更多" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
@ -207,7 +199,7 @@
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="分公司名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.company }}</span>
<span>{{ scope.row.companyName }}</span>
</template>
</el-table-column>
<el-table-column label="现车" align="center">
@ -217,7 +209,7 @@
</el-table-column>
<el-table-column label="排产车" align="center">
<template slot-scope="scope">
<span>{{ scope.row.productionCarNum }}</span>
<span>{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
</el-table>
@ -232,7 +224,7 @@
</template>
<script>
import {configPageList, dataDictionary, notTheCompanyModelPageList} from '@/api/chexingchaxun/modelinquire'
import {configPageList, dataDictionary} from '@/api/chexingchaxun/modelinquire'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
// import modelstandardconfiguration from './modelstandardconfiguration'
@ -424,7 +416,7 @@ export default {
this.row = row
this.listQuery.params.modelSid = row.sid
this.modelSid = row.sid
this.modelName = row.vehicleAlias
this.modelName = row.modelName
this.Dictionary()
this.getList()
},
@ -477,13 +469,14 @@ export default {
},
handlook(row) {
this.dialogVisible = true
this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
this.dialogQuery.params.modelConfigSid = row.sid
notTheCompanyModelPageList(this.dialogQuery).then((res) => {
if (res.code === '200') {
this.datalist = res.data.records
}
})
this.datalist = row.moreList
// this.dialogQuery.params.modelSid = this.listQuery.params.modelSid
// this.dialogQuery.params.modelConfigSid = row.sid
// notTheCompanyModelPageList(this.dialogQuery).then((res) => {
// if (res.code === '200') {
// this.datalist = res.data.records
// }
// })
},
handleSelectionChange(row) {
if (row.length > 1) {
@ -562,4 +555,13 @@ export default {
.pagination {
margin-bottom: -10px;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

33
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;
}
}

6
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 {
//不是当前用户的客户,提示信息。

Loading…
Cancel
Save