From 37d57abd8bc8aa69a2518f693a2c971de8a08859 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Sep 2023 19:26:43 +0800
Subject: [PATCH] 任务查询报错修改

---
 src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java |   68 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 2 deletions(-)

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..2d5ba6a 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,13 +16,16 @@
  */
 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.taskqd.entity.Taskqd;
+import org.springblade.modules.taskqd.excel.TaskExcel;
 import org.springblade.modules.taskqd.mapper.TaskqdMapper;
 import org.springblade.modules.taskqd.service.ITaskqdService;
 import org.springblade.modules.taskqd.vo.TaskqdVO;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -47,6 +50,11 @@
 	}
 
 	@Override
+	public Boolean updateSerid(String rid, String serid,String newteam,int newnum) {
+		return baseMapper.updateSerid(rid,serid,newteam,newnum);
+	}
+
+	@Override
 	public List<Taskqd> selectList(Integer id) {
 		return baseMapper.selectList(id);
 	}
@@ -55,10 +63,32 @@
 	public List<Map<String, Object>> queryReceiver(String serid) {
 		return baseMapper.queryReceiver(serid);
 	}
+	@Override
+	public List<Map<String, Object>> taskCount(String id,String type) {
+		return baseMapper.taskCount(id,type);
+	}
 
 	@Override
-	public List<TaskqdVO> selectLi(String type, String serid,String jurisdiction) {
-		return baseMapper.selectLi(type, serid,jurisdiction);
+	public List<Map<String, Object>> allTask() {
+		return baseMapper.allTask();
+	}
+	@Override
+	public List<TaskqdVO> getlist(String id,String type) {
+		return baseMapper.getlist(id,type);
+	}
+
+	/**
+	 * 任务查询
+	 * @param type 任务状态 0：未开始  1：正在进行 2：已完成
+	 * @param serid 用户id
+	 * @param jurisdiction 辖区id
+	 * @param workjurisdiction 工作辖区
+	 * @param tasktype 任务状态
+	 * @return
+	 */
+	@Override
+	public List<TaskqdVO> selectLi(Integer type, String serid,String jurisdiction,String workjurisdiction,String tasktype) {
+		return baseMapper.selectLi(type, serid,jurisdiction,workjurisdiction,tasktype);
 	}
 
 	@Override
@@ -70,4 +100,38 @@
 	public String querySerid(String rid) {
 		return baseMapper.querySerid(rid);
 	}
+
+	@Override
+	public List<Taskqd> countTaskByJur(String jurisdiction, String startTime, String period) {
+		return baseMapper.countTaskByJur(jurisdiction,startTime,period);
+	}
+
+	@Override
+	public int getRealTime(String hdid) {
+		return baseMapper.getRealTime(hdid);
+	}
+
+	/**
+	 * 自定义分页查询
+	 * @param taskqd
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public Object selectTaskQdPage(IPage<TaskqdVO> page, TaskqdVO taskqd) {
+		if (null!=taskqd.getIsPage()){
+			return baseMapper.selectTaskQdPage(null,taskqd);
+		}
+		return page.setRecords(baseMapper.selectTaskQdPage(page,taskqd));
+	}
+
+	/**
+	 * 导出任务数据
+	 * @param task
+	 * @return
+	 */
+	@Override
+	public List<TaskExcel> exportTask(TaskqdVO task) {
+		return baseMapper.selectTaskList(task);
+	}
 }

--
Gitblit v1.9.3