From 85dba01ea5021d83487c3ed2d60706f516a0774b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Jan 2022 14:40:28 +0800
Subject: [PATCH] 贡献率数据格式修改
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 8de6dc0..0dd3448 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -78,17 +78,24 @@
}
@Override
- public List<MonitorPoint> queryStateControlStationByRegionCode(Integer regionCode) {
- //���������������������
- Organization stateControlStationOrganization = organizationService.getStateControlStation();
- //���������������������������������������
- QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_delete", Constants.NOT_DELETE);
- queryWrapper.eq("organization_id", stateControlStationOrganization.getId());
- queryWrapper.eq(RegionCodeUtils.regionCodeConvertToName(regionCode), regionCode);
- return monitorPointMapper.selectList(queryWrapper);
+ public List<MonitorPoint> queryAllMonitorPoints(Integer organizationId) {
+ //���������������
+ List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> organizationIds = new ArrayList<>();
+ for (Organization organization : childrenOrganization) {
+ organizationIds.add(organization.getId());
+ }
+ organizationIds.add(organizationId);
+ //������������
+ QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
+ queryMonitorPointsWrapper.select("id","name");
+ queryMonitorPointsWrapper.in("organization_id",organizationIds);
+ queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
+ return monitorPoints;
}
+
}
--
Gitblit v1.8.0