更改

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")

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")

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);
         }

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);
         }