1.优化暂降报告

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java

@@ -935,12 +935,12 @@ public class EventReportServiceImpl implements EventReportService {
         //添加detail
         for (EventDetail detail : info) {
             for (DictData data : reasonData) {
-                if (detail.getAdvanceReason().equals(data.getId())) {
+                if (data.getId().equals(detail.getAdvanceReason())) {
                     detail.setAdvanceReason(data.getName());
                 }
             }
             for (DictData data : typeData) {
-                if (detail.getAdvanceType().equals(data.getId())) {
+                if (data.getId().equals(detail.getAdvanceType())) {
                     detail.setAdvanceType(data.getName());
                 }
             }
@@ -961,13 +961,13 @@ public class EventReportServiceImpl implements EventReportService {
         for (EventDetail detail : info) {
             for (DictData data : reasonData) {
                 reasonMap.put(data.getName(), 0);
-                if (detail.getAdvanceReason().equals(data.getId())) {
+                if (data.getId().equals(detail.getAdvanceReason())) {
                     detail.setAdvanceReason(data.getName());
                 }
             }
             for (DictData data : typeData) {
                 typeMap.put(data.getName(), 0);
-                if (detail.getAdvanceType().equals(data.getId())) {
+                if (data.getId().equals(detail.getAdvanceType())) {
                     detail.setAdvanceType(data.getName());
                 }
             }