From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 487e5ed..6a094d7 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
@@ -56,6 +56,16 @@
}
+ @ApiOperation("闈炶法宸ュ簭娆＄牬")
+ @PostMapping("/notCrossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
+ public Result notCrossProcessBreaking(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody CrossProcessBreakingDTO crossProcessBreakingDTO) {
+ return Result.success(reportService.notCrossProcessBreakingSv(pageNum, pageSize, selectDate, crossProcessBreakingDTO));
+
+ }
+
@ApiOperation("鍦ㄥ埗鍝佹姤琛�")
@PostMapping("/workInProgress/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgress(
@@ -206,6 +216,13 @@
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 {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑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 {
--
Gitblit v1.8.0