From 9c8738a25863bce4d2ce31cb3bf68b2c961afed5 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期三, 30 八月 2023 18:48:47 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml | 3 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 17 -----------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 3 +++
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index e5f958f..0b7d503 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -129,23 +129,6 @@
}
}
record.put("workingHourQuota",workingHourQuota);
-// for (Map<String, Object> dailyMaintenanceDetail : dailyMaintenanceDetails) {
- //鑾峰彇璁㈠崟鏄庣粏绀烘剰鍥�
-// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) dailyMaintenanceDetail.get("maintenanceStandardDetailId")).eq(SysUploadRela::getDelFlag, 0).list();
-// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) dailyMaintenanceDetail.get("maintenanceStandardDetailId"),null);
-// if (sysUploadRelas.size() > 0) {
-//// List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String) dailyMaintenanceDetail.get("maintenanceStandardDetailId"), "daily_maintenance_standard_photo");
-// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) dailyMaintenanceDetail.get("maintenanceStandardDetailId"), "daily_maintenance_standard_photo");
-// SysUpload upload = new SysUpload();
-// if (CollectionUtils.isNotEmpty(uploadRelas)) {
-// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
-// }
-// dailyMaintenanceDetail.put("upload", upload);
-// } else {
-// SysUpload upload = new SysUpload();
-// dailyMaintenanceDetail.put("upload", upload);
-// }
-// }
record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
/**
* 澶嶉�夋 涓嶅彲缂栬緫
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index a894487..09ae195 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -58,6 +58,9 @@
t3.use_id as useId,
t6.depart_name as departName,
t7.name as teamName,
+ DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime,
+ DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime,
+ CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
t1.plan_start_time as planStartTime,
t1.plan_end_time as planEndTime,
t1.actual_start_time as actualStartTime,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml
index 0651743..036833a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml
@@ -20,6 +20,9 @@
t6.name AS teamName,
concat(t8.code, '/', t8.name) AS maintenanceCycleName,
t9.NAME AS maintenanceTypeName,
+ DATEADD(DAY,-60,t1.plan_start_time) as yellowWarningTime,
+ DATEADD(DAY,-14,t1.plan_start_time) as redWarningTime,
+ CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
t1.plan_start_time as planStartTime,
t1.plan_end_time as planEndTime,
t1.actual_start_time as actualStartTime,
--
Gitblit v1.9.3