修改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@@ -6,16 +6,16 @@
 	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
 		SELECT
 		ssc.*,
-		SUM(sscd.`estimateRebate`) estimateRebate,
+		SUM(sscd.estimateRebate) estimateRebate,
 		SUM(sscd.expectItureCost + sscd.expectTreatCost + sscd.expectSuppCost) as withholdCost,
-		SUM(sscd.`uploadMoney`) uploadMoney,
-		SUM(sscd.`stayDetermineMoney`) stayDetermineMoney,
-		SUM(sscd.`adjustmentMoney`) adjustmentMoney,
+		SUM(sscd.uploadMoney) uploadMoney,
+		SUM(sscd.stayDetermineMoney) stayDetermineMoney,
+		SUM(sscd.adjustmentMoney) adjustmentMoney,
 		SUM(sscd.onceItureCost + sscd.onceTreatCost + sscd.onceSuppCost + sscd.secondItureCost + sscd.secondTreatCost + sscd.secondSuppCost) AS money
 		FROM
 		scm_specialrebate_checkapply ssc
 		LEFT JOIN scm_specialrebate_checkapplydetail sscd
-		ON ssc.`sid` = sscd.`mainSid`
+		ON ssc.sid = sscd.mainSid
 		<where>
 			${ew.sqlSegment}
 		</where>

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

@@ -10,21 +10,21 @@
                ssc.brandName,
                ssc.rebateTypeKey,
                ssc.rebateTypeValue,
-               SUM(ssc.estimateRebate)                                                withRebate,
-               COUNT(*)                                                               num,
-               GROUP_CONCAT(ssc.specialRebateSid)                                     specialRebateSid,
-               SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
-                      ssc.uploadMoney + ssc.secondaryUploadMoney))                    uploadMoney,
-               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))             stayDetermineMoney,
-               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                       adjustmentMoney,
-               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
+               SUM(ssc.estimateRebate)                                                     withRebate,
+               COUNT(*)                                                                    num,
+               GROUP_CONCAT(ssc.specialRebateSid)                                          specialRebateSid,
+               SUM(CAST(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
+                           ssc.uploadMoney + ssc.secondaryUploadMoney) AS DECIMAL(10, 2))) uploadMoney,
+               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))                  stayDetermineMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                            adjustmentMoney,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS      withholdCost,
                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,
+                      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
+                      ssc.expectSuppCost, 0))                                      AS      fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
         GROUP BY ssc.rebateTypeKey, ssc.brandSid, ssc.purchaseSystemSid
@@ -35,21 +35,21 @@
         SELECT ssc.purchaseSystemName,
                ssc.brandName,
                ssc.withholdingDate,
-               SUM(ssc.estimateRebate)                                                withRebate,
-               COUNT(*)                                                               num,
-               GROUP_CONCAT(ssc.specialRebateSid)                                     specialRebateSid,
-               SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
-                      ssc.uploadMoney + ssc.secondaryUploadMoney))                    uploadMoney,
-               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))             stayDetermineMoney,
-               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                       adjustmentMoney,
-               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
+               SUM(ssc.estimateRebate)                                                     withRebate,
+               COUNT(*)                                                                    num,
+               GROUP_CONCAT(ssc.specialRebateSid)                                          specialRebateSid,
+               SUM(CAST(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
+                           ssc.uploadMoney + ssc.secondaryUploadMoney) AS DECIMAL(10, 2))) uploadMoney,
+               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))                  stayDetermineMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                            adjustmentMoney,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS      withholdCost,
                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,
+                      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
+                      ssc.expectSuppCost, 0))                                      AS      fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
         GROUP BY ssc.withholdingDate, ssc.brandSid, ssc.purchaseSystemSid
@@ -74,21 +74,21 @@
             resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailsVo">
         SELECT ssc.purchaseSystemName,
                ssc.brandName,
-               CONCAT(ssc.purchaseSystemName, ssc.brandName, '本月上传返利核对及调整金额合计')       title,
-               COUNT(*)                                                               numTotal,
-               SUM(ssc.estimateRebate)                                                withRebateTotal,
-               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCostTotal,
-               SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
-                      ssc.uploadMoney + ssc.secondaryUploadMoney))                    uploadMoneyTotal,
+               CONCAT(ssc.purchaseSystemName, ssc.brandName, '本月上传返利核对及调整金额合计')            title,
+               COUNT(*)                                                                    numTotal,
+               SUM(ssc.estimateRebate)                                                     withRebateTotal,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS      withholdCostTotal,
+               SUM(CAST(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
+                           ssc.uploadMoney + ssc.secondaryUploadMoney) AS DECIMAL(10, 2))) 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(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                       adjustmentMoneyTotal,
+                      ssc.secondTreatCost + ssc.secondSuppCost))                   AS      moneyTotal,
+               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))                  stayDetermineMoneyTotal,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                            adjustmentMoneyTotal,
                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
+                      ssc.expectSuppCost, 0))                                      AS      fyAdjustmentMoneyTotal
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
         GROUP BY ssc.brandSid, ssc.purchaseSystemSid
