From 1b77bee189766b0f5314cd4863593154d3fbf78e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 25 Feb 2022 14:06:59 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 51499f2..10ba1d8 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -23,6 +23,11 @@
<result column="publisher" property="publisher"/>
<result column="fid" property="fid"/>
<result column="fname" property="fname"/>
+ <result column="gather" property="gather"/>
+ <result column="gathername" property="gathername"/>
+ <result column="tasktype" property="tasktype"/>
+ <result column="phone" property="phone"/>
+ <result column="train" property="train"/>
</resultMap>
@@ -37,6 +42,11 @@
,team =#{param5}
</if>
where id = #{id}
+ </update>
+ <update id="updateRtype">
+ update sys_taskqd
+ SET rtype=#{type}
+ where id = #{rid}
</update>
@@ -56,15 +66,15 @@
<select id="selectLi" resultMap="taskResultMap">
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
- qd.jnum!=qd.num
<if test="type==0">
- and find_in_set(#{serid}, serid)) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM sys_taskfk WHERE
+ find_in_set(#{serid}, serid)) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM sys_taskfk WHERE
serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and !find_in_set(#{serid}
- , serid) and (j.id =#{jurisdiction} or
+ <if test="jurisdiction!='1372091709474910209'">
+ qd.jnum!=qd.num AND qd.rtype = "2"
+ and (!find_in_set(#{serid}, serid) OR serid IS NULL )
+ and (j.id =#{jurisdiction} or
j.parent_id = #{jurisdiction})
</if>
) A LEFT JOIN (SELECT
@@ -72,15 +82,19 @@
as num,hdid FROM sys_taskfk GROUP BY hdid) B ON A.id=B.hdid
</if>
</select>
+
<select id="selectNum" resultType="java.lang.Integer">
SELECT COUNT(*) as num
FROM sys_taskqd qd
LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction
- WHERE !find_in_set(#{serid}
- , serid)
- AND jnum!=num
+ WHERE jnum!=num AND qd.rtype = "2" AND
+ (!find_in_set(#{serid}, serid) OR serid IS NULL )
and (j.id =#{jurisdiction}
or
j.parent_id = #{jurisdiction})
</select>
+
+ <select id="querySerid" resultType="java.lang.String">
+ SELECT serid from sys_taskqd where id = #{rid}
+ </select>
</mapper>
--
Gitblit v1.9.3