From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序,还要根据工艺路线的工序的顺序进行排序,开始的排在前面

---
 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java |   14 +++++++++++---
 1 files changed, 11 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 419e2f4..1e60ffe 100644
--- a/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
+++ b/src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java
@@ -4,7 +4,7 @@
 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.springframework.web.multipart.MultipartFile;
 
@@ -16,11 +16,19 @@
 
     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);
 

--
Gitblit v1.9.3