From 7860a3aaaf243b19ce9238f8bf5a89435f1ec84d Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 15 一月 2025 08:56:40 +0800
Subject: [PATCH] 添加其他系统新增产品接口
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 6be9263..acb75f4 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
@@ -119,7 +119,6 @@
list.add(startDate);
list.add(endDate);
map.put("selectDate", list);
-// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
return map;
}
@@ -148,7 +147,7 @@
} else if (optionVal.equals("3")) {
} else {
-
+ //娌℃湁閫夋嫨鍒嗙粍
map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
@@ -352,7 +351,6 @@
}
public List exportDamageReportSv(List<LocalDate> dates) {
-
return reportMapper.exportDamageReportMp(dates);
}
@@ -375,7 +373,6 @@
}
public List exportWorkInProgressSv(Map<String, Object> dates) {
- List<LocalDate> date= (List<LocalDate>) dates.get("date");
String process= (String) dates.get("processes");
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
@@ -385,7 +382,7 @@
if ("null".equals(project)) {
project = "";
}
- return reportMapper.exportWorkInProgressMp(date,process,inputVal,project);
+ return reportMapper.exportWorkInProgressMp(process,inputVal,project);
}
public List exportTaskCompletionStatusSv(Map<String, Object> dates) {
--
Gitblit v1.8.0