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/purchase/dto/PaymentRegistrationDto.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
index e7acb12..a884286 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import lombok.Data;
@@ -15,9 +16,11 @@
private String salesContractNo;
// 閲囪喘鍚堝悓鍙�
+ @Excel(name = "閲囪喘鍚堝悓鍙�")
private String purchaseContractNumber;
// 渚涘簲鍟嗗悕绉�
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
// 鍙戠エ鍙�
@@ -33,5 +36,15 @@
private String taxRate;
// 鐧昏浜�
+ @Excel(name = "鐧昏浜�")
private String registrant;
+
+ private String searchText;
+
+ // 宸蹭粯娆炬�婚噾棰�
+ private BigDecimal paymentAmountTotal;
+
+ private String paymentDateStart;
+
+ private String paymentDateEnd;
}
--
Gitblit v1.9.3