From d2038a623e02c2d7bb6b95a908832c0432adf2f0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 13:46:21 +0800
Subject: [PATCH] 增加日志
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 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 9ecf442..9e56328 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -1,16 +1,22 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
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;
/**
@@ -18,6 +24,7 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
+@Api(tags = "鍛樺伐鍙拌处")
public class StaffOnJobController {
@Resource
@@ -31,18 +38,99 @@
* @return
*/
@GetMapping("/listPage")
+ @ApiOperation("鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ")
+ @Log(title = "鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
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));
+ @GetMapping("/list")
+ @ApiOperation("鍦ㄨ亴鍛樺伐涓嬫媺(鏂板绂昏亴鐢�)")
+ @Log(title = "鍦ㄨ亴鍛樺伐涓嬫媺(鏂板绂昏亴鐢�)", businessType = BusinessType.OTHER)
+ public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+ }
+
+ /**
+ * 鏂板鍏ヨ亴
+ * @param staffOnJob
+ * @return
+ */
+ @PostMapping("")
+ @ApiOperation("鏂板鍏ヨ亴")
+ @Log(title = "鏂板鍏ヨ亴", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
+ return AjaxResult.success(staffOnJobService.add(staffOnJob));
+ }
+
+ /**
+ * 鏇存柊鍏ヨ亴淇℃伅
+ * @param staffOnJobDto
+ * @return
+ */
+ @PutMapping("/{id}")
+ @ApiOperation("鏇存柊鍏ヨ亴淇℃伅")
+ @Log(title = "鏇存柊鍏ヨ亴淇℃伅", businessType = BusinessType.UPDATE)
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+ }
+
+ /**
+ * 鍒犻櫎鍏ヨ亴
+ * @param ids
+ * @return
+ */
+ @DeleteMapping("/del")
+ @ApiOperation("鍒犻櫎鍏ヨ亴")
+ @Log(title = "鍒犻櫎鍏ヨ亴", businessType = BusinessType.DELETE)
+ public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
+ }
+
+ /**
+ * 鍦ㄨ亴鍛樺伐璇︽儏
+ * @param id
+ * @return
+ */
+ @GetMapping("/{id}")
+ @ApiOperation("鍦ㄨ亴鍛樺伐璇︽儏")
+ @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}")
+ @ApiOperation("缁鍚堝悓")
+ @Log(title = "缁鍚堝悓", businessType = BusinessType.UPDATE)
+ 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);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
}
/**
@@ -51,9 +139,23 @@
* @param staffOnJob
*/
@PostMapping("/export")
+ @ApiOperation("鍦ㄨ亴鍛樺伐瀵煎嚭")
+ @Log(title = "鍦ㄨ亴鍛樺伐瀵煎嚭", businessType = BusinessType.EXPORT)
public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
staffOnJobService.staffOnJobExport(response, staffOnJob);
}
+ /**
+ * word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭
+ * @param response
+ * @param staffOnJob
+ */
+ @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