From cd4a24e07e643b5be854f0a355e040e382062e2b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 七月 2024 11:35:22 +0800
Subject: [PATCH] 添加标签样式需要的字段
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 8 ++++----
1 files changed, 4 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 d1ebdee..9264688 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
@@ -125,7 +125,7 @@
return map;
}
- public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {
+ public Map<String, Object> workInProgressSv( String orderId, String inputProject, String selectProcesses, String optionVal, Report report) {
if ("null".equals(orderId)) {
orderId = "";
@@ -140,16 +140,16 @@
Map<String, Object> map = new HashMap<>();
if (optionVal.equals("1")){
/* 鏍规嵁閿�鍞崟鍙锋眹鎬�*/
- map.put("data", reportMapper.workInProgressOrderMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ map.put("data", reportMapper.workInProgressOrderMp( orderId, inputProject, selectProcesses, report));
}else if(optionVal.equals("2")){
/* 鏍规祦绋嬪崱鍙锋眹鎬�*/
- map.put("data", reportMapper.workInProgressProcessMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ map.put("data", reportMapper.workInProgressProcessMp( orderId, inputProject, selectProcesses, report));
} else if (optionVal.equals("3")) {
} else {
- map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
+ map.put("data", reportMapper.workInProgressMp( orderId, inputProject, selectProcesses, report));
}
map.put("process", productionSchedulingMapper.selectProcess());
return map;
--
Gitblit v1.8.0