From b10f7dc5c05062e6792f522ae1fb4de446189d3e Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期二, 16 七月 2024 17:44:39 +0800
Subject: [PATCH] 区间合并，检验下单时型号参数匹配
---
performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
index 1e9a012..110813c 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml
@@ -18,13 +18,13 @@
left join department_lims dl on depart_lims_id = dl.id
where date_time LIKE CONCAT('%', #{month}, '%')
and awhd.state='宸叉壒鍑�'
- and name_user in(#{ids})
- <!-- <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>
order by month
) A
group by A.name, A.month) C
@@ -40,13 +40,13 @@
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}, '%')
- and `check` in(#{ids})
- <!--<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