diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java index e6cf8d7bcc..d2e1fa58a3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java @@ -65,8 +65,10 @@ public class ScmVehRebateExcelVo { private String calculationStandard; @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") private String estimateRebate; - @ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost") - private String expectCost; + @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") + private String expectTreatCost; + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") + private String expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index e7937baa4a..f8794b59ed 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml @@ -110,8 +110,6 @@ *, @row_number := @row_number + 1 AS rankNo, sid AS vehRebateSid, - expectTreatCost + expectSuppCost AS expectCost, - expectTreatCost + expectSuppCost AS withholdCost, onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money FROM scm_veh_rebate,(