From 632a346f1fd07ab659bfc68e70bd6e254b0e8c51 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期三, 19 七月 2023 16:10:55 +0800
Subject: [PATCH] 统计分析接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
index fca4f01..afb0a78 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -50,17 +50,17 @@
List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotEmpty(mdcDeviceCalendarQueryVo.getParentId()) && StringUtils.isEmpty(mdcDeviceCalendarQueryVo.getEquipmentId())) {
if ("2".equals(mdcDeviceCalendarQueryVo.getTypeTree())) {
- //閮ㄩ棬灞傜骇
+ // 閮ㄩ棬灞傜骇
equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDeviceCalendarQueryVo.getParentId());
} else {
- //浜х嚎灞傜骇
+ // 浜х嚎灞傜骇
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDeviceCalendarQueryVo.getParentId());
}
} else if (StringUtils.isNotEmpty(mdcDeviceCalendarQueryVo.getEquipmentId())) {
- //鍗曞彴璁惧淇℃伅
+ // 鍗曞彴璁惧淇℃伅
mdcDeviceCalendarQueryVo.setEquipmentIdList(Collections.singletonList(mdcDeviceCalendarQueryVo.getEquipmentId()));
} else {
- //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ // 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
if ("2".equals(mdcDeviceCalendarQueryVo.getTypeTree())) {
//閮ㄩ棬灞傜骇
equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
@@ -69,7 +69,13 @@
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
+ mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
}
--
Gitblit v1.9.3