From 75b7a414ef821a07426790cb79c37811ae2f07ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 27 一月 2026 10:42:20 +0800
Subject: [PATCH] 浪潮对接单点登录:mis管理系统配置修改
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 76 ++++----------------------------------
1 files changed, 8 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 8e3d6b6..7d73759 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,19 +4,16 @@
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.dto.StaffOnJobDto;
-import com.ruoyi.staff.pojo.StaffContract;
+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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
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 javax.validation.Valid;
import java.util.List;
/**
@@ -24,7 +21,6 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处")
public class StaffOnJobController {
@Resource
@@ -47,64 +43,19 @@
* @return
*/
@GetMapping("/list")
- 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));
+ public AjaxResult staffOnJobList() {
+ return AjaxResult.success(staffOnJobService.staffOnJobList());
}
/**
* 鍦ㄨ亴鍛樺伐璇︽儏
- * @param id
+ * @param staffNo
* @return
*/
- @GetMapping("/{id}")
- public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
- return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
+ @GetMapping("/staffNo")
+ public AjaxResult staffOnJobDetail(String staffNo) {
+ return AjaxResult.success(staffOnJobService.staffOnJobDetail(staffNo));
}
-
- /**
- * 缁鍚堝悓
- * @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));
- }
-
/**
* 鍦ㄨ亴鍛樺伐瀵煎叆
*/
@@ -126,17 +77,6 @@
@PostMapping("/export")
public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
staffOnJobService.staffOnJobExport(response, staffOnJob);
- }
-
- /**
- * word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭
- * @param response
- * @param staffOnJob
- */
- @PostMapping("/exportCopy")
- @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
- return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
}
--
Gitblit v1.9.3