From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 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..2bb6cd7 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -1,22 +1,24 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
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.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.StaffOnJobDto;
+import com.ruoyi.staff.dto.StaffOnJobExcelDto;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.IStaffOnJobService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
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,8 +26,8 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
-@Api(tags = "鍛樺伐鍙拌处")
-public class StaffOnJobController {
+@Tag(name = "鍛樺伐鍙拌处")
+public class StaffOnJobController extends BaseController {
@Resource
private IStaffOnJobService staffOnJobService;
@@ -38,8 +40,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
- return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
+ public R<?> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ return R.ok(staffOnJobService.staffOnJobListPage(page, staffOnJob));
}
/**
@@ -47,8 +49,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
- return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+ public R<?> staffOnJobList(StaffOnJob staffOnJob) {
+ return R.ok(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
@@ -57,8 +59,8 @@
* @return
*/
@PostMapping("")
- public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
- return AjaxResult.success(staffOnJobService.add(staffOnJob));
+ public R<?> add(@RequestBody StaffOnJobDto staffOnJob) {
+ return R.ok(staffOnJobService.add(staffOnJob));
}
/**
@@ -67,8 +69,8 @@
* @return
*/
@PutMapping("/{id}")
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
- return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+ public R<?> update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return R.ok(staffOnJobService.update(id, staffOnJobDto));
}
/**
@@ -77,11 +79,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
+ public R<?> delStaffOnJobs(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
+ return R.ok(staffOnJobService.delStaffOnJobs(ids));
}
/**
@@ -90,8 +92,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
- return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
+ public R<?> staffOnJobDetail(@PathVariable("id") Long id) {
+ return R.ok(staffOnJobService.staffOnJobDetail(id));
}
/**
@@ -101,8 +103,15 @@
* @return
*/
@PostMapping("/renewContract/{id}")
- public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
- return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
+ public R<?> renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
+ return R.ok(staffOnJobService.renewContract(id, staffContract));
+ }
+
+ @Operation(summary = "涓嬭浇妯℃澘")
+ @PostMapping("/downloadTemplate")
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<StaffOnJobExcelDto> util = new ExcelUtil<>(StaffOnJobExcelDto.class);
+ util.importTemplateExcel(response, "鍦ㄨ亴鍛樺伐妯℃澘");
}
/**
@@ -110,12 +119,12 @@
*/
@PostMapping("/import")
@Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
- public AjaxResult importData(@RequestPart("file") MultipartFile file) {
+ public R<?> importData(@RequestPart("file") MultipartFile file) {
Boolean b = staffOnJobService.importData(file);
if (b) {
- return AjaxResult.success("瀵煎叆鎴愬姛");
+ return R.ok(null, "瀵煎叆鎴愬姛");
}
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
/**
@@ -134,9 +143,9 @@
* @param staffOnJob
*/
@PostMapping("/exportCopy")
- @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
- return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
+ @Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
+ public R<?> exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
+ return R.ok(staffOnJobService.exportCopy(response, staffOnJob));
}
--
Gitblit v1.9.3