From 14de446d42a23f8823f56ef79214e0d0d634adaa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 16:57:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
index d32c69c..1e60ffe 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.dto.StaffOnJobDto;
+import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffOnJob;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -12,11 +14,23 @@
public interface IStaffOnJobService extends IService<StaffOnJob> {
- IPage<StaffOnJob> staffOnJobListPage(Page page, StaffOnJob staffOnJob);
+ IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJob staffOnJob);
- List<StaffJoinLeaveRecord> staffOnJobDetail(String staffNo);
+ StaffOnJobDto staffOnJobDetail(Long id);
+
+ int add(StaffOnJobDto staffOnJob);
+
+ int update(Long id, StaffOnJobDto staffOnJob);
+
+ 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);
+
+ String exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception;
}
--
Gitblit v1.9.3