diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java index d4968cd413..279a16ad54 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java @@ -29,6 +29,8 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; import com.yxt.common.core.utils.ExportEntityMap; import lombok.Data; +import java.math.BigDecimal; + @Data public class SpecialRebateCheckExcelVo { @@ -48,8 +50,12 @@ public class SpecialRebateCheckExcelVo { private String rebateName; @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") private String estimateRebate; - @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost") - private String withholdCost; + @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") + private String expectItureCost; + @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") + private String expectTreatCost; + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") + private String expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") @@ -62,8 +68,18 @@ public class SpecialRebateCheckExcelVo { private String secondaryUploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") private String stayDetermineMoney; - @ExportEntityMap(CnName = "其中费用", EnName = "money") - private String money; + @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost") + private BigDecimal onceItureCost; + @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + private BigDecimal onceTreatCost; + @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + private BigDecimal onceSuppCost; + @ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost") + private BigDecimal secondItureCost; + @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + private BigDecimal secondTreatCost; + @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") private String diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java index a3f63eacea..cc4d3913c3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java @@ -56,8 +56,10 @@ public class VehRebateCheckExcelVo { private String rebateName; @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") private String estimateRebate; - @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost") - private String withholdCost; + @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") + private String expectTreatCost; + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") + private String expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") @@ -70,8 +72,14 @@ public class VehRebateCheckExcelVo { private String secondaryUploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") private String stayDetermineMoney; - @ExportEntityMap(CnName = "其中费用", EnName = "money") - private String money; + @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + private BigDecimal onceTreatCost; + @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + private BigDecimal onceSuppCost; + @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + private BigDecimal secondTreatCost; + @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") private String diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")