From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 31 十二月 2024 10:13:35 +0800
Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 7228a57..6046e69 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/TaskService.kt
@@ -14,6 +14,8 @@
 
     fun save(task: Task): Int
 
+    fun create(task: Task): Task
+
     fun update(task: Task): Int
 
     fun delete(id: String): Int
@@ -28,7 +30,7 @@
 
     fun getDayTaskList(taskVoList: List<TaskVo>, date: String, guid: String, userType: String): List<TaskVo>
 
-    fun getDayTask(taskId: String, userId: String, userType: String): List<DayTaskProgressVo>
+    fun getDayTask(taskId: String, userId: String?, userType: String): List<DayTaskProgressVo>
 
     fun findByName(name: String): TaskVo
 
@@ -38,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 +54,10 @@
 
     fun findTask(areaVo: AreaVo):List<Task?>
 
+    /**
+     * 鏌ユ壘鎬讳换鍔″畬鎴愭儏鍐�
+     * @param areaVo 绛涢�夋潯浠�
+     */
+    fun findTaskProgress(areaVo: AreaVo): List<TaskProgressVo?>
+
 }
\ No newline at end of file

--
Gitblit v1.9.3