From 8d4ad0d13ef71e22cc1036e2c6c00aafb20ed597 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 十二月 2024 17:41:58 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 31958ad..b37e74b 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -28,6 +28,7 @@
from (
select aowh.id,
inspection_item,
+ num,
inspection_item_subclass,
overtime_order_no,
overtime_work_time,
@@ -39,7 +40,8 @@
date_time,
week,
week_day,
- name
+ name,
+ sample
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
WHERE 1=1
@@ -73,14 +75,10 @@
from(
select user.name,
date_time as month,
- order_no,
- sample,
- man_hour_group,
- output_work_time as manHours
- -- FORMAT(SUM(output_work_time), 4) as manHours
+ case when #{type}='鍔犵彮宸ユ椂' then case when overtime_work_time is null then 0 else overtime_work_time end
+ else case when work_time is null then 0 else work_time end end as manHours
from auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
- left join department_lims dl on depart_lims_id=dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
<if test="ids !=null and ids != ''">
and `check` in
@@ -88,12 +86,7 @@
#{val}
</foreach>
</if>
- group by user.name,date_time,order_no,
- sample,
- man_hour_group
- order by user.name,date_time,order_no,
- sample,
- man_hour_group
+ order by user.name,date_time
)A
group by A.name,
A.month
--
Gitblit v1.9.3