From b70456bfd425b107f68cfd60c6e6b25e143cea7c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 三月 2026 09:20:41 +0800
Subject: [PATCH] fix:1.库存报表(耗材和仓库筛选优化) 2.耗材和仓储物流导出字段优化 3.入库导出优化

---
 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index e6e5a40..1e60ffe 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -4,9 +4,8 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.staff.dto.StaffOnJobDto;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.pojo.StaffContract;
 import com.ruoyi.staff.pojo.StaffOnJob;
-import org.bouncycastle.crypto.digests.LongDigest;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -25,9 +24,11 @@
 
     int delStaffOnJobs(List<Integer> ids);
 
+    int renewContract(Long id, StaffContract staffContract);
+
     void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
 
-    List<StaffJoinLeaveRecord> staffOnJobList();
+    List<StaffOnJobDto> staffOnJobList(StaffOnJob staffOnJob);
 
     Boolean importData(MultipartFile file);
 

--
Gitblit v1.9.3