From febc34d3642ad7d1b68be5ac49eea48089b3e2e0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 四月 2024 15:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
index 2a2aafe..cefa4d6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.sql.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -62,9 +63,9 @@
}
}
- public Map<String, Object> selectMaintenanceSv() {
+ public Map<String, Object> selectMaintenanceSv(Date selectTime1, Date selectTime2) {
Map<String, Object> map = new HashMap<>();
- map.put("data", deviceMaintenanceMapper.selectMaintenanceMp());
+ map.put("data", deviceMaintenanceMapper.selectMaintenanceMp(selectTime1,selectTime2));
return map;
}
@@ -77,4 +78,16 @@
return false;
}
}
+
+ public Map<String, Object> selectMachineSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deviceMaintenanceMapper.selectMachineMp());
+ return map;
+ }
+
+ public Map<String, Object> openSelectIdSv(String id) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", deviceMaintenanceMapper.openSelectIdMp(id));
+ return map;
+ }
}
--
Gitblit v1.8.0