From 70409bf0d1bef6876916faf6a4ce24f3e797ec32 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 22 十月 2026 14:19:31 +0800
Subject: [PATCH] fix(人力): 在职员工台账默认不再按合同到期日过滤(可显示全部在职员工)；入职同步写入入职日期；修复离职状态过滤失效
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..92cfe8c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -16,7 +16,7 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
@@ -26,6 +26,8 @@
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
+
+ private String repairTimeStr;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
@@ -39,6 +41,8 @@
@ApiModelProperty("缁翠慨鏃堕棿")
private Date maintenanceTime;
+ private String maintenanceTimeStr;
+
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
--
Gitblit v1.9.3