From 6c2fe039f3a0c9cfd0e84ffe83a0961bb5991d95 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
index ee948ea..dfaa03c 100644
--- a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -25,8 +25,10 @@
<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>
--
Gitblit v1.8.0