From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 20 +++++++++++++-------
1 files changed, 13 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 3378f80..0abbdff 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -6,19 +6,18 @@
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.dto.StaffOnJobExcelDto;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.IStaffOnJobService;
-import io.swagger.v3.oas.annotations.tags.Tag;
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 com.ruoyi.staff.dto.StaffOnJobExcelDto;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.Valid;
import java.util.List;
/**
@@ -40,7 +39,7 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ public AjaxResult staffOnJobListPage(Page page, StaffOnJobDto staffOnJob) {
return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
}
@@ -58,6 +57,7 @@
* @param staffOnJob
* @return
*/
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.INSERT)
@PostMapping("")
public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
return AjaxResult.success(staffOnJobService.add(staffOnJob));
@@ -68,6 +68,7 @@
* @param staffOnJobDto
* @return
*/
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.UPDATE)
@PutMapping("/{id}")
public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
@@ -78,6 +79,7 @@
* @param ids
* @return
*/
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
@@ -102,12 +104,14 @@
* @param staffContract
* @return
*/
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.UPDATE)
@PostMapping("/renewContract/{id}")
- public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
+ public AjaxResult renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
}
@Operation(summary = "涓嬭浇妯℃澘")
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.EXPORT)
@PostMapping("/downloadTemplate")
public void downloadTemplate(HttpServletResponse response) {
ExcelUtil<StaffOnJobExcelDto> util = new ExcelUtil<>(StaffOnJobExcelDto.class);
@@ -132,6 +136,7 @@
* @param response
* @param staffOnJob
*/
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
staffOnJobService.staffOnJobExport(response, staffOnJob);
@@ -142,6 +147,7 @@
* @param response
* @param staffOnJob
*/
+ @Log(title = "鍦ㄨ亴鍛樺伐", businessType = BusinessType.EXPORT)
@PostMapping("/exportCopy")
@Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
--
Gitblit v1.9.3