From dfab9ae5d0df981deff3dc8dd73916cb7e287a2e Mon Sep 17 00:00:00 2001
From: wanxiaoli <wanxiaoli123>
Date: Thu, 15 Jan 2026 14:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yfd/business/css/domain/CriticalData.java   | 4 +---
 .../business/css/service/impl/ProjectServiceImpl.java    | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/business-css/src/main/java/com/yfd/business/css/domain/CriticalData.java b/business-css/src/main/java/com/yfd/business/css/domain/CriticalData.java
index 7370c3d..f699edc 100644
--- a/business-css/src/main/java/com/yfd/business/css/domain/CriticalData.java
+++ b/business-css/src/main/java/com/yfd/business/css/domain/CriticalData.java
@@ -53,10 +53,8 @@ public class CriticalData implements Serializable {
     @TableField("keff_value")
     private BigDecimal keffValue;
 
-    /** 属性状态 - JSON格式 */
-    @TableField("attr_state")
-    private String attrState;
 
+    
     /** 创建时间 */
     @TableField("created_at")
     private LocalDateTime createdAt;
diff --git a/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java b/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java
index 014fa76..15fdbae 100644
--- a/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java
+++ b/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java
@@ -1113,16 +1113,19 @@ public class ProjectServiceImpl
             List<Project> projects = this.list(new QueryWrapper<Project>().eq("project_id", projectId));
             List<Device> devices = deviceService.list(new QueryWrapper<Device>().eq("project_id", projectId));
             List<Material> materials = materialService.list(new QueryWrapper<Material>().eq("project_id", projectId));
-            List<Scenario> scenarios = scenarioService.list(new QueryWrapper<Scenario>().eq("project_id", projectId));
+            List<Scenario> scenarios = scenarioService.list(new QueryWrapper<Scenario>().eq("project_id", projectId)
+                                        .orderByDesc("created_at"));
             List<String> scenarioIds = scenarios.stream().map(Scenario::getScenarioId).toList();
             List<Event> events = scenarioIds.isEmpty()
                     ? List.of()
                     : eventService.list(new QueryWrapper<Event>()
                             .select("event_id","scenario_id","device_id","material_id","attr_changes","trigger_time","created_at","modifier")
-                            .in("scenario_id", scenarioIds));
+                            .in("scenario_id", scenarioIds)
+                            .orderByDesc("created_at"));
             List<ScenarioResult> results = scenarioIds.isEmpty()
                     ? List.of()
-                    : scenarioResultService.list(new QueryWrapper<ScenarioResult>().in("scenario_id", scenarioIds));
+                    : scenarioResultService.list(new QueryWrapper<ScenarioResult>().in("scenario_id", scenarioIds)
+                        .orderByAsc("step"));
 
             Sheet s1 = wb.createSheet("projects");
             String[] h1 = {"project_id","code","name","description","created_at","updated_at","modifier"};