From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
index 7c64b14..efd4e2d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -24,6 +24,7 @@
<result property="phone" column="phone"/>
<result property="toUserId" column="create_user"/>
<result property="toUserName" column="real_name"/>
+ <result property="taskName" column="taskName"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -35,7 +36,8 @@
<select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
SELECT
record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.update_time,record.solution,
- task.route_coordinates taskRoute,item.items_name itemsName,item.description
+ task.route_coordinates taskRoute,task.title taskName,
+ item.items_name itemsName,item.description
FROM SM_PATROL_RECORD record
LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
LEFT JOIN sm_patrol_task task ON task.id = record.task_id
@@ -98,13 +100,16 @@
AND r.task_id = #{taskId}
</select>
<select id="getByTaskIdAndGroupId" resultMap="selectPatrolRecordList">
- SELECT r.id,r.patrol_type,r.device_ids,r.images,r.videos,r.content,r.status,r.item_id,r.task_id,r.create_user,r.create_dept,r.solution,
+ SELECT c.group_id groupId,r.id,r.patrol_type,r.device_ids,r.images,r.videos,r.content,r.status,r.item_id,r.task_id,r.create_user,r.create_dept,r.solution,
C.items_name itemsName,C.description FROM SM_PATROL_RECORD r
RIGHT JOIN (
SELECT B.ID,B.GROUP_ID,B.ITEMS_NAME,B.DESCRIPTION
FROM SM_PATROL_GROUP A
INNER JOIN SM_PATROL_GROUP_ITEM B ON A.ID = B.GROUP_ID
- WHERE B.GROUP_ID = #{groupId}
+ WHERE 1=1
+ <if test="groupId != null and groupId !=''">
+ AND B.GROUP_ID = #{groupId}
+ </if>
ORDER BY B.GROUP_ID
)C ON C.ID = r.ITEM_ID
WHERE TASK_ID = #{taskId}
--
Gitblit v1.9.3