@@ -96,23 +96,23 @@
 
     <select id="fetchByMainSidType"
             resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailssVo">
-        SELECT GROUP_CONCAT(ssc.specialRebateSid)                                       sid,
-               CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.rebateTypeValue, '明细') title,
+        SELECT GROUP_CONCAT(ssc.specialRebateSid)                                          sid,
+               CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.rebateTypeValue, '明细')    title,
                ssc.rebateTypeValue,
-               COUNT(*)                                                                 num,
-               SUM(ssc.estimateRebate)                                                  withRebate,
-               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS   withholdCost,
-               SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
-                      ssc.uploadMoney + ssc.secondaryUploadMoney))                      uploadMoney,
+               COUNT(*)                                                                    num,
+               SUM(ssc.estimateRebate)                                                     withRebate,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS      withholdCost,
+               SUM(CAST(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
+                           ssc.uploadMoney + ssc.secondaryUploadMoney) AS DECIMAL(10, 2))) 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(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                         adjustmentMoney,
+                      ssc.secondTreatCost + ssc.secondSuppCost))                   AS      money,
+               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))                  stayDetermineMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                            adjustmentMoney,
                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
+                      ssc.expectSuppCost, 0))                                      AS      fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
           AND ssc.purchaseSystemName = #{purchaseSystemName}
@@ -122,23 +122,23 @@
 
     <select id="fetchByMainSidDate"
             resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailssVo">
-        SELECT GROUP_CONCAT(ssc.specialRebateSid)                                         sid,
-               CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.withholdingDate, '预提明细') title,
+        SELECT GROUP_CONCAT(ssc.specialRebateSid)                                          sid,
+               CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.withholdingDate, '预提明细')  title,
                ssc.withholdingDate,
-               COUNT(*)                                                                   num,
-               SUM(ssc.estimateRebate)                                                    withRebate,
-               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS     withholdCost,
-               SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
-                      ssc.uploadMoney + ssc.secondaryUploadMoney))                        uploadMoney,
+               COUNT(*)                                                                    num,
+               SUM(ssc.estimateRebate)                                                     withRebate,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS      withholdCost,
+               SUM(CAST(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney,
+                           ssc.uploadMoney + ssc.secondaryUploadMoney) AS DECIMAL(10, 2))) 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(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                           adjustmentMoney,
+                      ssc.secondTreatCost + ssc.secondSuppCost))                   AS      money,
+               SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney))                  stayDetermineMoney,
+               SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2)))                            adjustmentMoney,
                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
+                      ssc.expectSuppCost, 0))                                      AS      fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
           AND ssc.purchaseSystemName = #{purchaseSystemName}

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

@@ -28,8 +28,8 @@
                SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                COUNT(*)                                                                                 num,
                GROUP_CONCAT(svc.vehRebateSid)                                                           vehRebateSid,
-               SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
-                      svc.uploadMoney + svc.secondaryUploadMoney))                                      uploadMoney,
+               SUM(CAST(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
+                           svc.uploadMoney + svc.secondaryUploadMoney) AS DECIMAL(10, 2)))              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,
@@ -52,8 +52,8 @@
                SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                COUNT(*)                                                                                 num,
                GROUP_CONCAT(svc.vehRebateSid)                                                           vehRebateSid,
-               SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
-                      svc.uploadMoney + svc.secondaryUploadMoney))                                      uploadMoney,
+               SUM(CAST(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
+                           svc.uploadMoney + svc.secondaryUploadMoney) AS DECIMAL(10, 2)))              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,
@@ -82,9 +82,9 @@
                COUNT(*)                                                                                 numTotal,
                SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebateTotal,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                            withholdCostTotal,
-               SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
-                      svc.uploadMoney +
-                      svc.secondaryUploadMoney))                                                        uploadMoneyTotal,
+               SUM(CAST(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
+                           svc.uploadMoney +
+                           svc.secondaryUploadMoney) AS DECIMAL(10, 2)))                                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))                               stayDetermineMoneyTotal,
@@ -105,8 +105,8 @@
                COUNT(*)                                                                                 num,
                SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                            withholdCost,
-               SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
-                      svc.uploadMoney + svc.secondaryUploadMoney))                                      uploadMoney,
+               SUM(CAST(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
+                           svc.uploadMoney + svc.secondaryUploadMoney) AS DECIMAL(10, 2)))              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,
@@ -129,8 +129,8 @@
                COUNT(*)                                                                                 num,
                SUM(CAST(svc.estimateRebate AS DECIMAL(10, 2)))                                          withRebate,
                SUM(svc.expectTreatCost + svc.expectSuppCost)                                            withholdCost,
-               SUM(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
-                      svc.uploadMoney + svc.secondaryUploadMoney))                                      uploadMoney,
+               SUM(CAST(IF(svc.onceCheckState = 1, svc.secondaryUploadMoney,
+                           svc.uploadMoney + svc.secondaryUploadMoney) AS DECIMAL(10, 2)))              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,