From e95773cc4e824e616874f879f93db78b17455257 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 13 Jun 2022 16:40:44 +0800
Subject: [PATCH] 1、任务轨迹查询增加
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index e9b25bf..3986031 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -73,7 +73,7 @@
<!--任务统计-->
<select id="selectList" resultMap="taskResultMap">
- select jnum, num, serid, team
+ select jnum, num, serid, team ,time,endtime
from sys_taskqd
where id = #{id}
</select>
@@ -92,6 +92,15 @@
WHERE
serid LIKE concat("%",#{id},"%")
AND ( rtype = "0" OR rtype = "2" )
+ </select>
+ <select id="allTask" resultType="java.util.HashMap">
+ SELECT
+ *
+ FROM
+ sys_taskqd
+ WHERE 1 = 1
+ AND ( rtype = "0" OR rtype = "2" )
+
</select>
<select id="queryReceiver" resultType="java.util.HashMap">
@@ -127,9 +136,10 @@
qd.rtype = "2"
and qd.tasktype=#{tasktype}
and (!find_in_set(#{serid}, serid) OR serid IS NULL )
- and (j.id =#{jurisdiction} or
+ and
+ ((j.id =#{jurisdiction} or
j.parent_id = #{jurisdiction}) or (j.id =#{workjurisdiction} or
- j.parent_id = #{workjurisdiction})
+ j.parent_id = #{workjurisdiction}))
</if>
) A LEFT JOIN (SELECT
COUNT(*)
@@ -145,10 +155,10 @@
(!find_in_set(#{serid}
, serid)
OR serid IS NULL )
- and (j.id =#{jurisdiction}
+ and ((j.id =#{jurisdiction}
or j.parent_id = #{jurisdiction})
or (j.id =#{workjurisdiction}
- or j.parent_id = #{workjurisdiction})
+ or j.parent_id = #{workjurisdiction}))
GROUP BY tasktype
</select>
--
Gitblit v1.9.3