From b157e41411b77abcbb0e9d3d59fabc1d951b47ad Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:36:05 +0800
Subject: [PATCH] fix：立行立改增加经纬度
---
screen-api/src/main/resources/mapper/AllocationMapper.xml | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 6753aa6..61f2f99 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -27,23 +27,32 @@
<result column="check_time" property="checkTime" />
<result column="state" property="state" />
<result column="invalid_reason" property="invalidReason" />
+ <result column="key_point" property="keyPoint" />
+ <result column="latitude" property="latitude" />
+ <result column="longitude" property="longitude" />
+ <result column="address" property="address" />
+ <result column="name" property="name" />
</resultMap>
<!-- ��������������������� -->
<sql id="Base_Column_List">
- allocation_id, allocation_num, escalation_type, escalation_time, pollute_position, unit_id, pollute_type, change_type, change_day, escalation_unit_id, escalation_name, investigation_type, problem_describe, is_change, change_describe, change_name, change_time, check_score, check_describe, check_name, check_time, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time
+ allocation_id, allocation_num, escalation_type, escalation_time, pollute_position, unit_id, pollute_type, change_type, change_day, escalation_unit_id, escalation_name, investigation_type, problem_describe, is_change, change_describe, change_name, change_time, check_score, check_describe, check_name, check_time, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time,latitude,longitude,address,name
</sql>
<!-- ��������������������� -->
<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,allocation.latitude,allocation.longitude,allocation.address,allocation.name
</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>
@@ -67,14 +76,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