From 793d633513ad4d09d3398921ae73dca3bb2d9971 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 13 Dec 2023 17:14:00 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/resources/mapper/AllocationMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 098ebda..a51cb05 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,14 +37,18 @@
<!-- ��������������������� -->
<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>
<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