yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
dimengzhe 2 years ago
parent
91ca142ac4
commit
56b9094622
3 changed files with 33 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  2. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
  3. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

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

@ -864,26 +864,29 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
AppModelConfigDetailsVo configVo = baseModelConfigService.getAppModelConfigDetailsVo(modelSid, configSid, useOrg);
List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
List<ConfigInfoSpanSize> list2 = new ArrayList<>();
list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor()));
list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine()));
list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror()));
list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize()));
list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification()));
list2.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue()));
list2.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio()));
list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner()));
list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial()));
list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel()));
list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase()));
list2.add(getConfigValueSpanSize("悬架", configVo.getSuspension()));
list2.add(getConfigValueSpanSize("座椅", configVo.getSeat()));
list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover()));
list2.add(getConfigValueSpanSize("鞍座", configVo.getSaddle()));
list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase()));
list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor()));
list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification()));
list2.add(getConfigValueSpanSize("保险杠", configVo.getBumper()));
list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank()));
list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel()));
list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources()));
list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine()));
list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover()));
list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror()));
list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize()));
list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial()));
list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner()));
list2.add(getConfigValueSpanSize("座椅", configVo.getSeat()));
list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia()));
list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
configDetailVo.setConfigInfo(list2);
//更多配置
String otherConfig = configVo.getOtherConfig();

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

@ -470,31 +470,31 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
AppModelConfigDetailsVo configVo = baseModelConfigService.getAppProductionSchedulingDetailsVo(modelSid, configSid);
List<List<ConfigInfoSpanSize>> commonConfigInfoList = new ArrayList<>();
List<ConfigInfoSpanSize> 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.getRearAxleValue(),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.getWheelbase(), 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.getCarColor(), 1));
list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 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.getBaffleModel(), 1));
list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1));
list3.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine(), 1));
list3.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1));
list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1));
list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1));
list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1));
list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1));
list3.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1));
list3.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1));
list3.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1));
configDetailVo.setConfigInfo(list3);
//更多配置
String otherConfig = configVo.getOtherConfig();
configDetailVo.setMoreConfig(otherConfig);
return null;
return configDetailVo;
}
/**

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -1688,10 +1688,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//根据车型sid查询车型的全称
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
//车型
String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue() + baseVehicleModel.getMarketSegmentsValue() + baseVehicleModel.getSpecifications();
String modelName = "车型：" + modelName1 + "。";
String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue();
String modelName = "车型：" + baseVehicleModel.getModelName()+"。";
//配置
String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。";
String modelConfig = "配置：" + modelName1+"/"+appOrderModelInfoVo.getConfig() + "。";
//上装
if (appOrderDetailsVo.getTopInfo() != null) {
AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();

Write Preview
Loading…
Cancel
Save