From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/AllocationMapper.xml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 6753aa6..8572d20 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -27,6 +27,7 @@
<result column="check_time" property="checkTime" />
<result column="state" property="state" />
<result column="invalid_reason" property="invalidReason" />
+ <result column="key_point" property="keyPoint" />
</resultMap>
<!-- ��������������������� -->
@@ -36,7 +37,7 @@
<!-- ��������������������� -->
<sql id="Allocation_Column_List">
- allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time
+ allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time,allocation.key_point
</sql>
@@ -67,14 +68,23 @@
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.unit_id = #{allocation.unitId}
+ <if test="allocation.unitId != null and allocation.unitId.size != 0">
+ and allocation.unit_id in
+ <foreach collection="allocation.unitId" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
</if>
- <if test="allocation.polluteType != null and allocation.polluteType != 0">
- and allocation.pollute_type = #{allocation.polluteType}
+ <if test="allocation.polluteType != null and allocation.polluteType.size != 0">
+ and allocation.pollute_type in
+ <foreach collection="allocation.polluteType" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
</if>
- <if test="allocation.state != null and allocation.state != 0">
- and allocation.state = #{allocation.state}
+ <if test="allocation.state != null and allocation.state.size != 0">
+ and allocation.state in
+ <foreach collection="allocation.state" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
</if>
<if test="allocation.investigationType != null and allocation.investigationType != 0">
and allocation.investigation_type = #{allocation.investigationType}
--
Gitblit v1.8.0