From 471f693ac87a6ed6a2b00e93472b025266c0271f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 09:27:19 +0800
Subject: [PATCH] Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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 db1785c..7287c00 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
@@ -27,6 +27,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
/**
* <p>
@@ -59,28 +60,27 @@
public List<Date> queryDate(Integer organizationId) {
//������������������
QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
+ //List<Integer> childrenId = new ArrayList<>();
+ List<Integer> children = organizationService.orgIdList(organizationId);
//���������������id
- List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
+ /*List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
List<Integer> childrenId = new ArrayList<>();
for (Organization child : children) {
childrenId.add(child.getId());
}
- childrenId.add(organizationId);
- queryWrapper.in("organization_id", childrenId);
+ childrenId.add(organizationId);*/
+ queryWrapper.in("organization_id", children);
//���������������������������180���
Date endDate = new Date();
Date startDate = DateUtils.addDays(endDate, -180);
queryWrapper.between("batch", startDate, endDate);
//������������������
- queryWrapper.select("DISTINCT batch");
+ queryWrapper.select("DISTINCT DATE_FORMAT(batch,'%Y-%m-%d') batch ");
queryWrapper.orderByDesc("batch");
//������������
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
//������������Date������
- List<Date> result = new ArrayList<>();
- for (HistorySecondUav historySecondUav : historySecondUavs) {
- result.add(historySecondUav.getBatch());
- }
+ List<Date> result = historySecondUavs.stream().map(HistorySecondUav::getBatch).collect(Collectors.toList());
return result;
}
@@ -94,12 +94,9 @@
Date endDate = form.getEndDate();
QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
//���������������id
- List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> children = organizationService.orgIdList(organizationId);
List<Integer> childrenId = new ArrayList<>();
- for (Organization child : children) {
- childrenId.add(child.getId());
- }
- childrenId.add(organizationId);
+ childrenId.addAll(children);
childrenId.addAll(integerList);
wrapper.in("organization_id", childrenId);
//������������batch������������������������������������������������
--
Gitblit v1.8.0