From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 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..35b1ee8 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
@@ -5,10 +5,12 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.DeviceMaintenance;
+import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.mapper.pp.DeviceMaintenanceMapper;
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 +64,10 @@
}
}
- 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));
+ map.put("process", deviceMaintenanceMapper.selectProcessMp());
return map;
}
@@ -77,4 +80,33 @@
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;
+ }
+
+ public Boolean updateMaintenance(Map<String, Object> object) {
+ JSONObject dataJson = new JSONObject(object);
+ DeviceMaintenance deviceMaintenance = JSONObject.parseObject(JSONObject.toJSONString(dataJson.get("machine")), DeviceMaintenance.class);
+ if (!dataJson.isEmpty()) {
+ deviceMaintenanceMapper.updateMaintenanceMp(deviceMaintenance.getId(),deviceMaintenance.getDeviceName(),
+ deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
+ deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
+ deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
+ deviceMaintenance.getPersonnel(),
+ deviceMaintenance.getCost()
+ );
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0