From cdc16c48e3130408d3689afc134ee312c35347b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 02 七月 2025 16:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
new file mode 100644
index 0000000..9ecf442
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -0,0 +1,59 @@
+package com.ruoyi.staff.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
+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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鍛樺伐鍙拌处/鍚堝悓绠$悊
+ */
+@RestController
+@RequestMapping("/staff/staffOnJob")
+public class StaffOnJobController {
+
+    @Resource
+    private IStaffOnJobService staffOnJobService;
+
+
+    /**
+     * 鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ
+     * @param page
+     * @param staffOnJob
+     * @return
+     */
+    @GetMapping("/listPage")
+    public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+        return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
+    }
+
+    /**
+     * 鍦ㄨ亴鍛樺伐璇︽儏
+     * @param staffNo
+     * @return
+     */
+    @GetMapping("/staffNo")
+    public AjaxResult staffOnJobDetail(String staffNo) {
+        return AjaxResult.success(staffOnJobService.staffOnJobDetail(staffNo));
+    }
+
+    /**
+     * 鍦ㄨ亴鍛樺伐瀵煎嚭
+     * @param response
+     * @param staffOnJob
+     */
+    @PostMapping("/export")
+    public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
+        staffOnJobService.staffOnJobExport(response, staffOnJob);
+    }
+
+
+}

--
Gitblit v1.9.3