diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index de7457aefa..e191b4e600 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -322,18 +322,18 @@ public class BusVehicleOrderService 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 list1 = new ArrayList<>(); +// list1.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.getAppProductionSchedulingDetailsVo(modelSid, configSid); List> commonConfigInfoList = new ArrayList<>();