From 83e57cd2c14087d79aff9c9f40c236d6b5a53860 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 十二月 2025 16:28:53 +0800
Subject: [PATCH] 补充
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 ed8fb11..5634371 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
@@ -692,10 +692,27 @@
return map;
}
- public Map<String, Object> yieldSv(String selectTime1, String selectTime2, String selectProcesses, Report report) {
+ public Map<String, Object> yieldSv(List<String> selectDate, String selectProcesses,String reportTime, Report report) {
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.yieldMp(selectTime1, selectTime2, selectProcesses, report));
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 7 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(7).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
+ if (selectDate != null && selectDate.size() == 2) {
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = toReportTime(selectDate.get(0), reportTime);
+ }
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = toReportTime(selectDate.get(1), reportTime);
+ }
+ }
+ map.put("data", reportMapper.yieldMp(startDate, endDate, selectProcesses, report));
map.put("process", productionSchedulingMapper.selectProcess());
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
return map;
}
@@ -1643,10 +1660,28 @@
return map;
}
- public Map<String, Object> yieldProcessSv(String selectTime1, String selectTime2, Report report) {
+ public Map<String, Object> yieldProcessSv(List<String> selectDate,String reportTime, Report report) {
Map<String, Object> map = new HashMap<>();
- map.put("data", reportMapper.yieldProcessMp(selectTime1, selectTime2, report));
+ // 榛樿鏃堕棿鑼冨洿锛氳繃鍘� 7 澶╋紙鏃ユ湡 + reportTime锛�
+ String startDate = toReportTime(LocalDate.now().minusDays(7).toString(), reportTime);
+ String endDate = toReportTime(LocalDate.now().toString(), reportTime);
+
+ // 濡傛灉鍓嶇浼犱簡鏃堕棿锛屽氨鐢ㄥ墠绔棩鏈� + reportTime
+ if (selectDate != null && selectDate.size() == 2) {
+ if (selectDate.get(0) != null && !selectDate.get(0).isEmpty()) {
+ startDate = toReportTime(selectDate.get(0), reportTime);
+ }
+ if (selectDate.get(1) != null && !selectDate.get(1).isEmpty()) {
+ endDate = toReportTime(selectDate.get(1), reportTime);
+ }
+ }
+ map.put("data", reportMapper.yieldProcessMp(startDate, endDate, report));
map.put("process", productionSchedulingMapper.selectProcess());
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ System.out.println(list);
+ map.put("selectDate",list);
return map;
}
--
Gitblit v1.8.0