From d9a3f29203bf2cefeedb23766b79906d2b37abdc Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 三月 2025 08:28:38 +0800
Subject: [PATCH] 工时查询修改
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index c9df972..a82faab 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -144,16 +144,16 @@
u.name userName,
aowh.`check` userId,
#{dto.month} month
- from (SELECT *
- FROM auxiliary_output_working_hours
- GROUP BY CASE
- WHEN man_hour_group IS NOT NULL AND man_hour_group != '' THEN man_hour_group
- ELSE id
- END
- , CASE
- WHEN man_hour_group IS NOT NULL AND man_hour_group != '' THEN order_id
- ELSE id
- END) aowh
+ from (SELECT ao.*, ip.cable_tag
+ FROM auxiliary_output_working_hours ao
+ left join ins_product ip on ip.id = ao.ins_product_id
+ GROUP BY CASE
+ WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.man_hour_group
+ ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.sample_id ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ip.radius ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ip.cable_tag ELSE ao.id END,
+ CASE WHEN ao.man_hour_group IS NOT NULL AND ao.man_hour_group != '' THEN ao.order_id ELSE ao.id END) aowh
left join user u on u.id = aowh.`check`
where aowh.date_time between #{dto.beginDate} and #{dto.endDate}
<if test="userIds !=null and userIds.size() > 0">
@@ -171,7 +171,7 @@
#{dto.month} month
from auxiliary_working_hours_day awhd
left join user u on u.id = awhd.name_user
- where awhd.date_time between #{dto.beginDate} and #{dto.endDate}
+ where awhd.date_time between #{dto.assistBeginDate} and #{dto.assistEndDate}
and awhd.state = '宸叉壒鍑�'
<if test="userIds !=null and userIds.size() > 0">
and awhd.name_user in
--
Gitblit v1.9.3