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/DeviceLedgerDto.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index f299773..26bdc91 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -15,7 +18,7 @@
*/
@Data
@TableName("device_ledger")
-public class DeviceLedgerDto {
+public class DeviceLedgerDto extends DateQueryDto {
/**
* 涓婚敭ID锛岃嚜澧�
@@ -98,4 +101,25 @@
* 绉熸埛ID
*/
private Long tenantId;
+
+ @ApiModelProperty("鐘舵��")
+ private String status;
+
+ @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planRuntimeTime;
+
+ @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startRuntimeTime;
+
+ @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endRuntimeTime;
+
+ @ApiModelProperty("杩愯鏃堕暱")
+ private String runtimeDuration;
}
--
Gitblit v1.9.3