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

更改

zhanglei
ligaode 5 months ago
parent
1a4d805c26
commit
219ce53917
2 changed files with 119 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
  2. 121
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

85
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
View File

@ -13,15 +13,18 @@
SUM(ssc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid,
SUM(ssc.uploadMoney) uploadMoney,
SUM(ssc.stayDetermineMoney) stayDetermineMoney,
SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) AS money,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) -
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
SUM(IF(ssc.isAdjustment = '是',
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid}
GROUP BY ssc.rebateTypeKey, ssc.brandSid, ssc.purchaseSystemSid
@ -35,15 +38,18 @@
SUM(ssc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid,
SUM(ssc.uploadMoney) uploadMoney,
SUM(ssc.stayDetermineMoney) stayDetermineMoney,
SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) AS money,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) -
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
SUM(IF(ssc.isAdjustment = '是',
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid}
GROUP BY ssc.withholdingDate, ssc.brandSid, ssc.purchaseSystemSid
@ -72,14 +78,17 @@
COUNT(*) numTotal,
SUM(ssc.estimateRebate) withRebateTotal,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCostTotal,
SUM(ssc.uploadMoney) uploadMoneyTotal,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) AS moneyTotal,
SUM(ssc.stayDetermineMoney) stayDetermineMoneyTotal,
SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoneyTotal,
SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS moneyTotal,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoneyTotal,
SUM(ssc.adjustmentMoney) adjustmentMoneyTotal,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) -
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoneyTotal
SUM(IF(ssc.isAdjustment = '是',
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoneyTotal
FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid}
GROUP BY ssc.brandSid, ssc.purchaseSystemSid
@ -93,14 +102,17 @@
COUNT(*) num,
SUM(ssc.estimateRebate) withRebate,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.uploadMoney) uploadMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) AS money,
SUM(ssc.stayDetermineMoney) stayDetermineMoney,
SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) -
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
SUM(IF(ssc.isAdjustment = '是',
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid}
AND ssc.purchaseSystemName = #{purchaseSystemName}
@ -116,14 +128,17 @@
COUNT(*) num,
SUM(ssc.estimateRebate) withRebate,
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
SUM(ssc.uploadMoney) uploadMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) AS money,
SUM(ssc.stayDetermineMoney) stayDetermineMoney,
SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney,
SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost,
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost)) AS money,
SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney,
SUM(ssc.adjustmentMoney) adjustmentMoney,
SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost) -
SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
SUM(IF(ssc.isAdjustment = '是',
ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost -
ssc.expectSuppCost, 0)) AS fyAdjustmentMoney
FROM scm_specialrebate_checkapplydetail ssc
WHERE ssc.mainSid = #{sid}
AND ssc.purchaseSystemName = #{purchaseSystemName}

121
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
View File

@ -25,16 +25,19 @@
svc.brandName,
svc.rebateTypeKey,
svc.rebateTypeValue,
SUM(svc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(svc.vehRebateSid) vehRebateSid,
SUM(svc.uploadMoney) uploadMoney,
SUM(svc.stayDetermineMoney) stayDetermineMoney,
SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney
SUM(svc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(svc.vehRebateSid) vehRebateSid,
SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid}
GROUP BY svc.rebateTypeKey, svc.brandSid, svc.purchaseSystemSid
@ -46,16 +49,19 @@
svc.brandName,
svc.palceGenDate,
svc.withholdingDate,
SUM(svc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(svc.vehRebateSid) vehRebateSid,
SUM(svc.uploadMoney) uploadMoney,
SUM(svc.stayDetermineMoney) stayDetermineMoney,
SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney
SUM(svc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(svc.vehRebateSid) vehRebateSid,
SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(CAST(svc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid}
GROUP BY svc.withholdingDate, svc.brandSid, svc.purchaseSystemSid
@ -72,16 +78,21 @@
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo">
SELECT svc.purchaseSystemName,
svc.brandName,
CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计') title,
COUNT(*) numTotal,
SUM(svc.estimateRebate) withRebateTotal,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCostTotal,
SUM(svc.uploadMoney) uploadMoneyTotal,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) moneyTotal,
SUM(svc.stayDetermineMoney) stayDetermineMoneyTotal,
SUM(svc.adjustmentMoney) adjustmentMoneyTotal,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoneyTotal
CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计') title,
COUNT(*) numTotal,
SUM(svc.estimateRebate) withRebateTotal,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCostTotal,
SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
svc.uploadMoney +
svc.secondaryUploadMoney)) uploadMoneyTotal,
SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) moneyTotal,
SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
stayDetermineMoneyTotal,
SUM(svc.adjustmentMoney) adjustmentMoneyTotal,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoneyTotal
FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid}
GROUP BY svc.brandSid, svc.purchaseSystemSid
@ -89,18 +100,21 @@
<select id="fetchByMainSidType"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo">
SELECT GROUP_CONCAT(svc.vehRebateSid) sid,
CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细') title,
SELECT GROUP_CONCAT(svc.vehRebateSid) sid,
CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细') title,
svc.rebateTypeValue,
COUNT(*) num,
SUM(svc.estimateRebate) withRebate,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.uploadMoney) uploadMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
SUM(svc.stayDetermineMoney) stayDetermineMoney,
SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney
COUNT(*) num,
SUM(svc.estimateRebate) withRebate,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid}
AND svc.purchaseSystemName = #{purchaseSystemName}
@ -110,18 +124,21 @@
<select id="fetchByMainSidDate"
resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo">
SELECT GROUP_CONCAT(svc.vehRebateSid) sid,
CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细') title,
SELECT GROUP_CONCAT(svc.vehRebateSid) sid,
CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细') title,
svc.withholdingDate,
COUNT(*) num,
SUM(svc.estimateRebate) withRebate,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(svc.uploadMoney) uploadMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
SUM(svc.stayDetermineMoney) stayDetermineMoney,
SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
SUM(svc.expectTreatCost + svc.expectSuppCost) fyAdjustmentMoney
COUNT(*) num,
SUM(svc.estimateRebate) withRebate,
SUM(svc.expectTreatCost + svc.expectSuppCost) withholdCost,
SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
svc.uploadMoney + svc.secondaryUploadMoney)) uploadMoney,
SUM(IF(svc.onceCheckState = 1, svc.secondTreatCost + svc.secondSuppCost,
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost)) money,
SUM(IF(svc.onceCheckState = 1, 0, svc.stayDetermineMoney)) stayDetermineMoney,
SUM(svc.adjustmentMoney) adjustmentMoney,
SUM(IF(svc.isAdjustment = '是',
svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost -
svc.expectTreatCost - svc.expectSuppCost, 0)) fyAdjustmentMoney
FROM scm_vehrebate_checkapplydetail svc
WHERE svc.mainSid = #{sid}
AND svc.purchaseSystemName = #{purchaseSystemName}

Write Preview
Loading…
Cancel
Save