From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 06 十二月 2023 08:41:32 +0800 Subject: [PATCH] bug --- server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 12 ++++++++++-- 1 files changed, 10 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..f295f87 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java @@ -4,6 +4,7 @@ import doumeemes.api.BaseController; import doumeemes.config.rocketmq.RocketMessageProducer; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -43,6 +44,7 @@ @RestController @RequestMapping("/ext/workorderRecordExt") @Api(tags = "宸ュ崟鐢熶骇杩囩▼璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderRecordExtController extends BaseController { @Autowired @@ -91,7 +93,7 @@ public ApiResponse comfirmDoneStandard(@RequestBody AutoWorkReportDTO autoWorkReportDTO) { Workorder workorder =workorderRecordStandardService.comfirmDoneNew(autoWorkReportDTO,true); //鍙戦�佹秷鎭槦鍒楀鐞嗗垎浜搷浣� - workorderExtService.statisticNum(workorder); + workorderExtService.statisticNumAsync(workorder); return ApiResponse.success("鎿嶄綔鎴愬姛"); } @@ -181,12 +183,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