From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 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 eb34a83..f0d827b 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
@@ -19,9 +19,13 @@
<result column="principal_phone" property="principalPhone"/>
<result column="town_name" property="streetName"/>
<result column="village_name" property="communityName"/>
+ <result property="rectificationNoticeFlag" column="rectification_notice_flag" />
+ <result property="punishFlag" column="punish_flag" />
+ <result property="rectificationEndTime" column="rectification_end_time" />
+ <result property="punishRemark" column="punish_remark" />
- <collection property="placePoiLabelVOList" column="id" javaType="java.util.List" select="selectPlacePoiLabelList"
- ofType="org.springblade.modules.place.entity.PlacePoiLabel"
+ <collection property="placePoiLabelVOList" column="jpid" javaType="java.util.List" select="selectPlacePoiLabelList"
+ ofType="org.springblade.modules.place.vo.PlacePoiLabelVO"
autoMapping="true">
</collection>
@@ -32,16 +36,21 @@
</resultMap>
<select id="selectPlacePoiLabelList" parameterType="Long"
- resultType="org.springblade.modules.place.entity.PlacePoiLabel">
- select
- id,
- place_id,
- poi_code,
- type,
- color,
- remark
- from
- jczz_place_poi_label where place_id = #{id}
+ resultType="org.springblade.modules.place.vo.PlacePoiLabelVO">
+ SELECT
+ jppl.id,
+ jppl.place_id,
+ jppl.poi_code,
+ jppl.type,
+ jppl.color,
+ jppl.remark,
+ jc.category_name labelName
+ FROM
+ jczz_place_poi_label jppl
+ LEFT JOIN jczz_category jc ON jppl.poi_code = jc.category_no
+ WHERE
+ jppl.type = '3'
+ and place_id = #{jpid}
</select>
@@ -49,14 +58,17 @@
resultType="org.springblade.modules.patrol.entity.PatrolRecord">
select
id,
- item_id,
- place_check_id,
- state,
- remark,
- image_urls,
- create_user,
- create_time,
- is_deleted
+ item_id,
+ place_check_id,
+ state,
+ remark,
+ image_urls,
+ create_user,
+ create_time,
+ is_deleted,
+ rectification_image_urls,
+ rectification_remark,
+ rectification_time
from
jczz_patrol_record where place_check_id = #{id}
</select>
@@ -66,6 +78,7 @@
<select id="selectPlaceCheckPage" resultMap="placeCheckResultMap">
SELECT
jpc.*,
+ jp.id jpid,
jp.place_name,
jp.location,
jg.grid_name,
@@ -118,6 +131,7 @@
<if test="placeCheck.endTime!=null and placeCheck.endTime!=''">
and date_format(jpc.create_time,'%Y-%m-%d') <= #{placeCheck.endTime}
</if>
+
order by jpc.create_time desc
</select>
@@ -127,9 +141,14 @@
id,
house_code,
remark,
+ image_urls,
signature_path,
create_user,
create_time,
+ rectification_notice_flag,
+ punish_flag,
+ rectification_end_time,
+ punish_remark,
is_deleted
from
jczz_place_check
@@ -138,6 +157,7 @@
<select id="selectPlaceCheckById" parameterType="long" resultMap="placeCheckResultMap">
SELECT
jpc.*,
+ jp.id jpid,
jp.place_name,
jp.location,
jg.grid_name,
--
Gitblit v1.9.3