From 38f7a5cae3d0daadd2cbc7e18756b0c98c978c26 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 28 五月 2024 11:26:21 +0800
Subject: [PATCH] 修改订单导出模板，以及添加行放到最后一行。 添加计算方式类型
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index c5f6e80..a548e53 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -11,7 +12,6 @@
import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -117,7 +117,24 @@
}
@ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭")
@PostMapping("/exportOrderReport")
- public void exportOrderReport(HttpServletResponse response) throws IOException, IllegalAccessException, InstantiationException {
- DownExcel.download(response,Order.class, orderService.exportOrderReport(),"orderReport");
+ public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, OrderDTO.class, orderService.exportOrderReport(dates),"orderReport");
}
+
+ @ApiOperation("璁㈠崟浜у搧姹囨�绘姤琛ㄥ鍑�")
+ @PostMapping("/exportOrderProductSummary")
+ public void exportOrderProductSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
+ }
+
+ @ApiOperation("璁㈠崟灏忕墖鏍囩")
+ @PostMapping("/getOrderProductDetailTag/{orderId}")
+ public Result getOrderProductDetailTag(@PathVariable String orderId) {
+ return Result.seccess(orderService.getOrderProductDetailTag(orderId));
+ }
+
+
}
--
Gitblit v1.8.0