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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 4 months ago
parent
186c563fa4 bac170d59e
commit
ffd321f864
3 changed files with 135 additions and 134 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. 266
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java

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

@ -127,21 +127,21 @@
bvcf.certificateStateValue, bvcf.certificateStateValue,
bvcf.carModel, bvcf.carModel,
bvm.modelName AS modelNameQuan, bvm.modelName AS modelNameQuan,
bvm.`brandName` AS vehModelBrandName, bvm.brandName AS vehModelBrandName,
bvc.guidedPrice, bvc.guidedPrice,
bv.manDate bv.manDate
FROM FROM
base_vehicle bv base_vehicle bv
LEFT JOIN base_vehicle_model bvm LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid` ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc LEFT JOIN base_model_config bmc
ON bv.`modelConfigSid` = bmc.`sid` ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_certificate bvcf LEFT JOIN base_vehicle_certificate bvcf
ON bv.`sid` = bvcf.`vehicleSid` ON bv.sid = bvcf.vehicleSid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
ON bvc.modelSid = bv.modelSid ON bvc.modelSid = bv.modelSid
AND bvc.useOrgSid = bv.useOrgSid AND bvc.useOrgSid = bv.useOrgSid
AND bvc.configurationItemsSid=bv.`modelConfigSid` AND bvc.configurationItemsSid=bv.modelConfigSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -487,28 +487,28 @@
<!--配置Sid--> <!--配置Sid-->
bv.modelConfigSid AS configSid bv.modelConfigSid AS configSid
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo"> <select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
SELECT bvm.`brandName`, SELECT bvm.brandName,
bvm.`vehicleTypeValue`, bvm.vehicleTypeValue,
bvm.`productLineValue`, bvm.productLineValue,
bvm.`driveFormValue`, bvm.driveFormValue,
bvm.`powerValue`, bvm.powerValue,
bvm.`vehicleVersionValue`, bvm.vehicleVersionValue,
bvm.`fuelTypeValue`, bvm.fuelTypeValue,
bvm.tranCaseTypeValue, bvm.tranCaseTypeValue,
bvm.`gearboxTypeValue`, bvm.gearboxTypeValue,
bvm.`marketSegmentsValue`, bvm.marketSegmentsValue,
bvm.`engineTypeValue`, bvm.engineTypeValue,
bvm.`announcementModel`, bvm.announcementModel,
bvm.`specifications`, bvm.specifications,
bmc.packingCase, bmc.packingCase,
bvm.`department`, bvm.department,
bvm.`insideCode`, bvm.insideCode,
bmc.carColor, bmc.carColor,
bmc.specification, bmc.specification,
bmc.baffleModel, bmc.baffleModel,
@ -548,34 +548,34 @@
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,
bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.marketSegmentsValue, bvm.engineTypeValue, bvm.specifications,
bvm.`department`) as vehModelInfor bvm.department) as vehModelInfor
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
WHERE bvc.modelSid = #{modelSid} WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} LIMIT 1 AND bvc.configurationItemsSid = #{configSid} LIMIT 1
</select> </select>
<select id="selectExiCarConfigByVehModelConfigSid" <select id="selectExiCarConfigByVehModelConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo"> resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
SELECT bvm.`brandName`, SELECT bvm.brandName,
bvm.`vehicleTypeValue`, bvm.vehicleTypeValue,
bvm.`productLineValue`, bvm.productLineValue,
bvm.`driveFormValue`, bvm.driveFormValue,
bvm.`powerValue`, bvm.powerValue,
bvm.`vehicleVersionValue`, bvm.vehicleVersionValue,
bvm.`fuelTypeValue`, bvm.fuelTypeValue,
bvm.tranCaseTypeValue, bvm.tranCaseTypeValue,
bvm.`gearboxTypeValue`, bvm.gearboxTypeValue,
bvm.`marketSegmentsValue`, bvm.marketSegmentsValue,
bvm.`engineTypeValue`, bvm.engineTypeValue,
bvm.`announcementModel`, bvm.announcementModel,
bvm.`specifications`, bvm.specifications,
bmc.packingCase, bmc.packingCase,
bvm.`department`, bvm.department,
bvm.`insideCode`, bvm.insideCode,
bmc.carColor, bmc.carColor,
bmc.specification, bmc.specification,
bmc.baffleModel, bmc.baffleModel,
@ -615,12 +615,12 @@
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,
bvm.`marketSegmentsValue`, bvm.`engineTypeValue`, bvm.`specifications`, bvm.marketSegmentsValue, bvm.engineTypeValue, bvm.specifications,
bvm.`department`) as vehModelInfor bvm.department) as vehModelInfor
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
WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1 WHERE bvc.sid = #{vehModelConfigSid} LIMIT 1
</select> </select>
@ -644,8 +644,8 @@
<!--销售指导价--> <!--销售指导价-->
<!--bv.guidedPrice--> <!--bv.guidedPrice-->
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
WHERE bv.sid = #{sid} WHERE bv.sid = #{sid}
</select> </select>
@ -686,8 +686,8 @@
<!--配置Sid--> <!--配置Sid-->
bv.modelConfigSid AS configSid bv.modelConfigSid AS configSid
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
${ew.customSqlSegment} ${ew.customSqlSegment}
ORDER BY ORDER BY
bv.priceDate desc bv.priceDate desc
@ -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,
@ -852,8 +852,8 @@
bmc.configName, bmc.configName,
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
@ -945,8 +945,8 @@
bvm.gearboxTypeValue, bvm.gearboxTypeValue,
bvm.emissionStandardValue bvm.emissionStandardValue
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -1008,7 +1008,7 @@
<select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo"> <select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
SELECT bv.sid, SELECT bv.sid,
vinNo AS vin, vinNo AS vin,
vehicleStateValue AS `state`, vehicleStateValue AS state,
carColor AS color, carColor AS color,
locationName AS address locationName AS address
FROM base_vehicle bv FROM base_vehicle bv
@ -1054,13 +1054,13 @@
LEFT JOIN base_vehmodelconfig_label bvcl LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
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
where bc.modelSid = #{modelSid} where bc.modelSid = #{modelSid}
AND bc.configurationItemsSid = #{configSid} AND bc.configurationItemsSid = #{configSid}
AND bc.useOrgSid = #{useOrg} AND bc.useOrgSid = #{useOrg}
@ -1072,8 +1072,8 @@
convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price, convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig bmc.configName AS commonlyConfig
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
where bvc.modelSid = #{modelSid} where bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg} AND bvc.useOrgSid = #{useOrg}
@ -1081,11 +1081,11 @@
<select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo"> <select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
SELECT bvo.orderNo AS orderId, SELECT bvo.orderNo AS orderId,
bvo.orderStatus AS state, bvo.orderStatus AS state,
bvo.orderDate AS `date`, bvo.orderDate AS date,
bvo.expectLaunchDate AS forecastDate, bvo.expectLaunchDate AS forecastDate,
bvo.launchDate AS `upDate`, bvo.launchDate AS upDate,
bvo.offlineDate AS downDate, bvo.offlineDate AS downDate,
bvad.quantity as `number` bvad.quantity as number
FROM bus_vehicle_order bvo FROM bus_vehicle_order bvo
left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
<where> <where>
@ -1178,9 +1178,9 @@
SELECT SELECT
bv.sid as vehSid, bv.sid as vehSid,
bv.vinNo, bv.vinNo,
bvm.`carBrand` AS brandSid, bvm.carBrand AS brandSid,
bvm.`brandName`, bvm.brandName,
bvm.`vehicleAlias`, bvm.vehicleAlias,
bvm.announcementModel AS noticeModel, bvm.announcementModel AS noticeModel,
bvm.sid as vehModelSid, bvm.sid as vehModelSid,
bv.priceDate, bv.priceDate,
@ -1189,7 +1189,7 @@
bv.vehicleStateValue bv.vehicleStateValue
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid` ON bv.modelSid = bvm.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -1275,10 +1275,10 @@
DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate, DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
bv.costPrice as priced bv.costPrice as priced
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
ON bvc.`modelSid` = bvm.`sid` AND bvc.`configurationItemsSid` = bmc.`sid` AND bvc.useOrgSid = bv.createOrgSid ON bvc.modelSid = bvm.sid AND bvc.configurationItemsSid = bmc.sid AND bvc.useOrgSid = bv.createOrgSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -1313,23 +1313,23 @@
<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`, bvm.carBrand,
bvm.brandName, bvm.brandName,
bv.purchaseSystemSid, bv.purchaseSystemSid,
bv.purchaseSystemName, bv.purchaseSystemName,
bvm.vehicleAlias, bvm.vehicleAlias,
bvm.sid AS modelSid, bvm.sid AS 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 LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid` ON bv.modelSid = bvm.sid
AND bv.createOrgSid = bvm.createOrg 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>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -1342,21 +1342,21 @@
bmc.carColor color, bmc.carColor color,
bv.locationName location, bv.locationName location,
bv.sid as vehSid, bv.sid as vehSid,
bv.`modelSid`, bv.modelSid,
bv.`modelName`, bv.modelName,
bv.`vinNo`, bv.vinNo,
bv.`costPrice`, bv.costPrice,
bv.`priceDate`, bv.priceDate,
bv.`salesDate`, bv.salesDate,
bv.`solidDate` bv.solidDate
FROM FROM
base_vehicle bv base_vehicle bv
LEFT JOIN base_vehicle_model bvm LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid` ON bv.modelSid = bvm.sid
AND bv.`createOrgSid` = bvm.`createOrg` AND bv.createOrgSid = bvm.createOrg
LEFT JOIN base_vehicle_brand bvb LEFT JOIN base_vehicle_brand bvb
ON bvm.`carBrand` = bvb.`sid` ON bvm.carBrand = bvb.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -1368,21 +1368,21 @@
bv.locationName location, bv.locationName location,
ssv.vehSid, ssv.vehSid,
ssv.sid as specialRebateVehSid, ssv.sid as specialRebateVehSid,
bv.`modelSid`, bv.modelSid,
bv.`modelName`, bv.modelName,
ssv.`vinNo`, ssv.vinNo,
bv.`costPrice`, bv.costPrice,
bv.`priceDate`, bv.priceDate,
bv.`salesDate`, bv.salesDate,
bv.`solidDate` bv.solidDate
FROM anrui_scm.`scm_specialrebate_vehs` ssv FROM anrui_scm.scm_specialrebate_vehs ssv
LEFT JOIN anrui_base.`base_vehicle` bv LEFT JOIN anrui_base.base_vehicle bv
ON ssv.`vehSid` = bv.`sid` ON ssv.vehSid = bv.sid
LEFT JOIN base_vehicle_model bvm LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid` ON bv.modelSid = bvm.sid
AND bv.`createOrgSid` = bvm.`createOrg` AND bv.createOrgSid = bvm.createOrg
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
WHERE ssv.`specialRebateSid` = #{specialRebateSid} WHERE ssv.specialRebateSid = #{specialRebateSid}
</select> </select>
<select id="getInspectionVinList" resultType="com.yxt.anrui.base.api.basevehicle.InspectionVinVo"> <select id="getInspectionVinList" resultType="com.yxt.anrui.base.api.basevehicle.InspectionVinVo">
@ -1468,9 +1468,9 @@
FROM FROM
base_vehicle bv base_vehicle bv
LEFT JOIN base_vehicle_model bvm LEFT JOIN base_vehicle_model bvm
ON bv.`modelSid` = bvm.`sid` ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc LEFT JOIN base_model_config bmc
ON bv.modelConfigSid = bmc.`sid` ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehinstall bvs LEFT JOIN base_vehinstall bvs
ON bvs.vinNo = bv.vinNo ON bvs.vinNo = bv.vinNo
LEFT JOIN base_vehinstallmodel bvsm LEFT JOIN base_vehinstallmodel bvsm
@ -1500,7 +1500,7 @@
<!--存放地点--> <!--存放地点-->
bv.locationName as location bv.locationName as location
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
@ -1523,12 +1523,12 @@
<!--存放地点--> <!--存放地点-->
bv.locationName bv.locationName
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
ON bvc.`modelSid` = bvm.`sid` AND bvc.`configurationItemsSid` = bmc.`sid` AND bvc.useOrgSid = bv.createOrgSid ON bvc.modelSid = bvm.sid AND bvc.configurationItemsSid = bmc.sid AND bvc.useOrgSid = bv.createOrgSid
LEFT JOIN base_vehicle_brand bvb LEFT JOIN base_vehicle_brand bvb
ON bvm.`carBrand` = bvb.`sid` ON bvm.carBrand = bvb.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -1544,10 +1544,10 @@
bv.salesDate, bv.salesDate,
bv.solidDate bv.solidDate
FROM base_vehicle bv FROM base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
ON bvc.`modelSid` = bvm.`sid` AND bvc.`configurationItemsSid` = bmc.`sid` AND bvc.useOrgSid = bv.createOrgSid ON bvc.modelSid = bvm.sid AND bvc.configurationItemsSid = bmc.sid AND bvc.useOrgSid = bv.createOrgSid
<where> <where>
(bv.solidDate IS NULL AND bv.salesDate IS NOT NULL OR bv.salesDate IS NOT NULL) AND (bv.solidDate IS NULL AND bv.salesDate IS NOT NULL OR bv.salesDate IS NOT NULL) AND
${ew.sqlSegment} ${ew.sqlSegment}
@ -1567,8 +1567,8 @@
LEFT JOIN base_vehmodelconfig_label bvcl LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid` ON bvc.sid = bvcl.vehmodelConfigSid
WHERE bvc.modelSid = bvm.sid AND bvc.`useOrgSid` = #{useOrgSid}) AS labelName, WHERE bvc.modelSid = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS labelName,
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)), (SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)),
CONCAT(convert(MIN(bvc.guidedPrice)/10000,decimal(10,2)), '-', CONCAT(convert(MIN(bvc.guidedPrice)/10000,decimal(10,2)), '-',
convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)))) convert(MAX(bvc.guidedPrice)/10000,decimal(10,2))))
@ -1607,8 +1607,8 @@
LEFT JOIN base_vehmodelconfig_label bvcl LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
ON bvc.`sid` = bvcl.`vehmodelConfigSid` ON bvc.sid = bvcl.vehmodelConfigSid
WHERE bvc.modelSid = bvm.sid AND bvc.`useOrgSid` = #{useOrgSid}) like concat('%',#{lable},'%')) WHERE bvc.modelSid = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) like concat('%',#{lable},'%'))
</if> </if>
and length(bvc.guidedPrice)>0 and length(bvc.guidedPrice)>0
</where> </where>
@ -1618,7 +1618,7 @@
<select id="getStockModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo"> <select id="getStockModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
SELECT bv.sid, SELECT bv.sid,
bv.vinNo AS vin, bv.vinNo AS vin,
bv.vehicleStateValue AS `state`, bv.vehicleStateValue AS state,
bmc.carColor AS color, bmc.carColor AS color,
bv.locationName AS address, bv.locationName AS address,
bd.salesPolicy AS label, bd.salesPolicy AS label,
@ -1641,13 +1641,13 @@
LEFT JOIN base_vehmodelconfig_label bvcl LEFT JOIN base_vehmodelconfig_label bvcl
ON bvcl.labelSid = bvl.sid ON bvcl.labelSid = bvl.sid
LEFT JOIN base_vehmodel_config bvc LEFT JOIN base_vehmodel_config bvc
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
where bvc.modelSid = #{modelSid} where bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid} AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg} AND bvc.useOrgSid = #{useOrg}
@ -1778,16 +1778,16 @@
bvcf.certificateStateValue, bvcf.certificateStateValue,
bvcf.carModel, bvcf.carModel,
bvm.modelName AS modelNameQuan, bvm.modelName AS modelNameQuan,
bvm.`brandName` AS vehModelBrandName, bvm.brandName AS vehModelBrandName,
(SELECT bbc.guidedPrice FROM base_vehmodel_config bbc WHERE bbc.modelSid = bv.modelSid (SELECT bbc.guidedPrice FROM base_vehmodel_config bbc WHERE bbc.modelSid = bv.modelSid
AND bbc.useOrgSid =bv.useOrgSid AND bbc.useOrgSid =bv.useOrgSid
AND bmc.sid=bbc.configurationItemsSid ) AS guidedPrice AND bmc.sid=bbc.configurationItemsSid ) AS guidedPrice
FROM FROM
base_vehicle bv base_vehicle bv
LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bv.`modelConfigSid` = bmc.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
LEFT JOIN base_vehicle_certificate bvcf ON bv.`sid` = bvcf.`vehicleSid` LEFT JOIN base_vehicle_certificate bvcf ON bv.sid = bvcf.vehicleSid
LEFT JOIN base_vehmodel_config bvc ON bvm.`sid` = bvc.`modelSid` LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
LEFT JOIN anrui_portal.sys_organization so ON bv.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization so ON bv.createOrgSid = so.sid
LEFT JOIN anrui_scm.scm_warehouse sw ON bv.location = sw.sid LEFT JOIN anrui_scm.scm_warehouse sw ON bv.location = sw.sid
<where> <where>
@ -1798,19 +1798,19 @@
<select id="vehicleQKKPPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo"> <select id="vehicleQKKPPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo">
SELECT SELECT
bsov.linkNo AS vinNo, bsov.linkNo AS vinNo,
bsov.`linkSid` AS vehSid, bsov.linkSid AS vehSid,
bso.`customerName`, bso.customerName,
bso.`contractNo`, bso.contractNo,
bvc.certificateState, bvc.certificateState,
bvc.`certificateStateValue` bvc.certificateStateValue
FROM FROM
anrui_buscenter.bus_sales_order_vehicle bsov anrui_buscenter.bus_sales_order_vehicle bsov
JOIN anrui_buscenter.bus_sales_order bso JOIN anrui_buscenter.bus_sales_order bso
ON bsov.`salesOrderSid` = bso.`sid` ON bsov.salesOrderSid = bso.sid
JOIN base_vehicle_state bs JOIN base_vehicle_state bs
ON bsov.sid = bs.busSid ON bsov.sid = bs.busSid
JOIN base_vehicle_certificate bvc JOIN base_vehicle_certificate bvc
ON bsov.`linkSid` = bvc.`vehicleSid` ON bsov.linkSid = bvc.vehicleSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
AND bs.finSourceKey = '2' AND bs.finSourceKey = '2'

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -3313,7 +3313,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
BaseSpecialRebateDisGetVehQuery params = pq.getParams(); BaseSpecialRebateDisGetVehQuery params = pq.getParams();
//车型 //车型
if (StringUtils.isNotBlank(params.getVehicleAlias())) { if (StringUtils.isNotBlank(params.getVehicleAlias())) {
qw.like("bvm.vehicleAlias", params.getVehicleAlias()); qw.like("bv.modelName", params.getVehicleAlias());
} }
//车架号 //车架号
if (StringUtils.isNotBlank(params.getVinNo())) { if (StringUtils.isNotBlank(params.getVinNo())) {

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
View File

@ -179,6 +179,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (sp.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (sp.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
); );
qw.groupBy("sp.sid"); qw.groupBy("sp.sid");
qw.orderByDesc("sp.createTime");
IPage<ScmSpecialrebatedistribute> page = PagerUtil.queryToPage(pq); IPage<ScmSpecialrebatedistribute> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialrebatedistributeVo> pagging = baseMapper.selectPageVo(page, qw); IPage<ScmSpecialrebatedistributeVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmSpecialrebatedistributeVo record : pagging.getRecords()) { for (ScmSpecialrebatedistributeVo record : pagging.getRecords()) {

Write Preview
Loading…
Cancel
Save