From 3ee23fa2bfb5f90863a1e2579c882b4bae875aa3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 31 五月 2024 11:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 596d865..8e9b9bd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -202,10 +202,13 @@
DownExcel.download(response, WorkInProgressDTO.class, reportService.exportWorkInProgressSv(dates), "WorkInProgress");
}
- @ApiOperation("鍒嗘灦鏄庣粏鎶ヨ〃瀵煎嚭")
- @PostMapping("/exportSplittingDetailsOutside")
- public void exportSplittingDetailsOutside(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ @ApiOperation("浠诲姟瀹屾垚鎯呭喌瀵煎嚭")
+ @PostMapping("/exportTaskCompletionStatus")
+ public void exportTaskCompletionStatus(HttpServletResponse response,
+ @RequestBody Map<String,Object> dates)
+ throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
- DownExcel.download(response, SplittingDetailsOutsideDTO.class, reportService.exportOrderPlanDecompositionSv(dates), "OrderPlanDecomposition");
+ DownExcel.download(response, WorkInProgressDTO.class, reportService.exportWorkInProgressSv(dates), "WorkInProgress");
}
+
}
--
Gitblit v1.8.0