From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 18 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 6c4387e..4ab84c8 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -4,28 +4,123 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.BaseCase">
- <id column="id" property="id" />
- <result column="code" property="code" />
- <result column="event_source" property="eventSource" />
- <result column="category" property="category" />
- <result column="street_id" property="streetId" />
- <result column="community_id" property="communityId" />
- <result column="site" property="site" />
- <result column="longitude" property="longitude" />
- <result column="latitude" property="latitude" />
- <result column="alarm_time" property="alarmTime" />
- <result column="create_user" property="createUser" />
- <result column="state" property="state" />
- <result column="handling_opinion" property="handlingOpinion" />
- <result column="remark" property="remark" />
- <result column="audit_opinion" property="auditOpinion" />
- <result column="final_opinion" property="finalOpinion" />
- <result column="create_time" property="createTime" />
+ <id column="id" property="id"/>
+ <result column="code" property="code"/>
+ <result column="event_source" property="eventSource"/>
+ <result column="category" property="category"/>
+ <result column="street_id" property="streetId"/>
+ <result column="community_id" property="communityId"/>
+ <result column="site" property="site"/>
+ <result column="longitude" property="longitude"/>
+ <result column="latitude" property="latitude"/>
+ <result column="alarm_time" property="alarmTime"/>
+ <result column="create_user" property="createUser"/>
+ <result column="state" property="state"/>
+ <result column="handling_opinion" property="handlingOpinion"/>
+ <result column="remark" property="remark"/>
+ <result column="audit_opinion" property="auditOpinion"/>
+ <result column="final_opinion" property="finalOpinion"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+ <resultMap type="com.ycl.entity.caseHandler.BaseCase" id="CondMapResultMap" extends="BaseResultMap">
+ <result column="category_text" property="categoryText"/>
+ <result column="street_text" property="streetText"/>
+ <result column="community_text" property="communityText"/>
+ <result column="create_user_text" property="createUserText"/>
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="settingsResultMap" type="com.ycl.vo.IllegalBuildingSettingVO">
+ <id column="number" property="number"/>
+ <result column="type" property="type"/>
+ <result column="typeFirst" property="typeFirst"/>
+ <result column="typeSecond" property="typeSecond"/>
+ <result column="typeThird" property="typeThird"/>
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id, code, event_source, category, street_id, community_id, site, longitude, latitude, alarm_time, create_user, state, handling_opinion, remark, audit_opinion, final_opinion, create_time
+ id
+ , code, event_source, category, street_id, community_id, site, longitude, latitude, alarm_time, create_user, state, handling_opinion, remark, audit_opinion, final_opinion, create_time
</sql>
+ <select id="listViolationsPage" resultType="com.ycl.vo.casePool.CasePoolViolationVO">
+ SELECT
+ ubc.`id`,
+ ubc.`code`,
+ ubc.event_source,
+ uv.action_cause,
+ t3.name as category,
+ t4.name as type,
+ t5.region_name as street,
+ ubc.site,
+ ubc.alarm_time,
+ ubc.close_time
+ FROM
+ `ums_base_case` AS ubc
+ JOIN ums_violations AS uv ON ubc.id = uv.id
+ LEFT JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
+ LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
+ LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
+ <where>
+ <if test="state!=null">
+ ubc.state=#{state}
+ </if>
+ <if test="resource!=null">
+ and ubc.event_source=#{resource}
+ </if>
+ <if test="type!=null">
+ and ubc.category=#{type}
+ </if>
+ </where>
+
+ </select>
+
+ <select id="listIllegalBuildingsPage" resultType="com.ycl.vo.casePool.CasePoolIllegalBuildingVO">
+ SELECT
+ ubc.`id`,
+ ubc.`code`,
+ ubc.event_source,
+ t1.name as category,
+ ubc.site,
+ t2.region_name as community,
+ uib.building_high,
+ uib.building_width,
+ uib.building_length,
+ uib.building_area,
+ uib.materials
+ FROM
+ `ums_base_case` AS ubc
+ left JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
+ left JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
+ left JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
+ <where>
+ <if test="state!=null">
+ ubc.state=#{state}
+ </if>
+ <if test="resource!=null">
+ and ubc.event_source=#{resource}
+ </if>
+ <if test="type!=null">
+ and ubc.category=#{type}
+ </if>
+ </where>
+
+ </select>
+
+
+ <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
+ SELECT ubc.*,
+ udd.name category_text,
+ usr.region_name street_text,
+ usr2.region_name community_text,
+ ua.username create_user_text
+ FROM ums_base_case ubc
+ LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id and udd.type_code = '01'
+ LEFT JOIN ums_sccg_region usr on ubc.street_id = usr.id
+ LEFT JOIN ums_sccg_region usr2 on ubc.community_id = usr2.id
+ LEFT JOIN ums_admin ua on ubc.create_user = ua.id
+ WHERE ubc.`code` = #{code}
+ </select>
+
</mapper>
--
Gitblit v1.8.0