From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt index 145fddb..390cc08 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/mapper/SubtaskMapper.kt @@ -1,12 +1,11 @@ package cn.flightfeather.supervision.domain.ds1.mapper +import cn.flightfeather.supervision.domain.ds1.entity.Scense import cn.flightfeather.supervision.domain.ds1.entity.Subtask import cn.flightfeather.supervision.domain.util.MyMapper -import cn.flightfeather.supervision.lightshare.vo.SubTaskSearchResultVo2 -import cn.flightfeather.supervision.lightshare.vo.SubTaskSummary -import cn.flightfeather.supervision.lightshare.vo.SubtaskSearchResultVo -import cn.flightfeather.supervision.lightshare.vo.SubtaskVo +import cn.flightfeather.supervision.lightshare.vo.* import org.apache.ibatis.annotations.Mapper +import java.time.LocalDateTime import java.util.* @Mapper @@ -21,4 +20,11 @@ fun selectByTopTask2(topTaskId: String, sceneTypeId: Int? = null): List<Subtask> fun getSummary(topTaskId: String, sceneTypeId: Int?): List<SubTaskSummary> + + // 鏍规嵁鍖哄煙鑼冨洿绛涢�� + fun getSummaryByArea(areaVo: AreaVo): List<SubTaskSummary> + + fun getSummaryByScene(sceneId: String, startTime: LocalDateTime?, endTime: LocalDateTime?): List<SubTaskSummary> + + fun findSubTasksByProType(topTaskId: String, sceneTypeId: String, proType: String): List<Subtask> } \ No newline at end of file -- Gitblit v1.9.3