From 5eb88939c094fac1f5dc9201b5af6da4165cc185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/AllocationMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 32c9a32..446ee62 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -66,7 +66,7 @@
left join allocation_extension t1 on t1.allocation_id = allocation.allocation_id and t1.is_del =0 and t1.is_invalid = 0 and t1.state = 30
<where>
1 = 1 and allocation.is_del = 0
- <if test="allocation.unitId != null and allocation.unitId != 0">
+ <if test="allocation.unitId != null">
and allocation.unit_id = #{allocation.unitId}
</if>
<if test="allocation.polluteType != null and allocation.polluteType != 0">
@@ -81,7 +81,7 @@
<if test="allocation.changeType != null and allocation.changeType != 0">
and allocation.change_type = #{allocation.changeType}
</if>
- <if test="allocation.isInvalid != null and allocation.isInvalid != 0">
+ <if test="allocation.isInvalid != null">
and allocation.is_invalid = #{allocation.isInvalid}
</if>
<if test="allocation.startTime != null and allocation.startTime != '' ">
@@ -90,6 +90,13 @@
<if test="allocation.endTime != null and allocation.endTime !='' ">
and date(allocation.escalation_time) <![CDATA[<=]]> #{allocation.endTime}
</if>
+ <if test="allocation.unitList != null and allocation.unitList.size !=0">
+ and allocation.unit_id in
+ <foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+
+ </if>
</where>
order by allocation.escalation_time desc,allocation.allocation_id desc
</select>
--
Gitblit v1.8.0