From 438efb11bf04a3c0ebe6d29e54597b55d881d320 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 06 Jan 2022 11:43:45 +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 | 8 ++++++++
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 15 +++++++++++++++
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java | 10 ++++++----
5 files changed, 33 insertions(+), 4 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 b644d87..ddf7314 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -120,6 +120,19 @@
return R.status(taskqdService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 分页
+ */
+ @GetMapping("/queryReceiver")
+ @ApiOperation(value = "分页", notes = "传入task")
+ public R queryReceiver(Taskqd taskqd, Query query) {
+ String sreid = taskqd.getSerid();
+ if(sreid.charAt(sreid.length()-1) == ',') { //s.length()-1获取字符串最后一位字符的索引，传入charAt方法获取索引对应的字符，判断是否为逗号
+ sreid = sreid.substring(0, sreid.length()-1);
+ }
+ return R.data(taskqdService.queryReceiver(sreid));
+ }
+
/**
* 抢单
@@ -173,6 +186,8 @@
}
+
+
/**
* 查询任务
* @param type
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 9ca0151..08565ff 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -25,6 +25,7 @@
import org.springblade.modules.taskqd.vo.TaskqdVO;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -36,5 +37,6 @@
//抢单任务
void updatet(Integer id, Integer num, String serid);
List<Taskqd> selectList(Integer id);
+ List<Map<String, Object>> queryReceiver(String serid);
List<TaskqdVO> selectLi(String type, String serid);
}
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 ed3dd0a..30e0e02 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -35,6 +35,14 @@
where id = #{id}
</select>
+ <select id="queryReceiver" resultType="java.util.HashMap">
+ SELECT
+ *
+ FROM
+ blade_user
+ WHERE
+ id in ( ${serid} )
+ </select>
<select id="selectLi" resultMap="taskResultMap">
SELECT A.*,IFNULL(B.num,0) as nums FROM (
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 983e037..810e1ef 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -25,6 +25,7 @@
import org.springblade.modules.taskqd.vo.TaskqdVO;
import java.util.List;
+import java.util.Map;
/**
* 服务类
@@ -35,5 +36,6 @@
public interface ITaskqdService extends IService<Taskqd> {
void updatet(Integer id, Integer num, String serid);
List<Taskqd> selectList(Integer id);
+ List<Map<String, Object>> queryReceiver(String serid);
List<TaskqdVO> selectLi(String type, String serid);
}
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 22fbef9..952528d 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
@@ -16,11 +16,7 @@
*/
package org.springblade.modules.taskqd.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.task.entity.Task;
-import org.springblade.modules.task.mapper.TaskMapper;
-import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.taskqd.entity.Taskqd;
import org.springblade.modules.taskqd.mapper.TaskqdMapper;
import org.springblade.modules.taskqd.service.ITaskqdService;
@@ -28,6 +24,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* 服务实现类
@@ -50,6 +47,11 @@
}
@Override
+ public List<Map<String, Object>> queryReceiver(String serid) {
+ return baseMapper.queryReceiver(serid);
+ }
+
+ @Override
public List<TaskqdVO> selectLi(String type, String serid) {
return baseMapper.selectLi(type, serid);
}
--
Gitblit v1.9.3