From c23341b401ab8f10bdbbcc3f5c0cf9ae7ec37386 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Tue, 16 Sep 2025 18:03:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E4=BC=98=E5=8C=96=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=A4=84=E7=90=86=E5=92=8C=E6=95=B0=E6=8D=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 FaultTraceReportBo 中的 startDate 和 endDate 字段类型从 Date 改为 String
- 在 FaultTraceReportVo 中：
- 添加 ExcelIgnore 注解以忽略 periodStart 字段的导出
- 将 topResolutionTime 字段类型从 Date 改为 String
  - 调整 ExcelProperty 注解的参数以优化导出数据的显示
- 移除不必要的空行和注释，提高代码可读性
---
 .../dromara/dms/domain/bo/FaultTraceReportBo.java   |  7 +++----
 .../dromara/dms/domain/vo/FaultTraceReportVo.java   | 13 ++++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/FaultTraceReportBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/FaultTraceReportBo.java
index d2a10650..af584ba6 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/FaultTraceReportBo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/FaultTraceReportBo.java
@@ -2,7 +2,6 @@ package org.dromara.dms.domain.bo;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.util.Map;
 
 /**
@@ -14,12 +13,12 @@ public class FaultTraceReportBo {
     /**
      * 开始日期（基于 apply_time）
      */
-    private Date startDate;
+    private String startDate;
 
     /**
      * 结束日期（基于 apply_time）
      */
-    private Date endDate;
+    private String endDate;
 
     /**
      * 设备模型ID（dms_device_mode.device_mode_id）
@@ -45,4 +44,4 @@ public class FaultTraceReportBo {
      * 预留扩展参数
      */
     private Map<String, Object> params;
-}
\ No newline at end of file
+}
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/FaultTraceReportVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/FaultTraceReportVo.java
index dfd939f7..a12ca1e6 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/FaultTraceReportVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/FaultTraceReportVo.java
@@ -1,11 +1,11 @@
 package org.dromara.dms.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 设备故障处理记录表（详细追溯）结果
@@ -13,12 +13,13 @@ import java.util.Date;
 @Data
 public class FaultTraceReportVo {
 
-    @ExcelProperty(value =  "统计周期")
+    @ExcelProperty(value = "统计周期")
     private String periodLabel;
 
-    private Date periodStart;
+    @ExcelIgnore
+    private String periodStart;
 
-    @ExcelProperty(value  = "设备类型")
+    @ExcelProperty(value = "设备类型")
     private String deviceType;
 
     @ExcelProperty(value = "设备编号")
@@ -28,7 +29,6 @@ public class FaultTraceReportVo {
     @ExcelDictFormat(dictType = "activity_fault_type")
     private String faultType;
 
-
     @ExcelProperty(value = "故障次数")
     private Long faultCount;
 
@@ -54,6 +54,5 @@ public class FaultTraceReportVo {
     private String topResolution;
 
     @ExcelProperty(value = "措施实施时间")
-    private Date topResolutionTime;
-
+    private String topResolutionTime;
 }