From fcefe41e05439f548a58c7e5b6aa6e58f7b80ada Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期一, 23 十二月 2024 11:57:46 +0800
Subject: [PATCH] 1. 新增接口网格数据excel模板、网格数据excel导入 2. 接口解析网格数据抛出相关excel报错信息 3. FileExchange.kt新增excel转换到GridDataDetail列表方法 4. 新增导入excel的单元测试代码
---
src/main/kotlin/com/flightfeather/uav/domain/repository/SegmentInfoRep.kt | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/domain/repository/SegmentInfoRep.kt b/src/main/kotlin/com/flightfeather/uav/domain/repository/SegmentInfoRep.kt
index b5daa84..de6ef79 100644
--- a/src/main/kotlin/com/flightfeather/uav/domain/repository/SegmentInfoRep.kt
+++ b/src/main/kotlin/com/flightfeather/uav/domain/repository/SegmentInfoRep.kt
@@ -3,6 +3,8 @@
import com.flightfeather.uav.domain.entity.SegmentInfo
import com.flightfeather.uav.domain.mapper.SegmentInfoMapper
import org.springframework.stereotype.Repository
+import tk.mybatis.mapper.entity.Example
+import java.time.LocalDateTime
/**
* 杞ㄨ抗鍒嗛殧鏁版嵁搴撴搷浣�
@@ -19,4 +21,24 @@
fun findList(segmentInfo: SegmentInfo): List<SegmentInfo?> {
return segmentInfoMapper.select(segmentInfo)
}
+
+ /**
+ * 鏌ヨ鏃舵鎵�娑夊強鐨勬墍鏈夎矾娈�
+ *
+ */
+ fun findPeriod(sTime: LocalDateTime?, eTime: LocalDateTime?): List<SegmentInfo?> {
+ return segmentInfoMapper.selectByExample((Example(SegmentInfo::class.java).apply {
+ createCriteria().andLessThanOrEqualTo("startTime", sTime)
+ .andGreaterThanOrEqualTo("endTime", sTime)
+ or(
+ createCriteria().andLessThanOrEqualTo("startTime", eTime)
+ .andGreaterThanOrEqualTo("endTime", eTime)
+ )
+ or(
+ createCriteria().andGreaterThanOrEqualTo("startTime", sTime)
+ .andLessThanOrEqualTo("endTime", eTime)
+ )
+ orderBy("startTime")
+ }))
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3