From fa2d52ee4dc866fb7ae3708e8fcabd9315b306cf Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Mar 2024 17:19:30 +0800
Subject: [PATCH] fix:走航报告补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 099b1a8..2c5e931 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -497,9 +497,11 @@
Object mac = params.get("mac");
if (!ObjectUtils.isEmpty(mac)){
- String MAC = mac.toString();
+ String[] split = mac.toString().split(",");
+ List<String> list = Arrays.asList(split);
+ List<String> macList = new ArrayList<>(new TreeSet<>(list));
QueryWrapper<TbDaily> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type",type).eq("code",code).eq("mac",MAC);
+ queryWrapper.eq("type",type).eq("code",code).in("mac",macList);
queryWrapper.between("time",startTime,endTime);
List<TbDaily> dailies = dailyMapper.selectList(queryWrapper);
for (TbDaily daily : dailies) {
--
Gitblit v1.8.0