From a3ba94e23fec4281502a94221f65cc0567eb02a8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 11 七月 2024 16:57:16 +0800
Subject: [PATCH] 温度循环报告完成
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 0117578..228be28 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -39,13 +39,14 @@
name
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
- <if test="ids !=null and ids != ''">
+ WHERE `check` in(#{ids})
+ <!--<if test="ids !=null and ids != ''">
WHERE `check` in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>
- ) data
+ </if>-->
+ ) A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -54,52 +55,46 @@
select aowh.*,name
FROM auxiliary_output_working_hours aowh
left join user on user.id=aowh.`check`
- <if test="ids !=null and ids != ''">
- WHERE `check` in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
- #{val}
- </foreach>
- </if>
+ WHERE `check` in(#{ids})
+ <!-- <if test="ids !=null and ids != ''">
+ WHERE `check` in
+ <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </if>-->
</select>
<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}
- <if test="ids !=null and ids != ''">
- and `check` in
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ where date_time LIKE CONCAT('%', #{month}, '%')
+ and `check` in (#{ids})
+ <!--<if test="ids !=null and ids != ''">
+ and `check` in (#ids)
+ <foreach collection="ids" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>
- order by date_time
+ </if>-->
+ group by user.name,date_time
+ order by user.name,date_time
)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
where 1=1
- <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>-->
</select>
</mapper>
--
Gitblit v1.9.3