refactor(dms): 优化故障追溯报表的日期处理和数据结构

- 将 FaultTraceReportBo 中的 startDate 和 endDate 字段类型从 Date 改为 String
- 在 FaultTraceReportVo 中:
- 添加 ExcelIgnore 注解以忽略 periodStart 字段的导出
- 将 topResolutionTime 字段类型从 Date 改为 String
  - 调整 ExcelProperty 注解的参数以优化导出数据的显示
- 移除不必要的空行和注释,提高代码可读性
hwmom-htk
zangch@mesnac.com 5 months ago
parent f2c47f86bd
commit c23341b401

@ -2,7 +2,6 @@ package org.dromara.dms.domain.bo;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.Map; import java.util.Map;
/** /**
@ -14,12 +13,12 @@ public class FaultTraceReportBo {
/** /**
* apply_time * apply_time
*/ */
private Date startDate; private String startDate;
/** /**
* apply_time * apply_time
*/ */
private Date endDate; private String endDate;
/** /**
* IDdms_device_mode.device_mode_id * IDdms_device_mode.device_mode_id
@ -45,4 +44,4 @@ public class FaultTraceReportBo {
* *
*/ */
private Map<String, Object> params; private Map<String, Object> params;
} }

@ -1,11 +1,11 @@
package org.dromara.dms.domain.vo; package org.dromara.dms.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* *
@ -13,12 +13,13 @@ import java.util.Date;
@Data @Data
public class FaultTraceReportVo { public class FaultTraceReportVo {
@ExcelProperty(value = "统计周期") @ExcelProperty(value = "统计周期")
private String periodLabel; private String periodLabel;
private Date periodStart; @ExcelIgnore
private String periodStart;
@ExcelProperty(value = "设备类型") @ExcelProperty(value = "设备类型")
private String deviceType; private String deviceType;
@ExcelProperty(value = "设备编号") @ExcelProperty(value = "设备编号")
@ -28,7 +29,6 @@ public class FaultTraceReportVo {
@ExcelDictFormat(dictType = "activity_fault_type") @ExcelDictFormat(dictType = "activity_fault_type")
private String faultType; private String faultType;
@ExcelProperty(value = "故障次数") @ExcelProperty(value = "故障次数")
private Long faultCount; private Long faultCount;
@ -54,6 +54,5 @@ public class FaultTraceReportVo {
private String topResolution; private String topResolution;
@ExcelProperty(value = "措施实施时间") @ExcelProperty(value = "措施实施时间")
private Date topResolutionTime; private String topResolutionTime;
} }

Loading…
Cancel
Save