From 2d47aaf0ef549515fff01e84566ecbf42923d280 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 三月 2026 10:50:19 +0800
Subject: [PATCH] yys 1.生产入库产品消息不回显问题 2.生产核算查询问题
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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..5b5694b 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;
@@ -17,7 +16,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
import java.util.List;
/**
@@ -25,7 +23,7 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
+@Api(tags = "鍛樺伐鍙拌处")
public class StaffOnJobController {
@Resource
@@ -48,8 +46,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult staffOnJobList() {
- return AjaxResult.success(staffOnJobService.staffOnJobList());
+ public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
@@ -91,11 +89,22 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult staffJoinLeaveRecordDetail(@PathVariable("id") Long 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));
+ }
+
+ /**
* 鍦ㄨ亴鍛樺伐瀵煎叆
*/
@PostMapping("/import")
--
Gitblit v1.9.3