From 04d6313487fc5859f148ad14e0766787ecdfa029 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 11 Apr 2022 16:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=96=E8=80=85=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=80=89=E6=8B=A9=E8=BD=A6=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseExistingCarPageQuery.java | 6 ++ .../BaseVehmodelConfigQuery.java | 2 + .../biz/basevehicle/BaseVehicleService.java | 6 ++ .../BaseVehicleModelMapper.xml | 68 ++++++++++++------- .../BaseVehmodelConfigService.java | 4 +- 5 files changed, 60 insertions(+), 26 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java index 0818f7454f..4cabc627ca 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java @@ -10,6 +10,12 @@ public class BaseExistingCarPageQuery implements Query { @ApiModelProperty(value = "车架号") private String vinNo; + @ApiModelProperty(value = "车型sid") + private String modelSid; + + @ApiModelProperty(value = "常用配置sid") + private String modelConfigSid; + @ApiModelProperty(value = "颜色") private String carColor; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java index a9a59470e2..df9dcb5b27 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java @@ -53,4 +53,6 @@ public class BaseVehmodelConfigQuery implements Query { @ApiModelProperty("车型sid") private String modelSid; // 车型sid + @ApiModelProperty(value = "分公司sid") + private String useOrgSid; } 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 320e0b59b6..60d51b38d3 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 @@ -674,6 +674,12 @@ public class BaseVehicleService extends MybatisBaseService SELECT bvm.sid, bvb.brandName, bm.manufacturerName, bvm.modelName FROM base_vehicle_model bvm - LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand - LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid - ${ew.customSqlSegment} + LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand + LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid + ${ew.customSqlSegment} @@ -222,8 +222,8 @@ bmc.configName AS sketChconfiguration, bv.guidedPrice AS vehicleModelOffer FROM base_vehicle_model bvm - LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid + LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid WHERE bvm.sid = #{modelSid} AND bmc.sid = #{configModelSid} @@ -297,7 +297,7 @@