From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
index ee948ea..4af3088 100644
--- a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -7,6 +7,7 @@
<id column="id" property="id" />
<result column="allocation_id" property="allocationId" />
<result column="extension_num" property="extensionNum" />
+ <result column="extension_old_num" property="extensionOldNum" />
<result column="remake" property="remake" />
<result column="state" property="state" />
<result column="invalid_reason" property="invalidReason" />
@@ -14,19 +15,21 @@
<!-- ��������������������� -->
<sql id="Base_Column_List">
- id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time
+ id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time,extension_old_num
</sql>
<!-- ��������������������� -->
<sql id="AllocationExtension_Column_List">
- allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time
+ allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time,allocationextension.extension_old_num
</sql>
<select id="extOne" resultType="com.moral.api.pojo.ext.allocationextension.AllocationExtensionExt">
SELECT
- <include refid="AllocationExtension_Column_List"/>
+ <include refid="AllocationExtension_Column_List"/>,
+ t1.allocation_num,t1.escalation_time,t1.unit_id,t1.pollute_type,t1.change_type,t1.change_day,t1.escalation_unit_id,t1.escalation_name
FROM allocation_extension allocationextension
+ left join allocation t1 on allocationextension.allocation_id = t1.allocation_id
where allocationextension.id = #{id} and allocationextension.is_del = 0
</select>
@@ -40,14 +43,17 @@
<where>
1 = 1 and allocationextension.is_del = 0
- <if test="allocation.unitId != null and allocation.unitId != 0">
- and t1.unit_id = #{allocation.unitId}
+ <if test="allocation.unitId != null and allocation.unitId.size != 0">
+ and t1.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 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}
@@ -62,6 +68,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