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 cc4d3913c3..333916fe6d 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 @@ -54,6 +54,10 @@ public class VehRebateCheckExcelVo { private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; + @ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue") + private String calculationModeValue; + @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard") + private String calculationStandard; @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") private String estimateRebate; @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java index a85a1f7387..184fe335c6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java @@ -56,6 +56,8 @@ public class ExcelVo { private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; + @ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue") + private String calculationModeValue; @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard") private String calculationStandard; @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index 5323c59955..30f98f94c7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -134,6 +134,9 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { BeanUtil.copyProperties(datum,excelVo); excelVo.setRankNo(i); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); + if ("比例".equals(datum.getCalculationModeValue())){ + excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%"); + } i = i + 1; excelVos.add(excelVo); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java index 49e240cf01..0929282f8e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java @@ -122,6 +122,9 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign { BeanUtil.copyProperties(datum,excelVo); excelVo.setRankNo(i); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); + if ("比例".equals(datum.getCalculationModeValue())){ + excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%"); + } i = i + 1; excelVos.add(excelVo); }