From 54596f54e147492009daa112ab89a6bcd7bf33a5 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:10:09 +0800
Subject: [PATCH] ci:添加单号筛选项

---
 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
index dfaa03c..52ab9ae 100644
--- a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -49,7 +49,7 @@
                 and t1.pollute_type = #{allocation.polluteType}
             </if>
             <if test="allocation.state != null and allocation.state != 0">
-                and t1.state = #{allocation.state}
+                and allocationextension.state = #{allocation.state}
             </if>
             <if test="allocation.investigationType != null and allocation.investigationType != 0">
                 and t1.investigation_type = #{allocation.investigationType}
@@ -64,6 +64,15 @@
             <if test="allocation.endTime != null and allocation.endTime !='' ">
                 and date(t1.escalation_time) <![CDATA[<=]]>  #{allocation.endTime}
             </if>
+            <if test="allocation.allocationNum != null and allocation.allocationNum !='' ">
+                and allocation.allocation_num LIKE CONCAT('%',#{allocation.allocationNum},'%')
+            </if>
+            <if test="allocation.unitList != null and allocation.unitList.size !=0">
+                and t1.unit_id in
+                <foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
 
         </where>
         order by t1.escalation_time desc,t1.allocation_id desc

--
Gitblit v1.8.0