bug修复

This commit is contained in:
guo 2023-07-12 16:12:36 +08:00
parent 852e5e8b35
commit 46f4e8c448

View File

@ -10,6 +10,7 @@ import com.zhgd.xmgl.modules.bigdevice.entity.UavVideo;
import com.zhgd.xmgl.modules.bigdevice.entity.qo.UavVideoQO;
import com.zhgd.xmgl.modules.bigdevice.mapper.UavVideoMapper;
import com.zhgd.xmgl.modules.bigdevice.service.UavVideoService;
import com.zhgd.xmgl.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -35,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, uavVideoQo.getStartShootingTime())
.ge(CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getStartShootingTime()) ? DateUtil.endOfDay(DateUtil.parse(uavVideoQo.getStartShootingTime())) : null)
// 拍摄时间 yyyy-MM-dd HH:mm:ss 之前
.le(CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()), UavVideo::getShootingTime, uavVideoQo.getEndShootingTime())
.le(CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()), UavVideo::getShootingTime, CharSequenceUtil.isNotBlank(uavVideoQo.getEndShootingTime()) ? DateUtil.beginOfDay(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 之前