From b8f6a34d1a1ff2b6247619190715cfe91552697b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 15:44:10 +0800
Subject: [PATCH] 1.任务类型
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java | 2 +-
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java | 2 +-
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 29 +++++++++++++++++++----------
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 4 ++--
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java | 4 ++--
5 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 05fd8c3..156f7e6 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -224,8 +224,8 @@
* @return
*/
@PostMapping("/selectLi")
- public R selectLi(String type, String serid, String jurisdiction) {
- List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction);
+ public R selectLi(String type, String serid, String jurisdiction,String workjurisdiction,String tasktype) {
+ List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction,workjurisdiction,tasktype);
for (int i = 0; i < list.size(); i++) {
Integer nums = list.get(i).getNums();
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
index 54be1dd..fba51d6 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -39,7 +39,7 @@
void updateRtype(String type,String rid);
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
- List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
+ List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
String querySerid(String rid);
}
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 a38cd73..c759795 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -58,10 +58,10 @@
</select>
<select id="queryReceiver" resultType="java.util.HashMap">
- SELECT u.* ,
- r.role_name
+ SELECT u.*,
+ r.role_name
FROM blade_user u
- LEFT JOIN ( SELECT id, role_name FROM blade_role ) r on u.role_id = r.id
+ LEFT JOIN (SELECT id, role_name FROM blade_role) r on u.role_id = r.id
WHERE u.id in (${serid})
</select>
@@ -69,15 +69,18 @@
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">
- find_in_set(#{serid}, serid)) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM sys_taskfk WHERE
+ find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) 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!='1372091709474910209'">
qd.jnum!=qd.num AND qd.rtype = "2"
+ and qd.tasktype=#{tasktype}
and (!find_in_set(#{serid}, serid) OR serid IS NULL )
and (j.id =#{jurisdiction} or
- j.parent_id = #{jurisdiction})
+ j.parent_id = #{jurisdiction}) or (j.id =#{workjurisdiction} or
+ j.parent_id = #{workjurisdiction})
</if>
) A LEFT JOIN (SELECT
COUNT(*)
@@ -86,17 +89,23 @@
</select>
<select id="selectNum" resultType="java.util.HashMap">
- SELECT COUNT(*) as num,tasktype
+ SELECT COUNT(*) as num, tasktype
FROM sys_taskqd qd
LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction
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})
- or (j.id =#{workjurisdiction} or j.parent_id = #{workjurisdiction})
+ (!find_in_set(#{serid}
+ , serid)
+ OR serid IS NULL )
+ and (j.id =#{jurisdiction}
+ or j.parent_id = #{jurisdiction})
+ or (j.id =#{workjurisdiction}
+ or j.parent_id = #{workjurisdiction})
GROUP BY tasktype
</select>
<select id="querySerid" resultType="java.lang.String">
- SELECT serid from sys_taskqd where id = #{rid}
+ SELECT serid
+ from sys_taskqd
+ where id = #{rid}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
index 2de508b..11a6d12 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -38,7 +38,7 @@
void updateRtype(String type,String rid);
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
- List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
+ List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
String querySerid(String rid);
}
diff --git a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
index ea1100d..66da21f 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
@@ -57,8 +57,8 @@
}
@Override
- public List<TaskqdVO> selectLi(String type, String serid,String jurisdiction) {
- return baseMapper.selectLi(type, serid,jurisdiction);
+ public List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype) {
+ return baseMapper.selectLi(type, serid,jurisdiction,workjurisdiction,tasktype);
}
@Override
--
Gitblit v1.9.3