Browse Source

问题修改

master
God 2 years ago
parent
commit
7994f07502
  1. 23
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppBaseLableListVo.java
  2. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppLableQuery.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java
  5. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigListVo.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java
  7. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java
  8. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java
  9. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigVo.java
  10. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java
  11. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java
  12. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVinNowCarVo.java
  13. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  14. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  15. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/ModelLabel.java
  16. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceQuery.java
  17. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleModelPriceVo.java
  18. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java
  19. 51
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
  20. 24
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  21. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
  22. 140
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  23. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  24. 185
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  25. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  26. 115
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  27. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  28. 189
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  29. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  30. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelMapper.java
  31. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelService.java
  32. 70
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeign.java
  33. 77
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeignFallback.java
  34. 64
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageQuery.java
  35. 61
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageVo.java
  36. 13
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelLabel.java
  37. 78
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockRest.java
  38. 78
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockService.java

23
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppBaseLableListVo.java

@ -0,0 +1,23 @@
package com.yxt.anrui.base.api.basediscountpackage;
import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppBaseLableListVo implements Vo {
@ApiModelProperty("标签sid")
private String sid;
@ApiModelProperty("标签key")
private String dictKey;
@ApiModelProperty("标签value")
private String dictValue;
}

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/AppLableQuery.java

@ -0,0 +1,13 @@
package com.yxt.anrui.base.api.basediscountpackage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppLableQuery {
@ApiModelProperty("userSid")
private String userSid;
@ApiModelProperty("组织机构sid")
private String orgPath;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@ -3,6 +3,7 @@ package com.yxt.anrui.base.api.basediscountpackage;
import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
import com.yxt.anrui.base.api.basediscountpackage.flow.*;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -72,6 +73,9 @@ public interface BaseDiscountpackageFeign {
@GetMapping("/getAppPackage")
ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery appBaseDiscountpackageQuery);
@ApiOperation("移动端-获取标签")
@GetMapping("/selectAppLableListByUserSid")
ResultBean<List<AppBaseLableListVo>> selectAppListByUserSid(@SpringQueryMap AppLableQuery appLableQuery);
/*****************************销售政策流程****************************************************/
@ApiOperation("提交销售政策流程")

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@ -72,6 +72,11 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
return null;
}
@Override
public ResultBean<List<AppBaseLableListVo>> selectAppListByUserSid(AppLableQuery appLableQuery) {
return null;
}
@Override
public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
return null;

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

@ -1,5 +1,7 @@
package com.yxt.anrui.base.api.basemodelconfig;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.anrui.base.api.basevehicle.ModelLabel;
import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -98,4 +100,13 @@ public class AppModelConfigListVo implements Vo {
@ApiModelProperty(value = "车型配置关联sid")
private String vehModelConfigSid;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
@ApiModelProperty(value = "销售政策标签")
private String label;
private BaseModelVehicleVersionVo carDetailPage;
}

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

@ -162,6 +162,10 @@ public interface BaseModelConfigFeign {
@PostMapping("/getModelConfigList")
public ResultBean<ModelConfigVo> getModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
@ApiOperation("App库存车型获取当前车型配置(标签)")
@PostMapping("/getStockModelConfigList")
public ResultBean<ModelConfigVo> getStockModelConfigList(@RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
@ApiOperation("pc端车型查询配置")
@PostMapping("/getPcModelConfigList")
public ResultBean<PagerVo<AppModelConfigListVo>> getPcModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);

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

@ -115,6 +115,11 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
return null;
}
@Override
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<PagerVo<AppModelConfigListVo>> getPcModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
return null;

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

@ -61,5 +61,7 @@ public class ModelConfigListQuery implements Query {
// @ApiModelProperty("分公司:机构sid")
// private String orgPath;
@ApiModelProperty(value = "标签")
private String label;
}

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

@ -1,6 +1,8 @@
package com.yxt.anrui.base.api.basemodelconfig;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
import com.yxt.anrui.base.api.basevehicle.ModelLabel;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -57,5 +59,8 @@ public class ModelConfigVo implements Vo {
@ApiModelProperty(value = "排放标准:移动端使用")
private String emissionStandardValue;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
}

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

@ -1,5 +1,6 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -20,7 +21,12 @@ public class AppBaseConfigNowCarVo implements Vo {
@ApiModelProperty("常用配置")
private String commonlyConfig;
/*
@ApiModelProperty("页数")
private Long pages;*/
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
private BaseModelVehicleVersionVo carDetailPage;
}

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

@ -1,5 +1,6 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -25,4 +26,11 @@ public class AppBaseConfigOrderCarVo implements Vo {
@ApiModelProperty("页数")
private Long pages;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
private BaseModelVehicleVersionVo carDetailPage;
}

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

@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppBaseVinNowCarVo implements Vo {
@ -25,4 +27,9 @@ public class AppBaseVinNowCarVo implements Vo {
@ApiModelProperty("存放地点")
private String address;
@ApiModelProperty("促销价")
private String promotionPrice;
@ApiModelProperty(value = "销售政策标签")
private String label;
}

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

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

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

@ -301,11 +301,21 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
return null;
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
return null;
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
return null;
}
@Override
public ResultBean saveCarConfigSummaryInfo(@Valid AppCarConfigSummaryDto dto) {
return null;

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

@ -0,0 +1,13 @@
package com.yxt.anrui.base.api.basevehicle;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel("标签")
@Data
public class ModelLabel {
@ApiModelProperty(value = "标签名称")
private String name;
}

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

@ -65,4 +65,7 @@ public class VehicleModelPriceQuery implements Query {
@ApiModelProperty(value = "规格型号")
private String specifications;
@ApiModelProperty(value = "标签")
private String label;
}

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

@ -58,7 +58,10 @@ public class VehicleModelPriceVo implements Vo {
private List<MoreConfigVo> moreList;
@ApiModelProperty(value = "车型标签")
private List<String> mains;
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
@ApiModelProperty(value = "销售政策标签")
private String label;

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@ -6,6 +6,7 @@ import com.yxt.anrui.base.api.basediscountpackage.*;
import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
import com.yxt.anrui.base.api.basediscountpackage.flow.*;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.common.base.utils.PagerUtil;
@ -140,6 +141,11 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery);
}
@Override
public ResultBean<List<AppBaseLableListVo>> selectAppListByUserSid(AppLableQuery appLableQuery) {
return baseDiscountpackageService.selectAppListByUserSid(appLableQuery);
}
@Override
public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
return baseDiscountpackageService.submitBaseDiscountpackage(dto);

