From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除

---
 src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

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 810e1ef..347b01b 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -18,12 +18,11 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import io.swagger.models.auth.In;
-import org.springblade.modules.task.entity.Task;
-import org.springblade.modules.task.vo.TaskVO;
 import org.springblade.modules.taskqd.entity.Taskqd;
+import org.springblade.modules.taskqd.excel.TaskExcel;
 import org.springblade.modules.taskqd.vo.TaskqdVO;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -34,8 +33,44 @@
  * @since 2020-08-06
  */
 public interface ITaskqdService extends IService<Taskqd> {
-	void updatet(Integer id, Integer num, String serid);
+	void updatet(Integer id, Integer num, String serid,String captain,String team);
+	void updateRtype(String type,String rid);
+	Boolean updateSerid(String type,String rid,String newteam,int newnum);
 	List<Taskqd> selectList(Integer id);
 	List<Map<String, Object>> queryReceiver(String serid);
-	List<TaskqdVO> selectLi(String type, String serid);
+	List<Map<String, Object>> taskCount(String id,String type);
+	List<Map<String, Object>> allTask();
+	List<TaskqdVO> getlist(String id,String type);
+	/**
+	 * 任务查询
+	 * @param type 任务状态 0:未开始  1:正在进行 2:已完成
+	 * @param serid 用户id
+	 * @param jurisdiction 辖区id
+	 * @param workjurisdiction 工作辖区
+	 * @param tasktype 任务状态
+	 * @return
+	 */
+	List<TaskqdVO> selectLi(Integer type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
+
+	List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
+	String querySerid(String rid);
+
+	List<Taskqd> countTaskByJur(String jurisdiction, String startTime, String period);
+
+	int getRealTime(String hdid);
+
+	/**
+	 * 自定义分页查询
+	 * @param taskqd
+	 * @param page
+	 * @return
+	 */
+    Object selectTaskQdPage(IPage<TaskqdVO> page, TaskqdVO taskqd);
+
+	/**
+	 * 导出任务数据
+	 * @param task
+	 * @return
+	 */
+	List<TaskExcel> exportTask(TaskqdVO task);
 }

--
Gitblit v1.9.3