From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java |   24 ++++++++++++++++++++----
 1 files changed, 20 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 f83ddc6..9b990b2 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -3,18 +3,34 @@
 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 jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface IStaffOnJobService extends IService<StaffOnJob> {
 
 
-    IPage<StaffOnJob> staffOnJobListPage(Page page, StaffOnJob staffOnJob);
+    IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJobDto staffOnJob);
 
-    List<StaffJoinLeaveRecord> staffOnJobDetail(String staffNo);
+     StaffOnJobDto staffOnJobDetail(Long id);
+
+    int add(StaffOnJobDto staffOnJob,boolean isAddUser);
+
+    int update(Long id, StaffOnJobDto staffOnJob);
+
+    int delStaffOnJobs(List<Integer> ids);
+
+    int renewContract(Long id, StaffContract staffContract);
 
     void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);
+
+    List<StaffOnJobDto> staffOnJobList(StaffOnJob staffOnJob);
+
+    Boolean importData(MultipartFile file);
+
+    String exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception;
 }

--
Gitblit v1.9.3