From c6998c1a54bac631828c754b7f7b7119be0fc083 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Fri, 7 Feb 2025 10:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/basevehicle/BaseVehicleMapper.xml     | 56 +++++++++----------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 3e2d0bb04e..4eb16395ed 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -543,9 +543,9 @@
                bvm.vehicleAlias,
                bvm.departmentValue,
                bvm.emissionStandardValue,
-               bmc.sid                     as configSid,
-               bvm.sid                     as modelSid,
-               bvm.carBrand                as brandSid,
+               bmc.sid                   as configSid,
+               bvm.sid                   as modelSid,
+               bvm.carBrand              as brandSid,
                bvm.vehicleTypeCode,
                bmc.configCode,
                concat_ws('、', bvm.vehicleVersionValue, bvm.fuelTypeValue, bvm.gearboxTypeValue,
@@ -610,9 +610,9 @@
                bvm.vehicleAlias,
                bvm.departmentValue,
                bvm.emissionStandardValue,
-               bmc.sid                     as configSid,
-               bvm.sid                     as modelSid,
-               bvm.carBrand                as brandSid,
+               bmc.sid                   as configSid,
+               bvm.sid                   as modelSid,
+               bvm.carBrand              as brandSid,
                bvm.vehicleTypeCode,
                bmc.configCode,
                concat_ws('、', bvm.vehicleVersionValue, bvm.fuelTypeValue, bvm.gearboxTypeValue,
@@ -761,7 +761,7 @@
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailConfigVo">
         SELECT convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
                bvc.guidedPrice                                   as prices,
-               bvc.priceValidity                                 AS date,
+               bvc.priceValidity AS date,
                bvm.vehicleAlias                                  AS model,
                bvm.brandName                                     AS brand,
                bvm.carBrand                                      AS brandSid,
@@ -781,8 +781,9 @@
                bvm.vehicleTypeCode,
                bmc.configCode
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+            LEFT JOIN base_vehicle_model bvm
+        ON bvc.modelSid = bvm.sid
+            LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -1057,7 +1058,7 @@
                                    ON bvc.sid = bvcl.vehmodelConfigSid
                 WHERE bvc.modelSid = bvm.sid
                   AND bvc.configurationItemsSid = bmc.sid
-                  AND bvc.useOrgSid = #{useOrg})              AS labelName
+                  AND bvc.useOrgSid = #{useOrg})                AS labelName
         FROM base_vehmodel_config bc
                  LEFT JOIN base_vehicle_model bvm ON bc.modelSid = bvm.sid
                  LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.sid
@@ -1105,11 +1106,12 @@
           and bv.useOrgSid = #{orgSid}
           and bv.lockedState = #{state}
           AND (
-                bv.vehicleStateValue = '库存'
+                    bv.vehicleStateValue = '库存'
                 or bv.vehicleStateValue = '在途'
                 or bv.vehicleStateValue = '调入'
             )
-          and bv.isDelete = 0 and length(bv.vinNo)>8
+          and bv.isDelete = 0
+          and length(bv.vinNo) > 8
         order by isFictitious, bv.locationName, bv.vinNo desc
     </select>
 
@@ -1304,7 +1306,7 @@
     <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         SELECT *
         FROM base_vehicle
-        WHERE vinNo like concat('%',#{vinNo},'%')
+        WHERE vinNo like concat('%', #{vinNo}, '%')
           AND useOrgSid = #{useOrgSid}
           AND isDelete = 0
           AND vehicleState != "0004"
@@ -1313,21 +1315,18 @@
     <select id="vehicleRebatePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleRebateVo">
         SELECT
         bv.sid,
-        bvm.carBrand,
-        bvm.brandName,
+        bv.carBrandSid AS carBrand,
+        bv.carBrandName AS brandName,
         bv.purchaseSystemSid,
         bv.purchaseSystemName,
-        bvm.vehicleAlias,
-        bvm.sid AS modelSid,
+        bv.modelName AS vehicleAlias,
+        bv.modelSid,
         bv.vinNo,
         bv.freight,
         bv.costPrice,
         IFNULL(bs.costPrice, 0) AS topAmount
         FROM
         base_vehicle bv
-        LEFT JOIN base_vehicle_model bvm
-        ON bv.modelSid = bvm.sid
-        AND bv.createOrgSid = bvm.createOrg
         LEFT JOIN base_vehinstall bs
         ON RIGHT(bv.vinNo, 8) = RIGHT(bs.vinNo, 8)
         <where>
@@ -1644,7 +1643,7 @@
                                    ON bvc.sid = bvcl.vehmodelConfigSid
                 WHERE bvc.modelSid = bvm.sid
                   AND bvc.configurationItemsSid = bmc.sid
-                  AND bvc.useOrgSid = #{useOrg})               AS labelName
+                  AND bvc.useOrgSid = #{useOrg})                 AS labelName
         from base_vehmodel_config bvc
                  LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
@@ -1823,19 +1822,16 @@
     </select>
 
     <select id="selectVinNo" resultType="int">
-        SELECT
-                COUNT(*)
-        FROM
-                base_vehicle
+        SELECT COUNT(*)
+        FROM base_vehicle
         WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
           AND isDelete = 0
           AND vehicleState != "0004"
     </select>
     <select id="selOneByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
-        SELECT
-            *
-        FROM
-            base_vehicle bv
-        WHERE bv.isDelete = '0' AND bv.vinNo LIKE CONCAT( '%', #{substringVinNo}, '%' )
+        SELECT *
+        FROM base_vehicle bv
+        WHERE bv.isDelete = '0'
+          AND bv.vinNo LIKE CONCAT('%', #{substringVinNo}, '%')
     </select>
 </mapper>