From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/SpecialtyMaintenanceOrderMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
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 92a91ee..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
@@ -3,10 +3,10 @@
<mapper namespace="org.jeecg.modules.eam.mapper.SpecialtyMaintenanceOrderMapper">
<select id="getSpecialtyMaintenanceOrderList" parameterType="Map" resultType="Map">
- SELECT
+ SELECT DISTINCT
t1.id,
t1.num,
- t1.`status`,
+ t1.status,
t1.maintenance_user_id maintenanceUserId,
t12.realname maintenanceUserName,
t2.id as specialtyMaintenancePlanId,
@@ -20,14 +20,16 @@
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,
t1.actual_end_time as actualEndTime,
t10.realname,
t1.create_time as createTime,
- t1.create_by as createBy,
- ifnull(sum(t14.working_hour_quota),0) sumOfWorkingHourQuota
+ t1.create_by as createBy
FROM
mom_eam_specialty_maintenance_order t1
LEFT JOIN mom_eam_specialty_maintenance_plan t2 ON t1.specialty_maintenance_plan_id = t2.id
@@ -40,13 +42,12 @@
LEFT JOIN mom_eam_maintenance_type t9 ON t9.id = t2.maintenance_type_id
left join sys_user t10 on t1.recipient_user_id = t10.id
left join sys_user t12 on t1.maintenance_user_id = t12.id
- left join (select * from mom_eam_specialty_maintenance_order_detail where del_flag = 0) t13 on t13.specialty_maintenance_order_id = t1.id
- left join (select * from mom_eam_maintenance_project where del_flag = 0) t14 on t14.id = t13.maintenance_project_id
+-- left join (select * from mom_eam_specialty_maintenance_order_detail where del_flag = 0) t13 on t13.specialty_maintenance_order_id = t1.id
+-- left join (select * from mom_eam_maintenance_project where del_flag = 0) t14 on t14.id = t13.maintenance_project_id
WHERE t1.del_flag = 0 and t2.del_flag = 0 and t8.del_flag = 0 and t9.del_flag = 0
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
</if>
- group by t1.id
ORDER BY t1.create_time desc
</select>
--
Gitblit v1.9.3