From a0196be7cc866778d14c04da454d65d02173b70d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 13 Nov 2023 10:44:06 +0800
Subject: [PATCH] 无人机 -巡航统计查询新增时间查询条件
---
src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml b/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml
index 90b955e..571caa1 100644
--- a/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml
+++ b/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml
@@ -40,4 +40,32 @@
ORDER BY job.create_time DESC
</select>
+ <select id="getLatest" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
+ SELECT job.* FROM wayline_job job
+ WHERE job.workspace_id = #{workspaceId}
+ <if test="queryParam.dockSn != null and queryParam.dockSn != '' ">
+ AND job.dock_sn = #{queryParam.dockSn}
+ </if>
+ AND job.status = 1
+ AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d') >= DATE(NOW())
+ AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE(NOW()) + INTERVAL 2 DAY
+ ORDER BY job.begin_time - NOW() ASC
+ LIMIT 1
+
+
+ </select>
+ <select id="patrolStatistics" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
+ SELECT
+ *
+ FROM
+ wayline_job
+ WHERE 1=1
+ and status = 3
+ <if test="queryTime != null and queryTime != ''">
+ and ( FROM_UNIXTIME( execute_time / 1000, '%Y' ) = #{queryTime} OR FROM_UNIXTIME( execute_time / 1000, '%Y-%m' ) = #{queryTime} )
+ </if>
+ <if test="workspaceId != null and workspaceId != ''">
+ and workspace_id = #{workspaceId}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3