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 e2f19b92cd..f5b18e7ec2 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 @@ -28,8 +28,6 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -555,10 +553,11 @@ public class BaseVehicleService extends MybatisBaseService> commonConfigInfoList = new ArrayList<>(); List list2 = new ArrayList<>(); list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor())); - list2.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine())); + 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())); @@ -573,7 +572,6 @@ public class BaseVehicleService extends MybatisBaseService> commonConfigInfoList = new ArrayList<>(); List list3 = new ArrayList<>(); list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1)); - list3.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine(), 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.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)); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index b040ed2877..9dd7f64452 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -74,7 +74,7 @@ , '%') - order by bo.id + order by bo.id desc