From ed0a71a11aeffcbb441d5a67e2a5663bd0f0e8ed Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 03 Apr 2023 08:57:42 +0800
Subject: [PATCH] 巡查项接口新增调整

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 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 aa20557..be80c42 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
@@ -2,22 +2,37 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.gistack.sm.patrol.mapper.PatrolTaskMapper">
 
-
-    <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
-        SELECT id,title,start_time,end_time,content,to_user_id,route_id,state,source,task_type,project_id
-        FROM sm_patrol_task
-        WHERE is_deleted = 0
+    <!--自定义分页查询-->
+    <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
+        SELECT
+        spt.*,
+        spt2.name as patrolTypeName
+        FROM sm_patrol_task spt
+        left join sm_patrol_type spt2 on spt.task_type = spt2.id
+        WHERE spt.is_deleted = 0
         <if test="patrolTask.title !=null and patrolTask.title!=''">
-            AND title LIKE CONCAT('%',#{patrolTask.title},'%')
+            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
         </if>
         <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
-            AND DATE_FORMAT(start_time,'%Y-%m-%d') &gt;= #{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(end_time,'%Y-%m-%d') &lt;= #{patrolTask.endTime}
+            AND DATE_FORMAT(spt.end_time,'%Y-%m-%d') &lt;= #{patrolTask.endTime}
         </if>
         <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
-            AND project_id = #{patrolTask.projectId}
+            AND spt.project_id = #{patrolTask.projectId}
         </if>
     </select>
+
+    <!--查询巡查人员统计数据信息-->
+    <select id="getPatrolTaskStatistic" resultType="cn.gistack.sm.patrol.vo.PatrolTaskStatisticsVO">
+        SELECT
+        spt.patrol_type as patrolType,
+        spt2.name as patrolTypeName,
+        count(*) as number
+        FROM BLADEX.sm_patrol_task spt
+        left join BLADEX.sm_patrol_type spt2 on spt.task_type = spt2.id
+        WHERE spt.is_deleted = 0
+        group by spt.task_type,spt2.name
+    </select>
 </mapper>

--
Gitblit v1.9.3