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/AuxiliaryWorkingHoursDayMapper.xml | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
index c4c2c6f..4a77ae2 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryWorkingHoursDayMapper.xml
@@ -26,18 +26,19 @@
<result column="state" property="state"/>
</resultMap>
<select id="selectAuxiliaryWorkingHoursDay" resultType="com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto">
- select data.*
+ select A.*
from (
select awhd.*,name
FROM auxiliary_working_hours_day awhd
left join user on name_user=user.id
- <if test="ids !=null and ids != ''">
+ WHERE name_user in(#{ids})
+ <!--<if test="ids !=null and ids != ''">
WHERE name_user 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>
@@ -46,22 +47,24 @@
select awhd.*,name
FROM auxiliary_working_hours_day awhd
left join user on name_user=user.id
- <if test="ids !=null and ids != ''">
+ WHERE name_user in(#{ids})
+ <!--<if test="ids !=null and ids != ''">
WHERE name_user in
<foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
- </if>
+ </if>-->
</select>
<select id="selectListByIds" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay">
select * from auxiliary_working_hours_day
where 1=1
- <if test="ids !=null and ids != ''">
+ 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>
+ </if>-->
</select>
<select id="totalHours" resultType="java.util.Map">
select A.name,
@@ -77,12 +80,13 @@
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,user.name
)A
group by A.name,A.month
--
Gitblit v1.9.3