From bfe7fe047e7682cd3c3a6c0d876a82df614ee85e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 29 四月 2026 10:32:54 +0800
Subject: [PATCH] feat(staff): 增加员工转正与调岗功能
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 7d73759..9f77d87 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,17 +4,14 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
import com.ruoyi.staff.service.IStaffOnJobService;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
/**
* 鍛樺伐鍙拌处/鍚堝悓绠＄悊
@@ -79,5 +76,25 @@
staffOnJobService.staffOnJobExport(response, staffOnJob);
}
+ /**
+ * 鍛樺伐杞
+ * @param staffOnJob
+ * @return
+ */
+ @PostMapping("/regularize")
+ public AjaxResult regularize(@RequestBody StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.updateById(staffOnJob));
+ }
+
+ /**
+ * 鍛樺伐璋冨矖
+ * @param staffOnJobDto
+ * @return
+ */
+ @PostMapping("/transferPost")
+ public AjaxResult transferPost(@RequestBody StaffOnJobDto staffOnJobDto) {
+ return AjaxResult.success(staffOnJobService.transferPost(staffOnJobDto));
+ }
+
}
--
Gitblit v1.9.3