From 90e768e3d4e6603ca9e47c0950255ec105757883 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 04 七月 2024 16:32:23 +0800
Subject: [PATCH] 修改工时bug+报告分页问题
---
performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
index 4b1b9e4..1e9a012 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
@@ -12,18 +12,19 @@
case
when reviewer_nonproductive_time is null then nonproductive_time
else reviewer_nonproductive_time end as manHour,
- date_time as month
+ date_time as month
from auxiliary_working_hours_day awhd
left join user on user.id = awhd.name_user
left join department_lims dl on depart_lims_id = dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
and awhd.state='宸叉壒鍑�'
- <if test="ids !=null and ids != ''">
- and name_user in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </if>
+ and name_user in(#{ids})
+ <!-- <if test="ids !=null and ids != ''">
+ and name_user in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>-->
order by month
) A
group by A.name, A.month) C
@@ -33,18 +34,19 @@
B.manHours
from (
select user.name,
- date_time as month,
+ date_time as month,
sum(output_work_time) 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(#{ids})
+ <!--<if test="ids !=null and ids != ''">
and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>
+ </if>-->
group by user.name, month
order by user.name, month
) B
--
Gitblit v1.9.3