From 13c9e4032de40598787a453de77ba0db94666664 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期四, 25 五月 2023 15:53:07 +0800
Subject: [PATCH] 接货图片和签收图片的完善
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java
index 43f2a49..04ba2c7 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java
@@ -4,6 +4,7 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.common.ExcelFillCellMergeStrategy;
import cn.exrick.xboot.your.entity.OrderStatusCount;
import cn.exrick.xboot.your.entity.QueryRequest;
import cn.exrick.xboot.your.entity.SignCount;
@@ -83,16 +84,18 @@
@GetMapping("/outExcels")
@ApiOperation(value = "瀵煎嚭绛炬敹缁熻淇℃伅琛�", notes = "瀵煎嚭绛炬敹缁熻淇℃伅琛�")
- public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response,QueryRequest queryRequest) throws IOException {
- List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts(orderStatusCount,queryRequest).getRecords();
+ public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response) throws IOException {
+ List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts2New(orderStatusCount);
+ System.out.println(orderStatus);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("绛炬敹鏁伴噺缁熻鎶ヨ〃", "UTF-8");
String fileName2 = new String(fileName.getBytes("UTF-8"), "ISO8859-1");
// response.setHeader("Content-dispostion", "attachment;filename="+fileName+".xls");
response.setHeader("Content-disposition", "attachment;filename=" + fileName2 + ".xlsx");
- EasyExcel.write(response.getOutputStream(),OrderStatusCount.class).
- sheet(0).doWrite(orderStatus);
+ EasyExcel.write(response.getOutputStream(),OrderStatusCount.class)
+ .registerWriteHandler(new ExcelFillCellMergeStrategy(1,new int[]{0,1,2,9})) // 鍩轰簬 column 闀垮害锛岃嚜鍔ㄩ�傞厤銆傛渶澶� 255 瀹藉害
+ .sheet(0).doWrite(orderStatus);
}
@GetMapping(value = "/selectBySign")
@@ -100,4 +103,10 @@
IPage<OrderStatusCount> data = this.iSignCountService.signCounts(orderStatusCount,queryRequest);
return new ResultUtil<IPage<OrderStatusCount>>().setData(data);
}
+
+ @GetMapping(value = "/selectBySignNew")
+ public Result<IPage<OrderStatusCount>> signCountsNew(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
+ IPage<OrderStatusCount> data = this.iSignCountService.signCountsNew(orderStatusCount,queryRequest);
+ return new ResultUtil<IPage<OrderStatusCount>>().setData(data);
+ }
}
--
Gitblit v1.9.1