From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
index aabbe44..cffc885 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
@@ -85,6 +85,8 @@
INNER JOIN SM_PATROL_GROUP_ITEM I ON R.ITEM_ID = I.ID
WHERE R.IS_DELETED = 0 AND R.TASK_ID = #{taskId}
AND R.STATUS = 2
+ AND R.SOLUTION = 2
+ AND R.state = 0
GROUP BY I.GROUP_ID
)D ON D.GROUP_ID = I.GROUP_ID
WHERE R.IS_DELETED = 0 AND R.TASK_ID = #{taskId}
@@ -96,7 +98,7 @@
<resultMap id="patrolGroupDTO" type="cn.gistack.sm.patrol.dto.PatrolGroupDTO">
<id property="id" column="id"/>
<result property="name" column="gname"/>
- <collection property="patrolReportList" javaType="java.util.List" ofType="cn.gistack.sm.patrol.vo.PatrolReportVO">
+ <collection property="patrolRecordVOList" javaType="java.util.List" ofType="cn.gistack.sm.patrol.vo.PatrolRecordVO">
<result property="id" column="rId"/>
<result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
@@ -107,21 +109,32 @@
<result property="taskId" column="taskId"/>
<result property="solution" column="solution"/>
<result property="content" column="content"/>
- <result property="recordId" column="recordId"/>
</collection>
</resultMap>
<select id="getPatrolGroupDTO" resultMap="patrolGroupDTO">
- SELECT G.ID,G.NAME gname,
- R.ID rId, R.VIDEOS,R.IMAGES,R.STATUS,R.IS_DELETED,R.ITEM_ID itemId,R.record_id recordId,
- I.ITEMS_NAME itemsName,R.TASK_ID,R.SOLUTION,R.CONTENT FROM SM_PATROL_GROUP G
+ SELECT G.ID,
+ G.NAME AS gname,
+ R.ID AS rId,
+ R.VIDEOS,
+ R.IMAGES,
+ R.STATUS,
+ R.IS_DELETED,
+ R.ITEM_ID AS itemId,
+ I.ITEMS_NAME AS itemsName,
+ R.TASK_ID AS taskId ,
+ R.SOLUTION,
+ R.CONTENT
+ FROM SM_PATROL_GROUP G
LEFT JOIN SM_PATROL_GROUP_ITEM I ON I.GROUP_ID = G.ID
- LEFT JOIN SM_PATROL_REPORT R ON R.ITEM_ID = I.ID
+ LEFT JOIN SM_PATROL_RECORD R ON R.ITEM_ID = I.ID
WHERE G.IS_DELETED = 0
- AND R.STATUS = 2
+ AND R.STATUS = 2 AND R.state = 0 AND R.SOLUTION = 2
AND R.TASK_ID = #{taskId}
</select>
+
+
<select id="getPatrolGroupByTaskId" resultType="cn.gistack.sm.patrol.entity.PatrolGroup">
SELECT G.ID,G.NAME FROM SM_PATROL_GROUP G
LEFT JOIN SM_PATROL_GROUP_ITEM I ON I.GROUP_ID = G.ID
@@ -130,4 +143,24 @@
AND R.STATUS = 2
AND R.TASK_ID = #{taskId}
</select>
+ <select id="getGroupDTORecord" resultMap="patrolGroupDTO">
+ SELECT G.ID,
+ G.NAME AS gname,
+ R.ID AS rId,
+ R.VIDEOS,
+ R.IMAGES,
+ R.STATUS,
+ R.IS_DELETED,
+ R.ITEM_ID AS itemId,
+ I.ITEMS_NAME AS itemsName,
+ R.TASK_ID AS taskId ,
+ R.SOLUTION,
+ R.CONTENT
+ FROM SM_PATROL_GROUP G
+ LEFT JOIN SM_PATROL_GROUP_ITEM I ON I.GROUP_ID = G.ID
+ LEFT JOIN SM_PATROL_RECORD R ON R.ITEM_ID = I.ID
+ WHERE G.IS_DELETED = 0
+ AND R.STATUS = 2
+ AND R.TASK_ID = #{taskId}
+ </select>
</mapper>
--
Gitblit v1.9.3