Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

电压暂降属性修改

Browse Source
This commit is contained in:
wurui
2023-04-07 15:11:41 +08:00
parent 24a12ec54f
commit 76b999a1cb
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -510,8 +510,8 @@ public class ReportServiceImpl implements ReportService {
List<DictData> type = reason.getData();
for (DetailVO detailVO : result) {
for (DictData dictData : type) {
if (dictData.getId().equals(detailVO.getEventType())) {
detailVO.setEventType(dictData.getName());
if (dictData.getId().equals(detailVO.getAdvanceType())) {
detailVO.setAdvanceType(dictData.getName());
}
}
}
@@ -2011,11 +2011,11 @@ public class ReportServiceImpl implements ReportService {
List<DictData> eventTypeList = type.getData();
for (WaveTypeVO waveTypeVO : eventDetailList) {
if (waveTypeVO.getEventReason() != null) {
if (waveTypeVO.getAdvanceReason() != null) {
for (DictData dictData : eventReasonList) {
//将字典数据id与VO中属性eventReason对应的字符串进行比较
if (waveTypeVO.getEventReason().equals(dictData.getId())) {
waveTypeVO.setEventReason(dictData.getName());
if (waveTypeVO.getAdvanceReason().equals(dictData.getId())) {
waveTypeVO.setAdvanceReason(dictData.getName());
}
}
} else {
@@ -2025,11 +2025,11 @@ public class ReportServiceImpl implements ReportService {
}
for (WaveTypeVO waveTypeVO : eventDetailList) {
if (waveTypeVO.getEventType() != null) {
if (waveTypeVO.getAdvanceType() != null) {
for (DictData dictData : eventTypeList) {
//将字典数据id与VO中属性eventType对应的字符串进行比较
if (waveTypeVO.getEventType().equals(dictData.getId())) {
waveTypeVO.setEventType(dictData.getName());
if (waveTypeVO.getAdvanceType().equals(dictData.getId())) {
waveTypeVO.setAdvanceType(dictData.getName());
}
}
} else {