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 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; }