From 84fd23e5e865bd5529441a0c318809a00362f44c Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 18 三月 2024 16:15:03 +0800
Subject: [PATCH] 添加签收图片对比功能
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/SignCountController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 04ba2c7..fb9ff0c 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
@@ -20,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;
@@ -33,6 +34,7 @@
@Api(tags = "鐘舵�佺粺璁℃姤琛ㄦ帴鍙�")
@RequestMapping("/xboot/signCount")
@Transactional
+@PermitAll
public class SignCountController {
@Autowired
@@ -84,9 +86,15 @@
@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);
- System.out.println(orderStatus);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("绛炬敹鏁伴噺缁熻鎶ヨ〃", "UTF-8");
@@ -100,12 +108,25 @@
@GetMapping(value = "/selectBySign")
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")
+ @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