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/mapper/pp/DeviceMaintenanceMapper.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java
index cd28f3d..f9a1697 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java
@@ -3,7 +3,7 @@
import com.example.erp.entity.pp.DeviceMaintenance;
import org.apache.ibatis.annotations.Mapper;
-import java.time.LocalDate;
+import java.sql.Date;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -25,7 +25,11 @@
String faultReason, LocalDateTime maintenanceTime, String maintenanceIllustrate,
LocalDateTime stopTime, LocalDateTime startTime,String process, String personnel, String cost);
- List<DeviceMaintenance> selectMaintenanceMp();
+ List<DeviceMaintenance> selectMaintenanceMp(Date selectTime1, Date selectTime2);
Boolean deleteMaintenanceMp(String id);
+
+ List<DeviceMaintenance> selectMachineMp();
+
+ List<Map<String,String>> openSelectIdMp(String id);
}
--
Gitblit v1.8.0