From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/mapper/AllocationMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 8572d20..a51cb05 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -43,8 +43,12 @@
<select id="extOne" resultType="com.moral.api.pojo.ext.allocation.AllocationExt">
SELECT
- <include refid="Allocation_Column_List"/>
+ <include refid="Allocation_Column_List"/>,t1.unit_name as unitName,t5.dataValue as polluteTypeName
FROM allocation allocation
+ left join responsibility_unit t1 on t1.unit_id = allocation.unit_id
+ left join (SELECT t3.dataKey,t3.dataValue FROM sys_dict_data t3
+ LEFT JOIN sys_dict_type t4 on t4.id = t3.dict_type_id
+ where t4.name = 'contaminate') t5 on t5.dataKey = allocation.pollute_type
where allocation.allocation_id = #{id} and allocation.is_del = 0
</select>
--
Gitblit v1.8.0