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.java | 1 +
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java | 1 +
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 9 +++++++++
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 12 ++++++++++++
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java | 5 +++++
5 files changed, 28 insertions(+), 0 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 0dd531f..16d8063 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -414,6 +414,18 @@
}
/**
+ * 查询所有任务轨迹以及人员轨迹
+ * @return
+ */
+ @GetMapping("/queryAllTrar")
+ public R queryAllTrar() {
+ List<Map<String, Object>> allTask = taskqdService.allTask();
+
+
+ return R.data(allTask);
+ }
+
+ /**
* @param nowTime 当前时间
* @param startTime 开始时间
* @param endTime 结束时间
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 70a5b51..c8028ee 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -41,6 +41,7 @@
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
List<Map<String, Object>> taskCount(String id,String type);
+ List<Map<String, Object>> allTask();
List<TaskqdVO> getlist(String id,String type);
List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
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 9e3ac8e..3986031 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -93,6 +93,15 @@
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">
SELECT u.*,
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 5e027f1..f0575f9 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -40,6 +40,7 @@
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
List<Map<String, Object>> taskCount(String id,String type);
+ List<Map<String, Object>> allTask();
List<TaskqdVO> getlist(String id,String type);
List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
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 88d04a3..641c1e6 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
@@ -64,6 +64,11 @@
public List<Map<String, Object>> taskCount(String id,String type) {
return baseMapper.taskCount(id,type);
}
+
+ @Override
+ public List<Map<String, Object>> allTask() {
+ return baseMapper.allTask();
+ }
@Override
public List<TaskqdVO> getlist(String id,String type) {
return baseMapper.getlist(id,type);
--
Gitblit v1.9.3