From 90615ce702dde7f1d8fed373d8f3a96796ef1f2d Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 十一月 2024 09:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-recheck-1114'
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt
index 5ffa7ac..b656fe3 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt
@@ -1,10 +1,8 @@
package cn.flightfeather.supervision.lightshare.service
import cn.flightfeather.supervision.domain.ds1.entity.Task
-import cn.flightfeather.supervision.lightshare.vo.DayTaskProgressVo
-import cn.flightfeather.supervision.lightshare.vo.RankVo
-import cn.flightfeather.supervision.lightshare.vo.TaskFrequencyVo
-import cn.flightfeather.supervision.lightshare.vo.TaskVo
+import cn.flightfeather.supervision.lightshare.vo.*
+import org.springframework.web.bind.annotation.RequestBody
import java.util.*
interface TaskService {
@@ -15,6 +13,8 @@
fun findAll(): List<TaskVo>
fun save(task: Task): Int
+
+ fun create(task: Task): Task
fun update(task: Task): Int
@@ -40,7 +40,7 @@
fun getDayTaskByTaskID(taskid: String): List<TaskVo>
- fun findByDate(date: String): TaskVo
+ fun findByDate(topTaskId: String, date: String): TaskVo
fun getTaskProgress(userid: String): List<TaskVo>//鑾峰彇椤跺眰浠诲姟瀵瑰簲鐨勫瓙浠诲姟瀹屾垚閲�
@@ -52,4 +52,12 @@
fun getByDistrictCode(districtCode: String, date: Date):List<TaskVo>
+ fun findTask(areaVo: AreaVo):List<Task?>
+
+ /**
+ * 鏌ユ壘鎬讳换鍔″畬鎴愭儏鍐�
+ * @param areaVo 绛涢�夋潯浠�
+ */
+ fun findTaskProgress(areaVo: AreaVo): List<TaskProgressVo?>
+
}
\ No newline at end of file
--
Gitblit v1.9.3