修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelNewVo.java

@@ -26,25 +26,24 @@
 package com.yxt.anrui.scm.api.scmvehrebate;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.yxt.common.core.utils.ExportEntityMap;
 import lombok.Data;
 
 @Data
 public class ScmVehRebateExcelNewVo {
 
-    @ExportEntityMap(CnName = "序号", EnName = "rankNo")
+    @ExcelProperty("序号")
     private Integer rankNo;
-    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    @ExcelProperty("采购系统")
     private String purchaseSystemName;
-    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+    @ExcelProperty("车架号")
     private String vinNo;
-    @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
+    @ExcelProperty("车型")
     private String vehModelName;
-    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    @ExcelProperty("所属年月")
     private String palceGenDate;
-    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    @ExcelProperty("返利类型")
     private String rebateTypeValue;
-    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    @ExcelProperty("返利名称")
     private String rebateName;
 
     @ExcelProperty({"返利金额", "预提"})
@@ -81,7 +80,7 @@ public class ScmVehRebateExcelNewVo {
     @ExcelProperty({"状态", "二次核对"})
     private String secondCheckState;
 
-    @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
+    @ExcelProperty("车辆入库价")
     private String manufactorSettlementPrice;
 
     @ExcelProperty({"其中", "运费"})
@@ -94,10 +93,10 @@ public class ScmVehRebateExcelNewVo {
     @ExcelProperty({"返利计算", "标准"})
     private String calculationStandard;
 
-    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    @ExcelProperty("备注")
     private String remarks;
-    @ExportEntityMap(CnName = "品牌", EnName = "brandName")
+    @ExcelProperty("品牌")
     private String brandName;
-    @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
+    @ExcelProperty("分公司")
     private String createOrgName;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmvehrebate;
 
-
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
@@ -34,19 +33,6 @@ import lombok.Data;
 
 import java.util.List;
 
-/**
- * Project: anrui-scm(单车返利) <br/>
- * File: ScmVehRebateQuery.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateQuery <br/>
- * Description: 单车返利表 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-24 09:01:54 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "单车返利表 查询条件", description = "单车返利表 查询条件")
 public class ScmVehRebateQuery implements Query {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmvehrebate;
 
+import com.alibaba.excel.EasyExcel;
 import com.yxt.anrui.scm.api.scmvehrebate.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.StringUtils;
@@ -110,18 +111,14 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
 
     @ApiOperation("导出")
     @PostMapping("/excelListNew")
-    public void excelListNew(ScmVehRebateQuery query) {
+    public void excelListNew(@RequestBody ScmVehRebateQuery query) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setHeader("Content-Disposition", "attachment;filename=rebate.xlsx");
         //得到所有要导出的数据
         List<ScmVehRebateExcelNewVo> dataList = scmVehRebateService.excelListNew(query);
-        //定义导出的excel名字
+        EasyExcel.write(response.getOutputStream(), ScmVehRebateExcelNewVo.class)
-        String excelName = "单车返利管理";
+                .sheet("单车返利管理")
-        String fileNameURL = "";
+                .doWrite(dataList);
-        try {
-            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        ExportExcelUtils.export(fileNameURL, dataList, ScmVehRebateExcelNewVo.class, response);
     }
 
     @ApiOperation("导出")