From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index 1e99b7f..671122f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -6,10 +6,12 @@
     <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
         SELECT
         spt.*,spt2.name as patrolTypeName,
-        route.ROUTE_COORDINATES routeRange
+        route.ROUTE_COORDINATES routeRange,
+        u.real_name toUserName
         FROM sm_patrol_task spt
         left join sm_patrol_type spt2 on spt.task_type = spt2.id
         LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
+        LEFT JOIN blade_user u ON u.id = spt.to_user_id
         WHERE spt.is_deleted = 0
         <if test="patrolTask.title !=null and patrolTask.title!=''">
             AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
@@ -22,6 +24,51 @@
         </if>
         <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
             AND spt.project_id = #{patrolTask.projectId}
+        </if>
+        <if test="patrolTask.reservoirName !=null and patrolTask.reservoirName !='' ">
+            AND spt.reservoir_name LIKE CONCAT('%',#{patrolTask.reservoirName},'%')
+        </if>
+        <if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
+            AND spt.to_user_id = #{patrolTask.toUserId}
+        </if>
+        <if test="patrolTask.state != null and patrolTask.state !=''">
+            AND spt.state = #{patrolTask.state}
+        </if>
+    </select>
+    <!--获取全部-->
+    <select id="getAll" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
+        SELECT
+        spt.*,spt2.name as patrolTypeName,
+        route.ROUTE_COORDINATES routeRange,
+        u.real_name toUserName
+        FROM sm_patrol_task spt
+        left join sm_patrol_type spt2 on spt.task_type = spt2.id
+        LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
+        LEFT JOIN blade_user u ON u.id = spt.to_user_id
+        WHERE spt.is_deleted = 0
+        <if test="patrolTask.title !=null and patrolTask.title!=''">
+            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
+        </if>
+        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
+            AND DATE_FORMAT(spt.start_time,'%Y-%m-%d') &gt;= #{patrolTask.startTime}
+        </if>
+        <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
+            AND DATE_FORMAT(spt.end_time,'%Y-%m-%d') &lt;= #{patrolTask.endTime}
+        </if>
+        <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
+            AND spt.project_id = #{patrolTask.projectId}
+        </if>
+        <if test="patrolTask.reservoirName !=null and patrolTask.reservoirName !='' ">
+            AND spt.reservoir_name LIKE CONCAT('%',#{patrolTask.reservoirName},'%')
+        </if>
+        <if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
+            AND spt.to_user_id = #{patrolTask.toUserId}
+        </if>
+        <if test="patrolTask.state != null and patrolTask.state !=''">
+            AND spt.state = #{patrolTask.state}
+        </if>
+        <if test="patrolTask.finish == 2">
+            AND spt.state != 3
         </if>
     </select>
 
@@ -128,11 +175,12 @@
         where spt.id = #{id}
     </select>
     <select id="customizeGetById" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
-        SELECT T.ID,T.TITLE,T.TO_USER_ID,A.PROBLEM_COUNT,T.PROJECT_ID FROM SM_PATROL_TASK T
+        SELECT T.ID,T.TITLE,T.TO_USER_ID,A.PROBLEM_COUNT,T.PROJECT_ID,T.CONTENT,T.STATE FROM SM_PATROL_TASK T
         LEFT JOIN (
             SELECT COUNT(*) PROBLEM_COUNT,R.TASK_ID FROM SM_PATROL_REPORT R WHERE R.TASK_ID = #{id} AND R.STATUS = 2 GROUP BY R.TASK_ID
         )A ON A.TASK_ID = T.ID
         WHERE T.ID = #{id}
         AND T.IS_DELETED = 0
     </select>
+
 </mapper>

--
Gitblit v1.9.3