From 54bbbd62a3298e0671f8dd7aba0763775a4f733c Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 27 十月 2026 13:14:02 +0800
Subject: [PATCH] fix(首页): 应收应付统计对 null 金额做保护，避免 BigDecimal.add(null) 抛 NPE 导致首页报“系统未知错误”
---
src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 92dd71a..b531591 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -21,16 +21,23 @@
@ApiModelProperty("瑙勬牸鍨嬪彿")
private String deviceModel;
- @Excel(name = "璁″垝淇濆吇鏃ユ湡")
+ @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
private Date maintenancePlanTime;
+ @Excel(name = "淇濆吇鍛ㄦ湡")
+ @ApiModelProperty("淇濆吇鍛ㄦ湡")
+ private String maintenanceCycle;
+
+ @Excel(name = "淇濆吇鍐呭")
+ @ApiModelProperty("淇濆吇鍐呭")
+ private String maintenanceContent;
@ApiModelProperty("瀹為檯淇濆吇浜�")
@Excel(name = "瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- @Excel(name = "瀹為檯淇濆吇鏃ユ湡")
+ @Excel(name = "瀹為檯淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private LocalDateTime maintenanceActuallyTime;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
@@ -42,11 +49,11 @@
private String status;
@ApiModelProperty("鍒涘缓鏃堕棿")
- @Excel(name = "褰曞叆鏃堕棿")
+ @Excel(name = "褰曞叆鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private Date createTime;
@ApiModelProperty("鍒涘缓浜�")
- @Excel(name = "褰曞叆浜�")
+// @Excel(name = "褰曞叆浜�")
private String createUser;
}
--
Gitblit v1.9.3