From 81eae83295642387de38a97fdc5a35f485307587 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十一月 2024 22:20:11 +0800
Subject: [PATCH] license
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java
index aa42389..0b4e3e9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java
@@ -93,12 +93,14 @@
}
IPage<EquipmentAlarmDto> pageList = this.baseMapper.pageList(page, equipmentAlarmVo);
pageList.getRecords().forEach(item -> {
- List<MdcAlarmInfo> mdcAlarmInfoList = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getAlarmCode, item.getAlarmNo()).eq(MdcAlarmInfo::getIsUse, CommonConstant.STATUS_0));
- if (mdcAlarmInfoList != null && !mdcAlarmInfoList.isEmpty()) {
- item.setAlarmContent(mdcAlarmInfoList.get(0).getAlarmContent());
+ if (StringUtils.isBlank(item.getAlarmContent())) {
+ List<MdcAlarmInfo> mdcAlarmInfoList = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getAlarmCode, item.getAlarmNo()).eq(MdcAlarmInfo::getDriveType, item.getDriveType()).eq(MdcAlarmInfo::getIsUse, CommonConstant.STATUS_0));
+ if (mdcAlarmInfoList != null && !mdcAlarmInfoList.isEmpty()) {
+ item.setAlarmContent(mdcAlarmInfoList.get(0).getAlarmContent());
+ }
}
});
- return this.baseMapper.pageList(page, equipmentAlarmVo);
+ return pageList;
}
@Override
@@ -136,6 +138,16 @@
// Step.2 AutoPoi 瀵煎嚭Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<EquipmentAlarmDto> equipmentAlarmDtos = this.baseMapper.list(equipmentAlarmVo);
+ if (equipmentAlarmDtos != null && !equipmentAlarmDtos.isEmpty()) {
+ for (EquipmentAlarmDto equipmentAlarmDto : equipmentAlarmDtos) {
+ if (StringUtils.isBlank(equipmentAlarmDto.getAlarmContent())) {
+ List<MdcAlarmInfo> mdcAlarmInfoList = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getAlarmCode, equipmentAlarmDto.getAlarmNo()).eq(MdcAlarmInfo::getDriveType, equipmentAlarmDto.getDriveType()).eq(MdcAlarmInfo::getIsUse, CommonConstant.STATUS_0));
+ if (mdcAlarmInfoList != null && !mdcAlarmInfoList.isEmpty()) {
+ equipmentAlarmDto.setAlarmContent(mdcAlarmInfoList.get(0).getAlarmContent());
+ }
+ }
+ }
+ }
// 瀵煎嚭鏂囦欢鍚嶇О
mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鎶ヨ鍒楄〃");
mv.addObject(NormalExcelConstants.CLASS, EquipmentAlarmDto.class);
--
Gitblit v1.9.3