From 94adc6f8c317f26da2f1f3b65224ac262670bdd8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 31 五月 2024 17:15:52 +0800
Subject: [PATCH] 工时统计的原始工时
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 0117578..97ff05d 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -64,33 +64,24 @@
<select id="totalHours" resultType="java.util.Map">
select A.name,
A.month,
- A.output_work_time
+ A.manHours
from(
select user.name,
- user.id,
- depart_lims_id,
- output_work_time,
- 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 between #{startTime} and #{endTime}
+ where date_time LIKE CONCAT('%', #{month}, '%')
<if test="ids !=null and ids != ''">
and `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
</if>
- order by date_time
+ group by user.name,month
+ order by month,user.name
)A
- where 1=1
- <if test="userId !=null and userId != ''">
- and A.user_id=#{userId}
- </if>
- <if test="departId !=null and departId != ''">
- and A.depart_lims_id=#{departId}
- </if>
- group by A.name,A.month
</select>
<select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours">
select * from auxiliary_output_working_hours
--
Gitblit v1.9.3