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 | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 79 insertions(+), 10 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 dc3c1bd..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
@@ -5,12 +5,13 @@
<!--自定义分页查询-->
<select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
SELECT
- spt.*,
- spt2.name as patrolTypeName,
- route.ROUTE_COORDINATES routeRange
+ 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},'%')
@@ -24,6 +25,51 @@
<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') >= #{patrolTask.startTime}
+ </if>
+ <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
+ AND DATE_FORMAT(spt.end_time,'%Y-%m-%d') <= #{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>
<!--查询巡查人员统计数据信息-->
@@ -32,8 +78,8 @@
spt.task_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
+ FROM sm_patrol_task spt
+ left join sm_patrol_type spt2 on spt.task_type = spt2.id
WHERE spt.is_deleted = 0
group by spt.task_type,spt2.name
</select>
@@ -84,6 +130,18 @@
<if test="patrolTask.routeId !=null and patrolTask.routeId !=''">
route_id = #{patrolTask.routeId},
</if>
+ <if test="patrolTask.realStartTime !=null and patrolTask.realStartTime !=''">
+ real_start_time = #{patrolTask.realStartTime},
+ </if>
+ <if test="patrolTask.realEndTime !=null and patrolTask.realEndTime !=''">
+ real_end_time = #{patrolTask.realEndTime},
+ </if>
+ <if test="patrolTask.mile !=null and patrolTask.mile !=''">
+ mile = #{patrolTask.mile},
+ </if>
+ <if test="patrolTask.problemCount !=null and patrolTask.problemCount !=''">
+ problem_count = #{patrolTask.problemCount},
+ </if>
update_time = #{patrolTask.updateTime}
where id=#{patrolTask.id}
</update>
@@ -92,17 +150,19 @@
<insert id="savePatrolTask">
INSERT INTO sm_patrol_task
(
- title,start_time,end_time,content,to_user_id,
+ id,title,start_time,end_time,content,to_user_id,
route_id,state,source,task_type,project_id,
+ create_dept,create_time,create_user,update_user,update_time,is_deleted,status,
patrol_group_item_id,route_coordinates
)
VALUES
(
- #{patrolTask.title},#{patrolTask.startTime},#{patrolTask.endTime},#{patrolTask.content},#{patrolTask.toUserId},
+ #{patrolTask.id},#{patrolTask.title},#{patrolTask.startTime},#{patrolTask.endTime},#{patrolTask.content},#{patrolTask.toUserId},
#{patrolTask.routeId},#{patrolTask.state},#{patrolTask.source},#{patrolTask.taskType},#{patrolTask.projectId},
- #{patrolTask.createDept},#{patrolTask.createTime},#{patrolTask.updateUser},
- #{patrolTask.patrolGroupItemId},dmgeo.ST_LineFromText(${patrolTask.routeCoordinates})
- );
+ #{patrolTask.createDept},#{patrolTask.createTime},#{patrolTask.createUser},#{patrolTask.updateUser},#{patrolTask.updateTime},
+ #{patrolTask.isDeleted},#{patrolTask.status},
+ #{patrolTask.patrolGroupItemId},dmgeo.ST_LineFromText(${patrolTask.routeCoordinates},0)
+ )
</insert>
<!--自定义查询详情-->
@@ -114,4 +174,13 @@
FROM sm_patrol_task spt
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,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