51
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@ -17,7 +17,11 @@ import com.yxt.anrui.base.api.basediscountpackage.flow.SubmitBaseDiscountpackage
import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh;
import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo;
import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDetailsVo;
import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelFeign;
import com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehService;
import com.yxt.anrui.base.biz.basevehmodellabel.BaseVehmodelLabelService;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -27,6 +31,10 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -77,6 +85,15 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
@Autowired
private BaseDiscountpackageVehService baseDiscountpackageVehService;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BaseVehmodelLabelService baseVehmodelLabelService;
/**
* 优惠政策分页列表
*
@ -151,7 +168,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
String sid = baseDiscountpackageVeh.getSid();
BeanUtil.copyProperties(baseDiscountpackageVehDto,baseDiscountpackageVeh);
BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh);
baseDiscountpackageVeh.setSid(sid);
baseDiscountpackageVeh.setMainSid(entity.getSid());
baseDiscountpackageVehService.save(baseDiscountpackageVeh);
@ -183,7 +200,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
String sid1 = baseDiscountpackageVeh.getSid();
BeanUtil.copyProperties(baseDiscountpackageVehDto,baseDiscountpackageVeh);
BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh);
baseDiscountpackageVeh.setSid(sid1);
baseDiscountpackageVeh.setMainSid(sid);
baseDiscountpackageVehService.save(baseDiscountpackageVeh);
@ -411,7 +428,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)");
}
qw.eq("salesPolicyKey", "0002");
qw.eq("nodeState","已办结");
qw.eq("nodeState", "已办结");
List<AppBaseDiscountpackageVo> voList = baseMapper.getAppPackage(qw);
if (voList.isEmpty()) {
voList = new ArrayList<>();
@ -528,7 +545,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
Boolean i = false;
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if ("0001".equals(baseDiscountpackage.getDiscountTypeKey())){
if ("0001".equals(baseDiscountpackage.getDiscountTypeKey())) {
i = true;
}
if (formVariables == null) {
@ -559,7 +576,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
Boolean i = false;
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if ("0001".equals(query.getDiscountTypeKey())){
if ("0001".equals(query.getDiscountTypeKey())) {
i = true;
}
if (formVariables == null) {
@ -671,4 +688,28 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
List<String> stringList = baseMapper.getMoney(vinSid, orgSid);
return rb.success().setData(stringList);
}
public ResultBean<List<AppBaseLableListVo>> selectAppListByUserSid(AppLableQuery appLableQuery) {
ResultBean<List<AppBaseLableListVo>> rb = ResultBean.fireFail();
List<AppBaseLableListVo> appBaseLableListVos = new ArrayList<>();
List<DictCommonVo> discountPolicyType = dictCommonFeign.getTypeValues("discountPolicyType", "0").getData();
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(appLableQuery.getUserSid());
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
String orgSid = resultBean1.getData().getSid();
List<BaseVehmodelLabelDetailsVo> baseVehmodelLabelDetailsVos = baseVehmodelLabelService.fetchByOrgSid(orgSid);
for (DictCommonVo dictCommonVo : discountPolicyType) {
AppBaseLableListVo appBaseLableListVo = new AppBaseLableListVo();
appBaseLableListVo.setSid(dictCommonVo.getSid());
appBaseLableListVo.setDictKey(dictCommonVo.getDictKey());
appBaseLableListVo.setDictValue(dictCommonVo.getDictValue());
appBaseLableListVos.add(appBaseLableListVo);
}
for (BaseVehmodelLabelDetailsVo baseVehmodelLabelDetailsVo : baseVehmodelLabelDetailsVos) {
AppBaseLableListVo appBaseLableListVo = new AppBaseLableListVo();
appBaseLableListVo.setDictKey(baseVehmodelLabelDetailsVo.getSid());
appBaseLableListVo.setDictValue(baseVehmodelLabelDetailsVo.getLabelName());
appBaseLableListVos.add(appBaseLableListVo);
}
return rb.success().setData(appBaseLableListVos);
}
}

24
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -337,19 +337,19 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<SysOrganizationVo> list = orgList.getData();
for (SysOrganizationVo sysOrganizationVo : list) {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(sysOrganizationVo.getName());
bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
}else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(sysOrganizationVo.getName());
bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.draftBdSupplier(bdSupplier);
}
return rb.success().setMsg("操作成功");
@ -465,19 +465,19 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<SysOrganizationVo> list = orgList.getData();
for (SysOrganizationVo sysOrganizationVo : list) {
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(sysOrganizationVo.getName());
bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
}else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
BdSupplier bdSupplier = new BdSupplier();
bdSupplier.setFName(sysOrganizationVo.getName());
bdSupplier.setFLocMobile(sysOrganizationVo.getLinkPhone());
bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
bdSupplier.setFUseOrgId(sysOrganizationVo.getOrgCode());
bdSupplier.setFNumber(sysOrganizationVo.getOtherCode());
bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
finKingDeeFeign.updateBdSupplier(bdSupplier);
}
return rb.success().setMsg("修改成功");

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

@ -213,4 +213,8 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
int selectCount();
List<String> checkConfigNameBySid(@Param("sid") String sid, @Param("createOrgSid") String createOrgSid);
List<AppModelConfigListVo> getModelConfigLableList(@Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey, @Param("orgSid") String orgSid,@Param("label") String label);
ModelConfigVo getStockModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid);
}

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

@ -230,8 +230,8 @@
bmc.multimedia,
bv.guidedPrice
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid}
</select>
<select id="selectAppConfigListByModelSid2"
@ -266,16 +266,16 @@
FROM base_vehmodel_config bvc
WHERE bvc.configurationItemsSid = bmc.sid) AS priceValidity
FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid}
</select>
<select id="selectVehicleQuantity" resultType="java.lang.String">
SELECT count(*)
FROM base_model_config bmc
LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bmc.sid = #{sid}
AND bvm.sid = #{modelSid}
</select>
@ -304,8 +304,8 @@
bmc.multimedia,
bmc.otherConfig
FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
@ -482,8 +482,8 @@
bmc.multimedia,
bmc.otherConfig
FROM bus_vehicle_apply_detail bvad
LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
WHERE bmc.sid = #{configSid}
AND bvm.sid = #{modelSid}
</select>
@ -509,7 +509,7 @@
bvm.specifications,
bvm.insideCode
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
where bvm.sid = #{modelSid}
and bvc.useOrgSid = #{useOrgSid}
</select>
@ -577,16 +577,18 @@
AND bv.lockedState = #{state}
and bv.useOrgSid = bvc.useOrgSid) AS nowCarNum,
(select SUM(cast((cast(bo.platformNo as signed) -
IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
where bo.useOrgSid = bvc.useOrgSid
and bd.vehicleSid = #{modelSid}
and bd.configSid = #{configSid}) AS produceCarNum
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid != #{useOrg} and LENGTH(bvc.useOrgSid) >0
AND bvc.useOrgSid != #{useOrg}
and LENGTH (bvc.useOrgSid)
>0
</select>
<select id="getCarConfigSummary" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
SELECT bmc.sid,
@ -617,8 +619,8 @@
-- bv.salePrice as price,
bmc.otherConfig
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
WHERE bvm.sid = #{modelSid}
AND bmc.sid = #{configSid}
</select>
@ -777,4 +779,110 @@
WHERE isDelete = 0
AND createOrgSId = #{createOrgSid}
</select>
<select id="getModelConfigLableList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
SELECT bmc.sid as configSid,
bmc.carColor,
bmc.slowMachine,
bmc.rearViewMirror,
bmc.tireSize,
bmc.specification,
bmc.rearAxleRatio,
bmc.rearAxleValue,
bmc.airConditioner,
bmc.hubMaterial,
bmc.baffleModel,
bmc.suspension,
bmc.seat,
bmc.tireCover,
bmc.saddle,
bmc.wheelbase,
bmc.bumper,
bmc.configuringBao,
bmc.independentSources,
bmc.fuelTank,
bmc.multimedia,
convert(bvc.guidedPrice/10000,decimal(10,2)) as price,
bvc.priceValidity,
bvm.sid as modelSid,
bvm.vehicleAlias as modelName,
bvm.brandName as brand,
bvm.carBrand as brandSid,
bd.salesPolicy AS label,
(SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{orgSid}) AS labelName,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
AND bv.modelConfigSid = bvc.configurationItemsSid
and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
AND bv.lockedState = #{lockedStateKey}
and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0') AS nowCarNum,
(select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
as quantity from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid
where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid and
bo.state = 0) AS
produceCarNum
FROM base_vehmodel_config bvc
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
LEFT JOIN base_discountpackage_veh bdv ON bdv.vehModelSid = bvm.sid
LEFT JOIN base_discountpackage bd ON bdv.mainSid = bd.sid
LEFT JOIN base_vehicle bv ON bv.sid = bdv.vehSid
<where>
${ew.sqlSegment}
<if test="orgSid != null and orgSid != ''">
and bvc.useOrgSid = #{orgSid}
</if>
<if test="label != null and label != ''">
AND (bd.salesPolicy = #{label} or (SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{orgSid}) like concat('%',#{label},'%'))
</if>
and length(bvc.guidedPrice)>0
</where>
ORDER BY nowCarNum DESC
</select>
<select id="getStockModelConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo">
SELECT bvm.vehicleAlias AS modelName,
bvm.brandName,
bvm.vehicleVersionValue,
if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)))) AS price,
bvm.vehicleTypeValue,
bvm.productLineValue,
bvm.powerValue,
bvm.driveFormValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvm.marketSegmentsValue as marketSegments,
bvm.departmentValue as department,
bvm.emissionStandardValue,
bvm.engineTypeValue,
bvm.announcementModel,
bvm.specifications,
bvm.insideCode,
(SELECT GROUP_CONCAT(bvl.labelName)
FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid
AND bvc.`useOrgSid` = #{useOrgSid}) AS labelName
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
where bvm.sid = #{modelSid}
and bvc.useOrgSid = #{useOrgSid}
</select>
</mapper>

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

@ -577,6 +577,21 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
ResultBean<ModelConfigVo> rb = ResultBean.fireFail();
String modelSid = pagerQuery.getParams().getModelSid();
String userSid = pagerQuery.getParams().getUserSid();
if (StringUtils.isBlank(modelSid)) {
return rb.setMsg("参数错误:车型sid不允许为空");
}
if (StringUtils.isBlank(userSid)) {
return rb.setMsg("参数错误,用户sid不允许为空");
}
ModelConfigVo vo = baseModelConfigService.getStockModelConfigList(pagerQuery);
return rb.success().setData(vo);
}
@Override
public ResultBean<PagerVo<AppModelConfigListVo>> getPcModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
ResultBean<PagerVo<AppModelConfigListVo>> rb = ResultBean.fireFail();

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

@ -1,13 +1,20 @@
package com.yxt.anrui.base.biz.basemodelconfig;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
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.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.anrui.base.api.basevehicle.ModelLabel;
import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
import com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo;
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -15,12 +22,15 @@ import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -40,10 +50,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BaseVehicleAppendixService baseVehicleAppendixService;
private AppSubsetVersionFeign appSubsetVersionFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
@ -136,8 +144,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
if (StringUtils.isNotBlank(pagerQuery.getMultimediaKey())) {//多媒体key
qw.like("bmc.multimediaKey", pagerQuery.getMultimediaKey());
}
if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//简述配置名称
qw.like("bmc.configName", pagerQuery.getConfigName()).or().like("bmc.otherConfig", pagerQuery.getConfigName());
if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//简述配置
qw.and(wrapper -> wrapper.like("bmc.configName", pagerQuery.getConfigName()).or().like("bmc.configCode", pagerQuery.getConfigName()));
}
String configSid = pagerQuery.getConfigSid();
if (StringUtils.isNotBlank(configSid)) {
@ -877,4 +885,171 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
public List<String> checkConfigNameBySid(String sid, String createOrgSid) {
return baseMapper.checkConfigNameBySid(sid, createOrgSid);
}
public ModelConfigVo getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
String userSid = pagerQuery.getParams().getUserSid();
// 1、根据业务员部门sid查询分公司sid
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
if (StringUtils.isNotBlank(orgSid)) {
pagerQuery.getParams().setUseOrg(orgSid);
}
String modelSid = pagerQuery.getParams().getModelSid();
ModelConfigVo vo = baseMapper.getStockModelConfigList(modelSid, orgSid);
List<ModelLabel> modelLabels = new ArrayList<>();
if (StringUtils.isNotBlank(vo.getLabelName())){
String[] labelNames = vo.getLabelName().split(",");
for (String labelName : labelNames) {
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(labelName);
modelLabels.add(modelLabel);
}
}
vo.setTypeList(modelLabels);
List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
List<String> modelImagesList = new ArrayList<>();
if (!modelImages.isEmpty()) {
for (int i = 0; i < modelImages.size(); i++) {
if (!modelImages.get(i).contains(fileUploadComponent.getUrlPrefix())) {
modelImagesList.add(fileUploadComponent.getUrlPrefix() + modelImages.get(i));
}
}
}
vo.setModelImage(modelImagesList);
//基础配置拼接
List<ConfigInfo> list = new ArrayList<>();
list.add(getConfigValue("品牌", vo.getBrandName()));
list.add(getConfigValue("功能", vo.getVehicleTypeValue()));
list.add(getConfigValue("系列", vo.getProductLineValue()));
list.add(getConfigValue("驱动", vo.getDriveFormValue()));
list.add(getConfigValue("马力", vo.getPowerValue()));
list.add(getConfigValue("版本", vo.getVehicleVersionValue()));
list.add(getConfigValue("燃料", vo.getFuelTypeValue()));
list.add(getConfigValue("变速箱", vo.getGearboxTypeValue()));
list.add(getConfigValue("排放标准", vo.getEmissionStandardValue()));
list.add(getConfigValue("发动机型号", vo.getEngineTypeValue()));
list.add(getConfigValue("细分市场", vo.getMarketSegments()));
list.add(getConfigValue("规格型号", vo.getSpecifications()));
list.add(getConfigValue("系别", vo.getDepartment()));
vo.setConfigList(list);
//配置列表
IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppModelConfigListVo> qw = new QueryWrapper<>();
ModelConfigListQuery params = pagerQuery.getParams();
if (params != null) {
if (StringUtils.isNotBlank(params.getName())) {//名称
qw.like("bmc.configName", params.getName());
}
if (StringUtils.isNotBlank(params.getBodyColor())) {//颜色
qw.like("bmc.carColor", params.getBodyColor());
}
if (StringUtils.isNotBlank(params.getSlowMachine())) {//缓速器
qw.eq("bmc.slowMachine", params.getSlowMachine());
}
if (StringUtils.isNotBlank(params.getRearViewMirror())) {//后视镜
qw.eq("bmc.rearViewMirror", params.getRearViewMirror());
}
if (StringUtils.isNotBlank(params.getTireSize())) {//轮胎
qw.eq("bmc.tireSize", params.getTireSize());
}
if (StringUtils.isNotBlank(params.getSpecification())) {//驾驶室
qw.eq("bmc.specification", params.getSpecification());
}
if (StringUtils.isNotBlank(params.getRearAxleRatio())) {//速比
qw.eq("bmc.rearAxleRatio", params.getRearAxleRatio());
}
if (StringUtils.isNotBlank(params.getRearAxleValue())) {//后桥
qw.eq("bmc.rearAxleValue", params.getRearAxleValue());
}
if (StringUtils.isNotBlank(params.getAirConditioner())) {//空调
qw.eq("bmc.airConditioner", params.getAirConditioner());
}
if (StringUtils.isNotBlank(params.getHubMaterial())) {//轮毂材质
qw.eq("bmc.hubMaterial", params.getHubMaterial());
}
if (StringUtils.isNotBlank(params.getDiversionCover())) {//导流罩
qw.eq("bmc.baffleModel", params.getDiversionCover());
}
if (StringUtils.isNotBlank(params.getModelSid())) {//车型sid
qw.eq("bvc.modelSid", params.getModelSid());
}
if (StringUtils.isNotBlank(params.getMultiMedia())) {//多媒体
qw.eq("bmc.multimedia", params.getMultiMedia());
}
if (StringUtils.isNotBlank(params.getFuelTank())) {//燃料箱
qw.eq("bmc.fuelTank", params.getFuelTank());
}
if (StringUtils.isNotBlank(params.getIndependentSources())) {//独立热源
qw.eq("bmc.independentSources", params.getIndependentSources());
}
if (StringUtils.isNotBlank(params.getConfiguringBao())) {//配置包
qw.eq("bmc.configuringBao", params.getConfiguringBao());
}
if (StringUtils.isNotBlank(params.getBumper())) {//保险杠
qw.eq("bmc.bumper", params.getBumper());
}
if (StringUtils.isNotBlank(params.getWheelbase())) {//轴距
qw.eq("bmc.wheelbase", params.getWheelbase());
}
if (StringUtils.isNotBlank(params.getSaddle())) {//鞍座
qw.eq("bmc.saddle", params.getSaddle());
}
if (StringUtils.isNotBlank(params.getProtectTireCover())) {//护轮罩
qw.eq("bmc.tireCover", params.getProtectTireCover());
}
if (StringUtils.isNotBlank(params.getSeat())) {//座椅
qw.eq("bmc.seat", params.getSeat());
}
if (StringUtils.isNotBlank(params.getSuspension())) {//悬架
qw.eq("bmc.suspension", params.getSuspension());
}
}
List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigLableList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid, params.getLabel());
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())){
String labelName = appModelConfigListVo.getLabelName();
String[] mains = labelName.split(",");
List<ModelLabel> modelLabelss = new ArrayList<>();
for (String main : mains) {
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(main);
modelLabelss.add(modelLabel);
}
appModelConfigListVo.setTypeList(modelLabelss);
}
//添加移动端车型页面信息
ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
AppSubVersionVo appSubVersionVo = resultBean.getData();
BaseModelVehicleVersionVo appVehicleVersionVo = new BaseModelVehicleVersionVo();
Map<String, Object> map = new HashMap<>();
map.put("modelSid", appModelConfigListVo.getModelSid());
map.put("configSid", appModelConfigListVo.getConfigSid());
map.put("selectType", 0);
appSubVersionVo.setJson(JSONObject.toJSONString(map));
BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
appModelConfigListVo.setCarDetailPage(appVehicleVersionVo);
}
long pages = page.getPages();
vo.setPages((int) pages);
//分公司配置列表查询
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
appModelConfigListVo.setProduceCarNum("0");
}
List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
for (MoreConfigVo moreConfigVo : moreConfigVos) {
String sid = moreConfigVo.getUseOrgSid();
if (StringUtils.isNotBlank(sid)) {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
moreConfigVo.setCompanyName(sysOrganization.getName());
}
if (StringUtils.isBlank(moreConfigVo.getProduceCarNum())) {
moreConfigVo.setProduceCarNum("0");
}
}
appModelConfigListVo.setMoreList(moreConfigVos);
}
addDonfigName(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
return vo;
}
}

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

@ -478,4 +478,10 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(IPage<BaseChoiceVehicleVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
IPage<VehicleModelPriceVo> getStockModelList(IPage<VehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<VehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey,@Param("lable") String lable);
List<AppBaseVinNowCarVo> getStockModelNowCarList(@Param(Constants.WRAPPER) QueryWrapper<AppBaseVinNowCarVo> qw);
AppBaseConfigOrderCarVo getStockModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
}

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

@ -100,8 +100,8 @@
bvm.modelName AS modelNameQuan,
bvm.`brandName` AS vehModelBrandName,
(select bbc.guidedPrice from base_vehmodel_config bbc where bbc.modelSid = bv.modelSid
and bbc.useOrgSid =bv.useOrgSid
AND bmc.sid=bbc.configurationItemsSid ) as guidedPrice
and bbc.useOrgSid =bv.useOrgSid
AND bmc.sid=bbc.configurationItemsSid ) as guidedPrice
FROM
base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
@ -959,7 +959,13 @@
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
SELECT bvm.vehicleAlias AS modelName,
convert(bc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig
bmc.configName AS commonlyConfig,
(SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{useOrg}) AS labelName
FROM base_vehmodel_config bc
LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
@ -1005,7 +1011,7 @@
where bv.modelSid = #{modelSid}
and bv.modelConfigSid = #{configSid}
and bv.useOrgSid = #{orgSid}
and bv.lockedState = #{state}
and bv.lockedState = #{state}
AND (
bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途'
@ -1193,7 +1199,8 @@
SELECT *
FROM base_vehicle
WHERE vinNo = #{vinNo}
AND createOrgSid = #{createOrgSid} AND isDelete = 0
AND createOrgSid = #{createOrgSid}
AND isDelete = 0
</select>
<select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
@ -1201,7 +1208,7 @@
FROM base_vehicle
WHERE vinNo = #{vinNo}
AND useOrgSid = #{useOrgSid}
AND isDelete = 0
AND isDelete = 0
</select>
<select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">
@ -1416,4 +1423,100 @@
${ew.sqlSegment}
</where>
</select>
<select id="getStockModelList" resultType="com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo">
SELECT DISTINCT bvm.sid AS modelSid,
bvm.vehicleAlias AS modelName,
bvm.carBrand AS brandSid,
bvm.brandName,
bvm.vehicleVersionValue AS versionValue,
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bd.salesPolicy AS label,
(SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`useOrgSid` = #{useOrgSid}) AS labelName,
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)),
CONCAT(convert(MIN(bvc.guidedPrice)/10000,decimal(10,2)), '-',
convert(MAX(bvc.guidedPrice)/10000,decimal(10,2))))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid
= bvm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT count(*)
FROM base_vehmodel_config bvc
WHERE bvc.modelSid = bvm.sid
AND bvc.useOrgSid = #{useOrgSid} and length(bvc.guidedPrice)>0) AS
configNum,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvm.sid
AND (bv.vehicleStateValue = '库存'
OR bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入')
AND lockedState = #{lockedStateKey}
AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0') AS nowCarNum,
(select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
as quantity from bus_vehicle_order bo
LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid
where bo.useOrgSid = #{useOrgSid} AND bd.vehicleSid = bvm.sid AND bo.state = 0) AS produceCarNum
FROM base_vehicle_model bvm
LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
left join base_vehicle_brand bb on bb.sid = bvm.carBrand
LEFT JOIN base_discountpackage_veh bdv
ON bdv.vehModelSid = bvm.sid
LEFT JOIN base_discountpackage bd
ON bdv.mainSid = bd.sid
<where>
${ew.sqlSegment}
<if test="lable != null and lable != ''">
AND (bd.salesPolicy = #{lable} or (SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`useOrgSid` = #{useOrgSid}) like concat('%',#{lable},'%'))
</if>
and length(bvc.guidedPrice)>0
</where>
ORDER BY nowCarNum DESC
</select>
<select id="getStockModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
SELECT bv.sid,
bv.vinNo AS vin,
bv.vehicleStateValue AS `state`,
bmc.carColor AS color,
bv.locationName AS address,
bd.salesPolicy AS label,
bdv.guidedQKPrice AS promotionPrice
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
LEFT JOIN base_discountpackage_veh bdv
ON bdv.vehSid = bv.sid
LEFT JOIN base_discountpackage bd
ON bdv.mainSid = bd.sid
${ew.customSqlSegment}
</select>
<select id="getStockModelSidAndConfigSid" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
select bvm.vehicleAlias AS modelName,
convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig,
(SELECT GROUP_CONCAT(bvl.labelName) FROM base_vehmodel_label bvl
LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid`
WHERE bvc.modelSid = bvm.sid AND bvc.`configurationItemsSid` = bmc.sid AND bvc.`useOrgSid` = #{useOrg}) AS labelName
from base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
where bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
</select>
</mapper>

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

@ -1077,7 +1077,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.setMsg("用户sid不能为空");
}
PagerVo<VehicleModelPriceVo> page = new PagerVo<>();
IPage<VehicleModelPriceVo> iPage = baseVehicleService.getModelList(pagerQuery);
IPage<VehicleModelPriceVo> iPage = baseVehicleService.getStockModelList(pagerQuery);
PagerVo<VehicleModelPriceVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return rb.success().setData(pagerVo);
}
@ -1109,6 +1109,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigNowCarVo> rb = ResultBean.fireFail();
AppBaseConfigNowCarVo vo = baseVehicleService.getStockModelNowCarList(pagerQuery);
return rb.success().setData(vo);
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigOrderCarVo> rb = ResultBean.fireFail();
@ -1116,6 +1123,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigOrderCarVo> rb = ResultBean.fireFail();
AppBaseConfigOrderCarVo vo = baseVehicleService.getStockModelOrderCarList(pagerQuery);
return rb.success().setData(vo);
}
@Override
public ResultBean saveCarConfigSummaryInfo(AppCarConfigSummaryDto dto) {
ResultBean rb = ResultBean.fireFail();

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

@ -1,13 +1,17 @@
package com.yxt.anrui.base.biz.basevehicle;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseinternalpurchase.AppVehicleVersionVo;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery;
@ -36,6 +40,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -60,10 +66,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -115,6 +118,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private ScmCollectionRebateVehFeign scmCollectionRebateVehFeign;
@Autowired
private AppSubsetVersionFeign appSubsetVersionFeign;
/**
* 车辆信息分页列表
@ -1825,9 +1830,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
vehicleQuery.setModelSid(query.getModelSid());
ResultBean<List<String>> selectVehicleList = pcBusMainDepositFeign.selectVehicleList(vehicleQuery);
if (selectVehicleList.getSuccess()) {
stringList = selectVehicleList.getData();
stringList = selectVehicleList.getData();
}
IPage<PcBaseVehicleOrderVo> pagging = baseMapper.selectVo(page, qw,stringList);
IPage<PcBaseVehicleOrderVo> pagging = baseMapper.selectVo(page, qw, stringList);
PagerVo<PcBaseVehicleOrderVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -3305,4 +3310,176 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
return baseMapper.vehicleCollectionPageList(page, qw);
}
public IPage<VehicleModelPriceVo> getStockModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
String userSid = pagerQuery.getParams().getUserSid();
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
if (StringUtils.isNotBlank(orgSid)) {
pagerQuery.getParams().setUseOrg(orgSid);
}
IPage<VehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
VehicleModelPriceQuery params = pagerQuery.getParams();
QueryWrapper<VehicleModelPriceVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(params.getName())) { // 车型名称
qw.like("bvm.vehicleAlias", params.getName());
}
if (StringUtils.isNotBlank(params.getEmissionStandard())) { // 排放标准
qw.eq("bvm.emissionStandardValue", params.getEmissionStandard());
}
if (StringUtils.isNotBlank(params.getDriver())) { // 驱动
qw.eq("bvm.driveFormValue", params.getDriver());
}
if (StringUtils.isNotBlank(params.getGearbox())) { // 变速箱
qw.eq("bvm.gearboxTypeValue", params.getGearbox());
}
if (StringUtils.isNotBlank(params.getSeries())) { // 产品系别
qw.eq("bvm.departmentValue", params.getSeries());
}
if (StringUtils.isNotBlank(params.getVehicleFunction())) { // 功能
qw.eq("bvm.vehicleTypeValue", params.getVehicleFunction());
}
if (StringUtils.isNotBlank(params.getMarketSegments())) { // 细分市场
qw.eq("bvm.marketSegmentsValue", params.getMarketSegments());
}
if (StringUtils.isNotBlank(params.getVehicleVersion())) { // 版本
qw.eq("bvm.vehicleVersionValue", params.getVehicleVersion());
}
if (StringUtils.isNotBlank(params.getFuelType())) { // 燃料
qw.eq("bvm.fuelTypeValue", params.getFuelType());
}
if (StringUtils.isNotBlank(params.getHorsepower())) { // 马力
qw.eq("bvm.powerValue", params.getHorsepower());
}
if (StringUtils.isNotBlank(params.getBrand())) { // 品牌
qw.eq("bvm.brandName", params.getBrand());
}
if (StringUtils.isNotBlank(params.getUseOrg())) { // 分公司
qw.eq("bvc.useOrgSid", params.getUseOrg());
}
if (StringUtils.isNotBlank(params.getProductLine())) {
qw.eq("bvm.productLineValue", params.getProductLine());
}
if (StringUtils.isNotBlank(params.getEngineType())) {
qw.eq("bvm.engineTypeValue", params.getEngineType());
}
if (StringUtils.isNotBlank(params.getSpecifications())) {
qw.like("bvm.specifications", params.getSpecifications());
}
qw.like("bb.useOrg", params.getUseOrg());
qw.eq("bvm.isDelete", 0);
IPage<VehicleModelPriceVo> iPage = baseMapper.getStockModelList(page, qw, orgSid, VehicleState.LockEnum.UN_LOCK.getCode(), params.getLabel());
for (VehicleModelPriceVo record : iPage.getRecords()) {
if (StringUtils.isNotBlank(record.getLabelName())) {
String labelName = record.getLabelName();
String[] mains = labelName.split(",");
List<ModelLabel> modelLabels = new ArrayList<>();
for (String main : mains) {
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(main);
modelLabels.add(modelLabel);
}
record.setTypeList(modelLabels);
}
}
// 3、 查询更多配置(其它分公司)
for (VehicleModelPriceVo record : iPage.getRecords()) {
String modelSid = record.getModelSid();
ResultBean image = baseVehicleModelAppendixService.selectImage(modelSid);
if (image.getSuccess()) {
record.setModelImage(image.getData().toString());
}
if (StringUtils.isBlank(record.getProduceCarNum())) {
record.setProduceCarNum("0");
}
List<MoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
for (MoreConfigVo moreConfigVo : moreConfigVos) {
String sid = moreConfigVo.getUseOrgSid();
if (StringUtils.isNotBlank(sid)) {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
moreConfigVo.setCompanyName(sysOrganization.getName());
}
if (StringUtils.isBlank(moreConfigVo.getProduceCarNum())) {
moreConfigVo.setProduceCarNum("0");
}
}
record.setMoreList(moreConfigVos);
}
return iPage;
}
public AppBaseConfigNowCarVo getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getUserSid()).getData();
pagerQuery.setUseOrg(orgSid);
AppBaseConfigNowCarVo appBaseConfigNowCarVo = baseMapper.selectByModelSidAndConfigSid(pagerQuery.getModelSid(), pagerQuery.getConfigSid(), pagerQuery.getUseOrg());
String labelName = appBaseConfigNowCarVo.getLabelName();
if (StringUtils.isNotBlank(labelName)) {
String[] mains = labelName.split(",");
List<ModelLabel> modelLabels = new ArrayList<>();
for (String main : mains) {
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(main);
modelLabels.add(modelLabel);
}
appBaseConfigNowCarVo.setTypeList(modelLabels);
}
List<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(pagerQuery);
List<AppBaseVinNowCarVo> pagging = baseMapper.getStockModelNowCarList(qw);
for (AppBaseVinNowCarVo record : pagging) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateService.selStateByVehicleSid(record.getSid());
if (baseVehicleCertificateVo != null) {
record.setCertificate(baseVehicleCertificateVo.getCertificateStateValue());
}
vinNowCarVos.add(record);
}
appBaseConfigNowCarVo.setRecords(vinNowCarVos);
//添加移动端车型页面信息
ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
AppSubVersionVo appSubVersionVo = resultBean.getData();
BaseModelVehicleVersionVo appVehicleVersionVo = new BaseModelVehicleVersionVo();
Map<String, Object> map = new HashMap<>();
map.put("modelSid", pagerQuery.getModelSid());
map.put("configSid", pagerQuery.getConfigSid());
map.put("selectType", 0);
appSubVersionVo.setJson(JSONObject.toJSONString(map));
BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
appBaseConfigNowCarVo.setCarDetailPage(appVehicleVersionVo);
return appBaseConfigNowCarVo;
}
public AppBaseConfigOrderCarVo getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getUserSid()).getData();
pagerQuery.setUseOrg(data.getSid());
AppBaseConfigOrderCarVo appBaseConfigOrderCarVo = baseMapper.getStockModelSidAndConfigSid(pagerQuery.getModelSid(), pagerQuery.getConfigSid(), pagerQuery.getUseOrg());
String labelName = appBaseConfigOrderCarVo.getLabelName();
if (StringUtils.isNotBlank(labelName)) {
String[] mains = labelName.split(",");
List<ModelLabel> modelLabels = new ArrayList<>();
for (String main : mains) {
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(main);
modelLabels.add(modelLabel);
}
appBaseConfigOrderCarVo.setTypeList(modelLabels);
}
List<AppBaseNowProduceCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseNowProduceCarVo> qw = nowProduceWrapper(pagerQuery);
List<AppBaseNowProduceCarVo> pagging = baseMapper.getModelOrderCarList(qw);
for (AppBaseNowProduceCarVo record : pagging) {
vinNowCarVos.add(record);
}
appBaseConfigOrderCarVo.setRecords(vinNowCarVos);
//添加移动端车型页面信息
ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
AppSubVersionVo appSubVersionVo = resultBean.getData();
BaseModelVehicleVersionVo appVehicleVersionVo = new BaseModelVehicleVersionVo();
Map<String, Object> map = new HashMap<>();
map.put("modelSid", pagerQuery.getModelSid());
map.put("configSid", pagerQuery.getConfigSid());
map.put("selectType", 0);
appSubVersionVo.setJson(JSONObject.toJSONString(map));
BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
appBaseConfigOrderCarVo.setCarDetailPage(appVehicleVersionVo);
return appBaseConfigOrderCarVo;
}
}

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

@ -171,8 +171,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
if (StringUtils.isNotBlank(query.getMultimediaKey())) {//多媒体key
qw.like("bmc.multimediaKey", query.getMultimediaKey());
}
if (StringUtils.isNotBlank(query.getConfigName())) {//简述配置名称
qw.like("bmc.configName", query.getConfigName());
if (StringUtils.isNotBlank(query.getConfigName())) {//简述配置
qw.and(wrapper -> wrapper.like("bmc.configName", query.getConfigName()).or().like("bmc.configCode", query.getConfigName()));
}
return qw;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelMapper.java

@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehmodellabel.BaseVehmodelLabelDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +63,7 @@ public interface BaseVehmodelLabelMapper extends BaseMapper<BaseVehmodelLabel> {
@Select("select * from base_vehmodel_label")
List<BaseVehmodelLabelVo> selectListVo();
@Select("select * from base_vehmodel_label where createOrgSid = #{orgSid}")
List<BaseVehmodelLabelDetailsVo> fetchByOrgSid(String orgSid);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodellabel/BaseVehmodelLabelService.java

@ -112,4 +112,8 @@ public class BaseVehmodelLabelService extends MybatisBaseService<BaseVehmodelLab
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<BaseVehmodelLabelDetailsVo> fetchByOrgSid(String orgSid) {
return baseMapper.fetchByOrgSid(orgSid);
}
}

70
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeign.java

@ -0,0 +1,70 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@Api(tags = "库存列表")
@FeignClient(
contextId = "terminal-BaseVehicleStock",
name = "anrui-terminal",
path = "/supplychain/v1/stock",
fallback = AppScmVehicleGressionFeignFallback.class)
public interface AppBaseVehicleStockFeign {
@ApiOperation("移动端库存列表")
@PostMapping("/getStockModelList")
@ResponseBody
public ResultBean<PagerVo<AppStockPageVo>> getStockModelList(@RequestBody PagerQuery<AppStockPageQuery> pagerQuery);
@ApiOperation("App库存车型获取当前车型配置(标签)")
@PostMapping("/getStockModelConfigList")
@ResponseBody
public ResultBean<ModelConfigVo> getStockModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
@ApiOperation("手机端-库存配置列表获取现车列表")
@PostMapping("/getStockModelNowCarList")
@ResponseBody
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
@ApiOperation("手机端-库存配置列表获取排产列表")
@PostMapping("/getStockModelOrderCarList")
@ResponseBody
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
}

77
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeignFallback.java

@ -0,0 +1,77 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
/**
* Project: scm(scm) <br/>
* File: ScmVehicleGressionFeignFallback.java <br/>
* Class: scm.api.scmvehiclegression.ScmVehicleGressionFeignFallback <br/>
* Description: 移位单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-06 09:53:39 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class AppBaseVehicleStockFeignFallback implements AppBaseVehicleStockFeign {
@Override
public ResultBean<PagerVo<AppStockPageVo>> getStockModelList(PagerQuery<AppStockPageQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
return null;
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
return null;
}
}

64
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageQuery.java

@ -0,0 +1,64 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class AppStockPageQuery implements Query {
@ApiModelProperty(value = "名称(优先级最高,有值时 查询车型名称)")
private String name;
@ApiModelProperty("机构sid")
private String orgPath;
@ApiModelProperty(value = "品牌名称")
private String brand;
@ApiModelProperty(value = "排放标准")
private String emissionStandard;
@ApiModelProperty(value = "驱动")
private String driver;
@ApiModelProperty(value = "变速箱")
private String gearbox;
@ApiModelProperty(value = "产品系别")
private String series;
@ApiModelProperty(value = "功能")
private String vehicleFunction;
@ApiModelProperty(value = "细分市场")
private String marketSegments;
@ApiModelProperty(value = "版本")
private String vehicleVersion;
@ApiModelProperty(value = "燃料")
private String fuelType;
@ApiModelProperty(value = "马力")
private String horsepower;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "分公司:后端内部使用")
private String useOrg;
@ApiModelProperty(value = "系列")
private String productLine;
@ApiModelProperty(value = "发动机型号")
private String engineType;
@ApiModelProperty(value = "规格型号")
private String specifications;
@ApiModelProperty(value = "标签")
private String label;
}

61
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageVo.java

@ -0,0 +1,61 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.VehicleGressionVehVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class AppStockPageVo implements Vo {
@ApiModelProperty(value = "车型sid")
private String modelSid;
@ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "车型图片(取一张)")
private String modelImage;
@ApiModelProperty(value = "品牌sid")
private String brandSid;
@ApiModelProperty(value = "品牌名称")
private String brandName;
@ApiModelProperty(value = "版本号")
private String versionValue;
@ApiModelProperty(value = "燃料")
private String fuelTypeValue;
@ApiModelProperty(value = "变速箱")
private String gearboxTypeValue;
@ApiModelProperty(value = "指导价")
private String guidedPrice;
@ApiModelProperty(value = "配置数量")
private String configNum;
@ApiModelProperty(value = "现车数量")
private String nowCarNum;
@ApiModelProperty(value = "排产数量")
private String produceCarNum = "0";
@ApiModelProperty(value = "更多配置")
private List<MoreConfigVo> moreList;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
@ApiModelProperty(value = "销售政策标签")
private String label;
}

13
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelLabel.java

@ -0,0 +1,13 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel("标签")
@Data
public class ModelLabel {
@ApiModelProperty(value = "标签名称")
private String name;
}

78
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockRest.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.supplychain.basevehiclestock;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarQuery;
import com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo;
import com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto;
import com.yxt.anrui.terminal.api.supplychain.stock.AppBaseVehicleStockFeign;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageQuery;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
import com.yxt.anrui.terminal.biz.supplychain.scmvehiclegression.AppScmVehicleGressionService;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@Api(tags = "库存列表")
@Controller
@RequestMapping("/supplychain/v1/stock")
public class AppBaseVehicleStockRest implements AppBaseVehicleStockFeign {
@Autowired
private AppBaseVehicleStockService appBaseVehicleStockService;
@Override
public ResultBean<PagerVo<AppStockPageVo>> getStockModelList(PagerQuery<AppStockPageQuery> pagerQuery) {
return appBaseVehicleStockService.getStockModelList(pagerQuery);
}
@Override
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
return appBaseVehicleStockService.getStockModelConfigList(pagerQuery);
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
return appBaseVehicleStockService.getStockModelNowCarList(pagerQuery);
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
return appBaseVehicleStockService.getStockModelOrderCarList(pagerQuery);
}
}

78
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockService.java

@ -0,0 +1,78 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.supplychain.basevehiclestock;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageQuery;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class AppBaseVehicleStockService {
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BaseModelConfigFeign baseModelConfigFeign;
public ResultBean<PagerVo<AppStockPageVo>> getStockModelList(PagerQuery<AppStockPageQuery> pagerQuery) {
ResultBean<PagerVo<AppStockPageVo>> rb = ResultBean.fireFail();
PagerQuery<VehicleModelPriceQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<VehicleModelPriceVo>> stockModelList = baseVehicleFeign.getStockModelList(pq);
PagerVo<AppStockPageVo> vo = CoverUtils.selectPagerVo(stockModelList.getData());
return rb.success().setData(vo);
}
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
ResultBean<ModelConfigVo> rb = ResultBean.fireFail();
PagerQuery<ModelConfigListQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<ModelConfigVo> modelConfigLableList = baseModelConfigFeign.getStockModelConfigList(pq);
return rb.success().setData(modelConfigLableList.getData());
}
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigNowCarVo> rb = ResultBean.fireFail();
ResultBean<AppBaseConfigNowCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelNowCarList(pagerQuery);
return rb.success().setData(stockModelNowCarList.getData());
}
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigOrderCarVo> rb = ResultBean.fireFail();
ResultBean<AppBaseConfigOrderCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelOrderCarList(pagerQuery);
return rb.success().setData(stockModelNowCarList.getData());
}
}
Loading…
Cancel
Save