From 7a8827c634b53bb1cb861ebc1fd4ac6d1ae6cb5a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 26 五月 2026 15:22:10 +0800
Subject: [PATCH] 人力资源和协同办公增加操作日志

---
 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 55a93b2..8646a2a 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -5,9 +5,8 @@
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.AjaxResult;
 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 com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
 import com.ruoyi.staff.service.IStaffOnJobService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,7 +24,7 @@
  */
 @RestController
 @RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
+@Api(tags = "鍛樺伐鍙拌处")
 public class StaffOnJobController {
 
     @Resource
@@ -39,6 +38,7 @@
      * @return
      */
     @GetMapping("/listPage")
+    @Log(title = "鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
         return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
     }
@@ -48,8 +48,9 @@
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult staffOnJobList() {
-        return AjaxResult.success(staffOnJobService.staffOnJobList());
+    @Log(title = "鍦ㄨ亴鍛樺伐涓嬫媺(鏂板绂昏亴鐢�)", businessType = BusinessType.OTHER)
+    public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+        return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
     }
 
     /**
@@ -58,6 +59,7 @@
      * @return
      */
     @PostMapping("")
+    @Log(title = "鏂板鍏ヨ亴", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
         return AjaxResult.success(staffOnJobService.add(staffOnJob));
     }
@@ -68,6 +70,7 @@
      * @return
      */
     @PutMapping("/{id}")
+    @Log(title = "鏇存柊鍏ヨ亴淇℃伅", businessType = BusinessType.UPDATE)
     public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
         return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
     }
@@ -78,6 +81,7 @@
      * @return
      */
     @DeleteMapping("/del")
+    @Log(title = "鍒犻櫎鍏ヨ亴", businessType = BusinessType.DELETE)
     public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
             return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -91,8 +95,21 @@
      * @return
      */
     @GetMapping("/{id}")
-    public AjaxResult staffJoinLeaveRecordDetail(@PathVariable("id") Long id) {
+    @Log(title = "鍦ㄨ亴鍛樺伐璇︽儏", businessType = BusinessType.OTHER)
+    public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
         return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
+    }
+
+    /**
+     * 缁鍚堝悓
+     * @param id
+     * @param staffContract
+     * @return
+     */
+    @PostMapping("/renewContract/{id}")
+    @Log(title = "缁鍚堝悓", businessType = BusinessType.UPDATE)
+    public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
+        return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
     }
 
     /**
@@ -114,6 +131,7 @@
      * @param staffOnJob
      */
     @PostMapping("/export")
+    @Log(title = "鍦ㄨ亴鍛樺伐瀵煎嚭", businessType = BusinessType.EXPORT)
     public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
         staffOnJobService.staffOnJobExport(response, staffOnJob);
     }
@@ -125,6 +143,7 @@
      */
     @PostMapping("/exportCopy")
     @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
+    @Log(title = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭", businessType = BusinessType.EXPORT)
     public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
        return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
     }

--
Gitblit v1.9.3