From eb29aa86cd29d45cb38d18b2c678bcaf942c9bf2 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Fri, 22 Apr 2022 17:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemodelconfig/AppModelConfigVo.java | 9 +++ .../AppCurrentCarDetailConfigVo.java | 2 +- .../basevehicle/AppVehicleModelPriceVo.java | 2 +- .../BaseModelConfigService.java | 2 + .../biz/basevehicle/BaseVehicleService.java | 68 +++++++++---------- 5 files changed, 47 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigVo.java index 09a099d6ef..67e3cc60b7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigVo.java @@ -9,16 +9,22 @@ import java.util.List; @Data public class AppModelConfigVo implements Vo { + @ApiModelProperty("车型图片") private List modelImage; + @ApiModelProperty("车型名称") private String modelName; + @ApiModelProperty("指导价") private String price; + @ApiModelProperty("车型list") private List configList; + @ApiModelProperty("品牌名称") private String brandName; + @ApiModelProperty("版本") private String vehicleVersionValue; @@ -63,4 +69,7 @@ public class AppModelConfigVo implements Vo { @ApiModelProperty(value = "内部编码") private String insideCode; + + @ApiModelProperty(value = "页数") + private Integer pages; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java index 1fbb533705..2d8471b5b4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java @@ -14,7 +14,7 @@ import java.util.List; public class AppCurrentCarDetailConfigVo implements Vo { @ApiModelProperty(value = "车型信息") - private List> modelInfo; + private List modeInfo; @ApiModelProperty(value = "常用配置") private List configInfo; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceVo.java index 53962ad70e..23027ba7a4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceVo.java @@ -54,5 +54,5 @@ public class AppVehicleModelPriceVo implements Vo { private String produceCarNum; @ApiModelProperty(value = "更多配置") - private List moreConfigList; + private List moreList; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 23053c9983..def2cd82f6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -512,6 +512,8 @@ public class BaseModelConfigService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = modelConfigQueryWrapper(pagerQuery.getParams()); List appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw); + long pages = page.getPages(); + vo.setPages((int) pages); //分公司配置列表查询 for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) { String useOrg = data.getSid(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index f9fa315bc3..4ce0e628f0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -508,42 +508,42 @@ public class BaseVehicleService extends MybatisBaseService list2 = new ArrayList<>(); - list2.addAll(list1); - list2.add(getConfigValueSpanSize("细分市场", currentCarVo.getMarketSegments(), 1)); - list2.add(getConfigValueSpanSize("系别", currentCarVo.getDepartment(), 1)); - list2.add(getConfigValueSpanSize("发动机型号", currentCarVo.getEngineTypeValue(), 1)); - list2.add(getConfigValueSpanSize("公告型号", currentCarVo.getAnnouncementModel(), 1)); - list2.add(getConfigValueSpanSize("规格型号", currentCarVo.getSpecifications(), 1)); - list2.add(getConfigValueSpanSize("货箱", currentCarVo.getPackingCase(), 1)); - list2.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1)); - modelInfoList.add(list1); - modelInfoList.add(list2); - configDetailVo.setModelInfo(modelInfoList); +// List list2 = new ArrayList<>(); +// list2.addAll(list1); + list1.add(getConfigValueSpanSize("细分市场", currentCarVo.getMarketSegments(), 1)); + list1.add(getConfigValueSpanSize("系别", currentCarVo.getDepartment(), 1)); + list1.add(getConfigValueSpanSize("发动机型号", currentCarVo.getEngineTypeValue(), 1)); + list1.add(getConfigValueSpanSize("公告型号", currentCarVo.getAnnouncementModel(), 1)); + list1.add(getConfigValueSpanSize("规格型号", currentCarVo.getSpecifications(), 1)); + list1.add(getConfigValueSpanSize("货箱", currentCarVo.getPackingCase(), 1)); + list1.add(getConfigValueSpanSize("内部编码", currentCarVo.getInsideCode(), 1)); +// modelInfoList.add(list1); +// modelInfoList.add(list2); + configDetailVo.setModeInfo(list1); //配置详细数据 AppModelConfigDetailsVo configVo = baseModelConfigService.getAppModelConfigDetailsVo(modelSid, configSid, useOrg); List> commonConfigInfoList = new ArrayList<>(); - List list3 = new ArrayList<>(); - list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1)); - list3.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine(), 1)); - list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1)); - list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1)); - list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1)); - list3.add(getConfigValueSpanSize("后桥速比", configVo.getRearAxleRatio(), 1)); - list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1)); - list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1)); - list3.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1)); - list3.add(getConfigValueSpanSize("悬架", configVo.getSuspension(), 1)); - list3.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1)); - list3.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1)); - list3.add(getConfigValueSpanSize("鞍座", configVo.getSaddle(), 1)); - list3.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1)); - list3.add(getConfigValueSpanSize("保险杠", configVo.getBumper(), 1)); - list3.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1)); - list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1)); - list3.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1)); - list3.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1)); - configDetailVo.setConfigInfo(list3); + List list2 = new ArrayList<>(); + list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1)); + list2.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine(), 1)); + list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1)); + list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1)); + list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1)); + list2.add(getConfigValueSpanSize("后桥速比", configVo.getRearAxleRatio(), 1)); + list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1)); + list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1)); + list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1)); + list2.add(getConfigValueSpanSize("悬架", configVo.getSuspension(), 1)); + list2.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1)); + list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1)); + list2.add(getConfigValueSpanSize("鞍座", configVo.getSaddle(), 1)); + list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1)); + list2.add(getConfigValueSpanSize("保险杠", configVo.getBumper(), 1)); + list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1)); + list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1)); + list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1)); + list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1)); + configDetailVo.setConfigInfo(list2); //更多配置 String otherConfig = configVo.getOtherConfig(); configDetailVo.setMoreConfig(otherConfig); @@ -758,7 +758,7 @@ public class BaseVehicleService extends MybatisBaseService