From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 627b26a..671af4f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -3,14 +3,16 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.*;
import com.moral.api.mapper.HistorySecondUavMapper;
import com.moral.api.pojo.dto.uav.UAVQueryTimeSlotDTO;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
import com.moral.api.pojo.form.uav.UAVQueryTimeSlotForm;
import com.moral.api.service.HistorySecondUavService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceService;
+import com.moral.api.service.SysDictTypeService;
import com.moral.api.utils.UnitConvertUtils;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -49,6 +51,8 @@
@Autowired
SpecialDeviceService specialDeviceService;
@Autowired
+ private SysDictTypeService sysDictTypeService;
+ @Autowired
RedisTemplate redisTemplate;
@Override
@@ -84,6 +88,8 @@
public List<UAVQueryTimeSlotDTO> queryTimeSlot(UAVQueryTimeSlotForm form) {
//������
Integer organizationId = form.getOrganizationId();
+
+ List<Integer> integerList = sysDictTypeService.dateValueList(SysDictTypeEnum.SYS_SECOND_UAV_RANGE.getValue());
Date startDate = form.getStartDate();
Date endDate = form.getEndDate();
QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
@@ -94,6 +100,7 @@
childrenId.add(child.getId());
}
childrenId.add(organizationId);
+ childrenId.addAll(integerList);
wrapper.in("organization_id", childrenId);
//������������batch������������������������������������������������
wrapper.between("batch", startDate, endDate);
--
Gitblit v1.8.0