From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
index b3a6d8a..903c367 100644
--- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java
@@ -91,7 +91,7 @@
public ApiResponse comfirmDoneStandard(@RequestBody AutoWorkReportDTO autoWorkReportDTO) {
Workorder workorder =workorderRecordStandardService.comfirmDoneNew(autoWorkReportDTO,true);
//鍙戦�佹秷鎭槦鍒楀鐞嗗垎浜搷浣�
- workorderExtService.statisticNum(workorder);
+ workorderExtService.statisticNumAsync(workorder);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -181,12 +181,18 @@
- @ApiOperation("瀵煎嚭Excel")
+ @ApiOperation("鐢熶骇浜у嚭瀵煎嚭Excel")
@PostMapping("/exportExcel")
// @RequiresPermissions("ext:workorderrecordext:exportExcel")
public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
workorderRecordExtService.exportExcel(pageWrap,response);
}
+
+ @ApiOperation("鐢熶骇鎶曟枡瀵煎嚭Excel")
+ @PostMapping("/exportExcelFeeding")
+ public void exportExcelFeeding(@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response){
+ workorderRecordExtService.exportExcel2(pageWrap,response);
+ }
@ApiOperation("瀵煎嚭鍛樺伐缁╂晥鏄庣粏")
@PostMapping("/exportUserSalary")
public void exportUserSalary (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {
--
Gitblit v1.9.3