From 791dcac18d59f9dc3d6ff4be2c91666ef3b27fe8 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 14 May 2024 13:49:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85rawReport?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java | 1 +
 .../shxy/xymanager_service/impl/TerminalExtServiceImpl.java    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
index 1de23a3..77caab0 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java
@@ -37,6 +37,7 @@ public class ActivitiesServiceImpl implements ActivitiesService {
     public List<MntnActivities> listAll() {
         MntnActivitiesExample example = new MntnActivitiesExample();
         MntnActivitiesExample.Criteria criteria = example.createCriteria();
+        example.setOrderByClause("id desc");
         List<MntnActivities> list = mapper.selectByExample(example);
         for (MntnActivities item : list) {
             this.fillItem(item);
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
index 7bd7d11..991a34c 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java
@@ -189,6 +189,9 @@ public class TerminalExtServiceImpl implements TerminalExtService {
         example.setOrderByClause("id desc");
         PageHelper.startPage(pageNum, pageSize);
         List<MntnRawReports> list = rawReportsMapper.selectByExample(example);
+        for (MntnRawReports item : list) {
+            item.makeRawReport();
+        }
         return new PageInfo<>(list);
     }
 }