From fb602920a002f6ad0f9d7c68ecdabcda0980fe0c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 11:26:06 +0800
Subject: [PATCH] 增加注解

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

diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 981684d..625ce34 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
@@ -38,6 +38,7 @@
      * @return
      */
     @GetMapping("/listPage")
+    @ApiOperation("鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ")
     public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
         return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
     }
@@ -47,23 +48,75 @@
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult staffOnJobList() {
-        return AjaxResult.success(staffOnJobService.staffOnJobList());
+    @ApiOperation("鍦ㄨ亴鍛樺伐涓嬫媺(鏂板绂昏亴鐢�)")
+    public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+        return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+    }
+
+    /**
+     * 鏂板鍏ヨ亴
+     * @param staffOnJob
+     * @return
+     */
+    @PostMapping("")
+    @ApiOperation("鏂板鍏ヨ亴")
+    public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
+        return AjaxResult.success(staffOnJobService.add(staffOnJob));
+    }
+
+    /**
+     * 鏇存柊鍏ヨ亴淇℃伅
+     * @param staffOnJobDto
+     * @return
+     */
+    @PutMapping("/{id}")
+    @ApiOperation("鏇存柊鍏ヨ亴淇℃伅")
+    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+        return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+    }
+
+    /**
+     * 鍒犻櫎鍏ヨ亴
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎鍏ヨ亴")
+    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}")
+    @ApiOperation("鍦ㄨ亴鍛樺伐璇︽儏")
+    public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
+        return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
     }
+
+    /**
+     * 缁鍚堝悓
+     * @param id
+     * @param staffContract
+     * @return
+     */
+    @PostMapping("/renewContract/{id}")
+    @ApiOperation("缁鍚堝悓")
+    public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
+        return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
+    }
+
     /**
      * 鍦ㄨ亴鍛樺伐瀵煎叆
      */
     @PostMapping("/import")
+    @ApiOperation("鍦ㄨ亴鍛樺伐瀵煎叆")
     @Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
     public AjaxResult importData(@RequestPart("file") MultipartFile file) {
         Boolean b = staffOnJobService.importData(file);
@@ -79,6 +132,7 @@
      * @param staffOnJob
      */
     @PostMapping("/export")
+    @ApiOperation("鍦ㄨ亴鍛樺伐瀵煎嚭")
     public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
         staffOnJobService.staffOnJobExport(response, staffOnJob);
     }
@@ -90,8 +144,8 @@
      */
     @PostMapping("/exportCopy")
     @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
-    public String exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception{
-       return staffOnJobService.exportCopy(response, staffOnJob);
+    public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
+       return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
     }
 
 

--
Gitblit v1.9.3