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/production/dto/SalesLedgerSchedulingProcessDto.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 308b506..21cdc73 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -105,5 +105,16 @@
private BigDecimal successNum;
private Long tenantId;
+ /** 鐢熶骇瑕佹眰 */
+ @Excel(name = "鐢熶骇瑕佹眰")
+ @ApiModelProperty(value = "鐢熶骇瑕佹眰")
+ private String productionRequirement;
+
+ /** 瀹屾垚鏈熼檺 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "瀹屾垚鏈熼檺", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏈熼檺")
+ private Date completionDeadline;
}
--
Gitblit v1.9.3