From 34a4da1c76088a474278f58759d63783a57757a0 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 05 七月 2024 09:23:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
index 8210a83..228be28 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -39,12 +39,13 @@
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>
+ </if>-->
) A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -54,12 +55,13 @@
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,
@@ -73,24 +75,26 @@
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
- <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
+ 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>
- group by user.name,month
- order by month,user.name
+ </if>-->
+ group by user.name,date_time
+ order by user.name,date_time
)A
</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