From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 1891742..ba60fca 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
@@ -140,23 +140,23 @@
}
@ApiOperation("鎴愬搧鐜囨姤琛�")
- @PostMapping("/yield/{selectTime1}/{selectTime2}/{selectProcesses}")
+ @PostMapping("/yield/{selectDate}/{selectProcesses}/{reportTime}")
public Result yield(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable String selectProcesses,
+ @PathVariable String reportTime,
@RequestBody Report report) {
- return Result.success(reportService.yieldSv(selectTime1, selectTime2, selectProcesses, report));
+ return Result.success(reportService.yieldSv(selectDate, selectProcesses,reportTime, report));
}
@ApiOperation("鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�")
- @PostMapping("/yieldProcess/{selectTime1}/{selectTime2}")
+ @PostMapping("/yieldProcess/{selectDate}/{reportTime}")
public Result yieldProcess(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
+ @PathVariable List<String> selectDate,
+ @PathVariable String reportTime,
@RequestBody Report report) {
- return Result.success(reportService.yieldProcessSv(selectTime1, selectTime2, report));
+ return Result.success(reportService.yieldProcessSv(selectDate,reportTime, report));
}
@@ -213,21 +213,21 @@
}
@ApiOperation("璺ㄥ伐搴忔鐮存姤琛ㄥ鍑�")
@PostMapping("/exportCrossProcessBreaking")
- public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ public void exportCrossProcessBreaking(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportCrossProcessBreakingSv(dates), "CrossProcessBreaking");
}
@ApiOperation("闈炶法宸ュ簭娆＄牬鎶ヨ〃瀵煎嚭")
@PostMapping("/exportNotCrossProcessBreaking")
- public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ public void exportNotCrossProcessBreaking(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, CrossProcessBreakingDTO.class, reportService.exportNotCrossProcessBreakingSv(dates), "CrossProcessBreaking");
}
@ApiOperation("娆＄牬鏄庣粏鎶ヨ〃瀵煎嚭")
@PostMapping("/exportDamageReport")
- public void exportDamageReport(HttpServletResponse response, @RequestBody Map<String, Object> dates) throws IOException, IllegalAccessException, InstantiationException {
+ public void exportDamageReport(HttpServletResponse response, @RequestBody List<String> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, DamageReportDTO.class, reportService.exportDamageReportSv(dates), "DamageReport");
}
--
Gitblit v1.8.0