From 0a4fbcd9d997005bda2b5ac5dc9daa586342d7db Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 14:43:11 +0800
Subject: [PATCH] 任务数量统计
---
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 | 10 +++++-----
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, 11 insertions(+), 11 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 42b73bb..822307a 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -256,8 +256,8 @@
* @return
*/
@GetMapping("/selectNum")
- public R selectNum(String serid,String jurisdiction) {
- return R.data(taskqdService.selectNum(serid, jurisdiction));
+ public R selectNum(String serid,String jurisdiction,String workjurisdiction) {
+ return R.data(taskqdService.selectNum(serid, jurisdiction,workjurisdiction));
}
@GetMapping("/startTask")
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 6d9bcd8..54be1dd 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -40,6 +40,6 @@
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
- Integer selectNum(String serid,String jurisdiction);
+ 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 136b3ca..85052d2 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -85,15 +85,15 @@
</if>
</select>
- <select id="selectNum" resultType="java.lang.Integer">
- SELECT COUNT(*) as num
+ <select id="selectNum" resultType="java.util.HashMap">
+ 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})
+ 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">
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 b6213cf..2de508b 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -39,6 +39,6 @@
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
- Integer selectNum(String serid,String jurisdiction);
+ 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 1166cae..ea1100d 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
@@ -62,8 +62,8 @@
}
@Override
- public Integer selectNum(String serid, String jurisdiction) {
- return baseMapper.selectNum(serid, jurisdiction);
+ public List<Map<String, Object>> selectNum(String serid, String jurisdiction,String workjurisdiction) {
+ return baseMapper.selectNum(serid, jurisdiction,workjurisdiction);
}
@Override
--
Gitblit v1.9.3