From 24888c4b2ca2ffc49c4d94aefd6aea32d515b6dd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 20 四月 2025 14:17:24 +0800
Subject: [PATCH] 分架明细报表修改查询问题
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 6757a41..26b7aca 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -351,6 +351,12 @@
return map;
}
+ public Map<String, Object> orderReportingWorks(Date selectTime1, Date selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.orderReportingWorks(selectTime1, selectTime2, report));
+ return map;
+ }
+
public Map<String, Object> rawMaterialRequisitionSv(Date selectTime1, Date selectTime2, Report report) {
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.rawMaterialRequisitionMp(selectTime1, selectTime2, report));
@@ -362,6 +368,10 @@
}
public List exportDamageReportSv(List<LocalDate> dates) {
+ if (dates != null && dates.size() > 1) {
+ dates.set(1, dates.get(1).plusDays(1)); // 灏嗙浜屼釜鏃ユ湡鍔犱竴澶�
+ }
+ System.out.println(dates);
return reportMapper.exportDamageReportMp(dates);
}
@@ -420,7 +430,8 @@
}
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
+ String laminating = reportMapper.getLaminating(selectProcesses);
+ map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
map.put("process", productionSchedulingMapper.selectProcess());
map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses, teamOutputDTO));
--
Gitblit v1.8.0