From a7027110f93f7b902682611a695998d715f1c371 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 20 十月 2022 14:54:13 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 129 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 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..5f6896e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -4,28 +4,121 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<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.bo.casePool.CasePoolViolationDO">
+ SELECT
+ ubc.`id`,
+ ubc.`code`,
+ ubc.event_source,
+ uv.category_id,
+ uv.type_id,
+ uv.action_cause,
+ ubc.site,
+ ubc.street_id,
+ ubc.alarm_time,
+ ubc.close_time
+ FROM
+ `ums_base_case` AS ubc
+ JOIN ums_violations AS uv ON ubc.id = uv.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.bo.casePool.CasePoolIllegalBuildingDO">
+ SELECT
+ ubc.`id`,
+ ubc.`code`,
+ ubc.event_source,
+ uib.category_id,
+ ubc.site,
+ ubc.community_id,
+ uib.building_high,
+ uib.building_width,
+ uib.building_length,
+ uib.building_area,
+ uib.materials
+ FROM
+ `ums_base_case` AS ubc
+ JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_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