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

更改

zhanglei
ligaode 4 months ago
parent
d63b2535e2
commit
c6998c1a54
1 changed files with 26 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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

56
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
View File

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

Write Preview
Loading…
Cancel
Save