From e38b0c2f6836e87e8cebed180d7f6bf2f1dd1fa3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 17:08:52 +0800
Subject: [PATCH] 任务取消
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 4b81f5d..e6a606d 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -49,6 +49,11 @@
where id = #{rid}
</update>
+ <update id="updateSerid">
+ update sys_taskqd
+ SET serid=#{serid}
+ where id = #{rid}
+ </update>
<!--日常任务列表-->
<select id="selectList" resultMap="taskResultMap">
@@ -69,18 +74,23 @@
SELECT A.*,IFNULL(B.num,0) as nums FROM (
select qd.* from sys_taskqd qd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1 AND
<if test="type==0">
+ (qd.rtype = "2" or qd.rtype = "0") AND
find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM
sys_taskfk WHERE
- serid=#{serid} AND qd.rtype = "0" GROUP BY hdid,serid) B ON A.id=B.hdid
+ serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==2">
+ qd.rtype = "1" AND
find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM
sys_taskfk WHERE
- serid=#{serid} AND qd.rtype = "1" GROUP BY hdid,serid) B ON A.id=B.hdid
+ serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
<if test="jurisdiction!='1372091709474910209'">
- qd.jnum!=qd.num AND qd.rtype = "2"
+ <if test="tasktype !=2">
+ qd.jnum!=qd.num AND
+ </if>
+ qd.rtype = "2"
and qd.tasktype=#{tasktype}
and (!find_in_set(#{serid}, serid) OR serid IS NULL )
and (j.id =#{jurisdiction} or
--
Gitblit v1.9.3