From 424270342b771d0093549048894d9e04a41493eb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 30 Jan 2024 11:44:15 +0800
Subject: [PATCH] 九小场所优化
---
src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml | 138 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 105 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
index 6c8adfb..1a3bd82 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
@@ -7,13 +7,19 @@
<result column="id" property="id"/>
<result column="house_code" property="houseCode"/>
<result column="remark" property="remark"/>
- <result column="image_urls" property="imageUrls"/>
<result column="signature_path" property="signaturePath"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="is_deleted" property="isDeleted"/>
+ <result column="place_name" property="placeName"/>
+ <result column="location" property="location"/>
+ <result column="grid_name" property="gridName"/>
+ <result column="principal" property="principal"/>
+ <result column="principal_phone" property="principalPhone"/>
+ <result column="town_name" property="streetName"/>
+ <result column="village_name" property="communityName"/>
- <collection property="patrolRecordVOList" column="id" select="selectTaskRepairStepList"
+ <collection property="patrolRecordVOList" column="id"
javaType="java.util.List" ofType="org.springblade.modules.patrol.entity.PatrolRecord"
autoMapping="true">
<id property="placeCheckId" column="id"/>
@@ -22,28 +28,80 @@
<!--自定义分页查询-->
<select id="selectPlaceCheckPage" resultMap="placeCheckResultMap">
- select * from jczz_place_check where is_deleted = 0
+ SELECT
+ jpc.*,
+ jp.place_name,
+ jp.location,
+ jg.grid_name,
+ jp.principal,
+ jp.principal_phone,
+ br.town_name ,
+ br.village_name
+ FROM
+ jczz_place_check jpc
+ LEFT JOIN jczz_place jp ON jpc.house_code = jp.house_code
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
+ LEFT JOIN blade_region br ON br.`code` = jg.community_code
+ where jpc.is_deleted = 0
<if test="placeCheck.houseCode!=null and placeCheck.houseCode!=''">
- and house_code = #{placeCheck.houseCode}
+ and jpc.house_code = #{placeCheck.houseCode}
</if>
+
+ <if test="placeCheck.streetName!=null and placeCheck.streetName!=''">
+ and br.town_name like concat('%', #{placeCheck.streetName},'%')
+ </if>
+
+ <if test="placeCheck.communityName!=null and placeCheck.communityName!=''">
+ and br.village_name like concat('%', #{placeCheck.communityName},'%')
+ </if>
+
+ <if test="placeCheck.gridName!=null and placeCheck.gridName!=''">
+ and jg.grid_name like concat('%', #{placeCheck.gridName},'%')
+ </if>
+
+ <if test="placeCheck.placeName!=null and placeCheck.placeName!=''">
+ and jp.place_name like concat('%', #{placeCheck.placeName},'%')
+ </if>
+
+ <if test="placeCheck.principal!=null and placeCheck.principal!=''">
+ and jp.principal like concat('%', #{placeCheck.principal},'%')
+ </if>
+
+ <if test="placeCheck.principalPhone!=null and placeCheck.principalPhone!=''">
+ and jp.principal_phone like concat('%', #{placeCheck.principalPhone},'%')
+ </if>
+
<if test="placeCheck.startTime!=null and placeCheck.startTime!=''">
- and date_format(create_time,'%Y-%m-%d') >= #{placeCheck.startTime}
+ and date_format(jpc.create_time,'%Y-%m-%d') >= #{placeCheck.startTime}
</if>
<if test="placeCheck.endTime!=null and placeCheck.endTime!=''">
- and date_format(create_time,'%Y-%m-%d') <= #{placeCheck.endTime}
+ and date_format(jpc.create_time,'%Y-%m-%d') <= #{placeCheck.endTime}
</if>
</select>
-<!-- <resultMap type="org.springblade.modules.dto.PlaceCheckDTO" id="PlaceCheckDTOResult">-->
-<!-- <result property="id" column="id" />-->
-<!-- <result property="houseCode" column="house_code" />-->
-<!-- <result property="remark" column="remark" />-->
-<!-- <result property="signaturePath" column="signature_path" />-->
-<!-- <result property="createUser" column="create_user" />-->
-<!-- <result property="createTime" column="create_time" />-->
-<!-- <result property="isDeleted" column="is_deleted" />-->
-<!-- </resultMap>-->
+ <resultMap type="org.springblade.modules.place.dto.PlaceCheckDTO" id="PlaceCheckDTOResult">
+ <result property="id" column="id"/>
+ <result property="houseCode" column="house_code"/>
+ <result property="remark" column="remark"/>
+ <result property="signaturePath" column="signature_path"/>
+ <result property="createUser" column="create_user"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isDeleted" column="is_deleted"/>
+ <result column="place_name" property="placeName"/>
+ <result column="location" property="location"/>
+ <result column="grid_name" property="gridName"/>
+ <result column="principal" property="principal"/>
+ <result column="principal_phone" property="principalPhone"/>
+ <result column="town_name" property="streetName"/>
+ <result column="village_name" property="communityName"/>
+
+ <collection property="patrolRecordVOList" column="id"
+ javaType="java.util.List" ofType="org.springblade.modules.patrol.entity.PatrolRecord"
+ autoMapping="true">
+ <id property="placeCheckId" column="id"/>
+ </collection>
+ </resultMap>
<sql id="selectPlaceCheck">
select
@@ -58,25 +116,39 @@
jczz_place_check
</sql>
-<!-- <select id="selectPlaceCheckById" parameterType="long" resultMap="PlaceCheckDTOResult">-->
-<!-- <include refid="selectPlaceCheck"/>-->
-<!-- where-->
-<!-- id = #{id}-->
-<!-- </select>-->
+ <select id="selectPlaceCheckById" parameterType="long" resultMap="PlaceCheckDTOResult">
+ SELECT
+ jpc.*,
+ jp.place_name,
+ jp.location,
+ jg.grid_name,
+ jp.principal,
+ jp.principal_phone,
+ br.town_name ,
+ br.village_name
+ FROM
+ jczz_place_check jpc
+ LEFT JOIN jczz_place jp ON jpc.house_code = jp.house_code
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
+ LEFT JOIN blade_region br ON br.`code` = jg.community_code
+ where
+ jpc.is_deleted = 0
+ and jpc.id = #{id}
+ </select>
-<!-- <select id="selectPlaceCheckList" parameterType="org.springblade.modules.dto.PlaceCheckDTO" resultMap="PlaceCheckDTOResult">-->
-<!-- <include refid="selectPlaceCheck"/>-->
-<!-- <where>-->
-<!-- <if test="id != null "> and id = #{id}</if>-->
-<!-- <if test="houseCode != null and houseCode != ''"> and house_code = #{houseCode}</if>-->
-<!-- <if test="remark != null and remark != ''"> and remark = #{remark}</if>-->
-<!-- <if test="signaturePath != null and signaturePath != ''"> and signature_path = #{signaturePath}</if>-->
-<!-- <if test="createUser != null "> and create_user = #{createUser}</if>-->
-<!-- <if test="createTime != null "> and create_time = #{createTime}</if>-->
-<!-- <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>-->
-<!-- </where>-->
-<!-- </select>-->
-
+ <select id="selectPlaceCheckList" parameterType="org.springblade.modules.place.dto.PlaceCheckDTO"
+ resultMap="PlaceCheckDTOResult">
+ <include refid="selectPlaceCheck"/>
+ <where>
+ <if test="id != null ">and id = #{id}</if>
+ <if test="houseCode != null and houseCode != ''">and house_code = #{houseCode}</if>
+ <if test="remark != null and remark != ''">and remark = #{remark}</if>
+ <if test="signaturePath != null and signaturePath != ''">and signature_path = #{signaturePath}</if>
+ <if test="createUser != null ">and create_user = #{createUser}</if>
+ <if test="createTime != null ">and create_time = #{createTime}</if>
+ <if test="isDeleted != null ">and is_deleted = #{isDeleted}</if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3