admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-07-14 09:58:35 +08:00
parent 7598cb0b26
commit 68635136cb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml
View File

@ -26,6 +26,7 @@
<if test="endTime != null and endTime != ''">
AND a.end_time &lt;=CONCAT(DATE_FORMAT(#{endTime},'%Y-%m-%d'),' 23:59:59')
</if>
order by a.add_time desc
</select>
<select id="queryTodayWorkCycleStatusStatistics"

4
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/UavVideoServiceImpl.java
View File

@ -36,9 +36,9 @@ public class UavVideoServiceImpl extends ServiceImpl<UavVideoMapper, UavVideo> i
.like(CharSequenceUtil.isNotBlank(uavVideoQo.getVideoUrl()), UavVideo::getVideoUrl, uavVideoQo.getVideoUrl())
.eq(CharSequenceUtil.isNotBlank(uavVideoQo.getProjectSn()), UavVideo::getProjectSn, uavVideoQo.getProjectSn())
// 拍摄时间 yyyy-MM-dd HH:mm:ss 之后
.ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()) ? DateUtil.endOfDay(DateUtil.parse(uavVideoQo.getStartShootingTime())) : null)
.ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()) ? DateUtil.beginOfDay(DateUtil.parse(uavVideoQo.getStartShootingTime())) : null)
// 拍摄时间 yyyy-MM-dd HH:mm:ss 之前
.le(CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()) ? DateUtil.beginOfDay(DateUtil.parse(uavVideoQo.getEndShootingTime())) : null)
.le(CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()) ? DateUtil.endOfDay(DateUtil.parse(uavVideoQo.getEndShootingTime())) : null)
// 创建时间 yyyy-MM-dd HH:mm:ss 之后
.ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartCreateTime()), UavVideo::getCreateTime, uavVideoQo.getStartCreateTime())
// 创建时间 yyyy-MM-dd HH:mm:ss 之前