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/SubtaskService.kt | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/SubtaskService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/SubtaskService.kt index 0359ae8..1899e56 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/SubtaskService.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/SubtaskService.kt @@ -2,6 +2,7 @@ import cn.flightfeather.supervision.domain.ds1.entity.Subtask import cn.flightfeather.supervision.lightshare.vo.* +import java.time.LocalDateTime interface SubtaskService { @@ -12,6 +13,12 @@ fun save(subtask: Subtask): Int fun update(subtask: Subtask): Int + + /** + * 鍙樻洿宸℃煡浠诲姟鐘舵�� + * 鎵ц浠诲姟鎴栫粨鏉熶换鍔� + */ + fun changeStatus(subtask: Subtask): Int fun delete(id: String): Int @@ -42,5 +49,13 @@ fun findByDate(date: String, userId: String): List<SubtaskVo> - fun getByTopTaskAndDate(topTaskId: String, startTime: String, endTime: String, sceneTypeId: Int? = null): List<SubtaskVo> + fun getByTopTaskAndDate(topTaskId: String, startTime: String?, endTime: String?, sceneTypeId: Int? = null): List<Subtask> + + fun getTaskProgressByArea(areaVo: AreaVo): List<TaskProgressVo> + + fun getSummary(topTaskId: String, sceneTypeId: Int? = null): List<SubTaskSummary> + + fun getByScene(sceneId: String, startTime: LocalDateTime?, endTime: LocalDateTime?): List<SubTaskSummary> + + fun getSummaryByArea(areaVo: AreaVo): List<SubTaskSummary> } \ No newline at end of file -- Gitblit v1.9.3