From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 bce41af..720b10a 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;
@@ -19,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
@@ -32,6 +34,7 @@
@Api(tags = "鐘舵�佺粺璁℃姤琛ㄦ帴鍙�")
@RequestMapping("/xboot/signCount")
@Transactional
+@PermitAll
public class SignCountController {
@Autowired
@@ -83,7 +86,14 @@
@GetMapping("/outExcels")
@ApiOperation(value = "瀵煎嚭绛炬敹缁熻淇℃伅琛�", notes = "瀵煎嚭绛炬敹缁熻淇℃伅琛�")
+ @PermitAll
public void export1(OrderStatusCount orderStatusCount, HttpServletResponse response) throws IOException {
+ if(orderStatusCount.getSendDateStart()!=null){
+ orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
+ }
+ if(orderStatusCount.getSendDateEnd()!=null){
+ orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
+ }
List<OrderStatusCount> orderStatus = this.iSignCountService.signCounts2New(orderStatusCount);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
@@ -91,18 +101,34 @@
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")
+ @ApiOperation(value = "绛炬敹缁熻淇℃伅琛�", notes = "绛炬敹缁熻淇℃伅琛�")
public Result<IPage<OrderStatusCount>> signCounts(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
+ if(orderStatusCount.getSendDateStart()!=null){
+ orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
+ }
+ if(orderStatusCount.getSendDateEnd()!=null){
+ orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
+ }
IPage<OrderStatusCount> data = this.iSignCountService.signCounts(orderStatusCount,queryRequest);
return new ResultUtil<IPage<OrderStatusCount>>().setData(data);
}
@GetMapping(value = "/selectBySignNew")
+ @ApiOperation(value = "绛炬敹缁熻淇℃伅琛�1", notes = "绛炬敹缁熻淇℃伅琛�1")
+ @PermitAll
public Result<IPage<OrderStatusCount>> signCountsNew(OrderStatusCount orderStatusCount,QueryRequest queryRequest) {
+ if(orderStatusCount.getSendDateStart()!=null){
+ orderStatusCount.setSendDateStart(orderStatusCount.getSendDateStart() + " 00:00:00");
+ }
+ if(orderStatusCount.getSendDateEnd()!=null){
+ orderStatusCount.setSendDateEnd(orderStatusCount.getSendDateEnd() + " 23:59:59");
+ }
IPage<OrderStatusCount> data = this.iSignCountService.signCountsNew(orderStatusCount,queryRequest);
return new ResultUtil<IPage<OrderStatusCount>>().setData(data);
}
--
Gitblit v1.9.1