From 06f622b85d24927adb499eb562b89f376e7dc752 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 19 一月 2026 17:52:01 +0800
Subject: [PATCH] 删除StaffJoinLeaveRecord相关代码

---
 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index ea8119f..8e3d6b6 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,9 +4,9 @@
 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.StaffContract;
 import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
 import com.ruoyi.staff.service.IStaffOnJobService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,7 +24,7 @@
  */
 @RestController
 @RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
+@Api(tags = "鍛樺伐鍙拌处")
 public class StaffOnJobController {
 
     @Resource
@@ -47,19 +47,64 @@
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult staffOnJobList() {
-        return AjaxResult.success(staffOnJobService.staffOnJobList());
+    public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+        return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+    }
+
+    /**
+     * 鏂板鍏ヨ亴
+     * @param staffOnJob
+     * @return
+     */
+    @PostMapping("")
+    public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
+        return AjaxResult.success(staffOnJobService.add(staffOnJob));
+    }
+
+    /**
+     * 鏇存柊鍏ヨ亴淇℃伅
+     * @param staffOnJobDto
+     * @return
+     */
+    @PutMapping("/{id}")
+    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+        return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+    }
+
+    /**
+     * 鍒犻櫎鍏ヨ亴
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/del")
+    public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
     }
 
     /**
      * 鍦ㄨ亴鍛樺伐璇︽儏
-     * @param staffNo
+     * @param id
      * @return
      */
-    @GetMapping("/staffNo")
-    public AjaxResult staffOnJobDetail(String staffNo) {
-        return AjaxResult.success(staffOnJobService.staffOnJobDetail(staffNo));
+    @GetMapping("/{id}")
+    public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
+        return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
     }
+
+    /**
+     * 缁鍚堝悓
+     * @param id
+     * @param staffContract
+     * @return
+     */
+    @PostMapping("/renewContract/{id}")
+    public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
+        return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
+    }
+
     /**
      * 鍦ㄨ亴鍛樺伐瀵煎叆
      */
@@ -90,7 +135,7 @@
      */
     @PostMapping("/exportCopy")
     @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
-    public AjaxResult exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception{
+    public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
        return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
     }
 

--
Gitblit v1.9.3