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/procurementrecord/controller/ProcurementRecordOutController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
index d7f1a84..f37acc5 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -98,4 +98,22 @@
util.exportExcel(response, list, "鐢熶骇鍑哄簱鍙拌处");
}
+ /**
+ * 閫�璐у嚭搴擄紙閲囪喘閫�璐у嚭搴擄級鍙拌处鏌ヨ
+ */
+ @GetMapping("/listPageByPurchaseReturn")
+ @Log(title = "閫�璐у嚭搴�-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPageByPurchaseReturn(Page page, ProcurementRecordOutPageDto procurementDto) {
+ IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByPurchaseReturn(page, procurementDto);
+ return AjaxResult.success(result);
+ }
+
+ /**
+ * 閫�璐у嚭搴擄紙閲囪喘閫�璐у嚭搴擄級鍙拌处瀵煎嚭
+ */
+ @PostMapping("/exportPurchaseReturn")
+ public void exportPurchaseReturn(HttpServletResponse response) {
+ procurementRecordOutService.exportPurchaseReturn(response);
+ }
+
}
--
Gitblit v1.9.3