From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 343501e..9b4779e 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -18,8 +18,8 @@
import com.ruoyi.lavorissue.service.LavorIssueService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +40,7 @@
* @date : 2025/8/13 11:19
*/
@RestController
-@Api(tags = "鍔充繚鍙戞斁")
+@Tag(name = "鍔充繚鍙戞斁")
@RequestMapping("/lavorIssue")
@AllArgsConstructor
public class LavorIssueController extends BaseController {
@@ -51,7 +51,7 @@
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, LaborIssue laborIssue){
IPage<LaborIssue> listPage = laborIssueService.listPage(page, laborIssue);
return AjaxResult.success(listPage);
@@ -59,7 +59,7 @@
@GetMapping("/statisticsList")
@Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍔充繚鍙戞斁-缁熻鏌ヨ")
+ @Operation(summary = "鍔充繚鍙戞斁-缁熻鏌ヨ")
public AjaxResult statisticsList(LaborIssue laborIssue){
List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
return AjaxResult.success(listPage);
@@ -67,7 +67,7 @@
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
- @ApiOperation("鍔充繚鍙戞斁-娣诲姞")
+ @Operation(summary = "鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody LaborIssue laborIssue){
String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
@@ -89,7 +89,7 @@
@PostMapping("/update")
@Log(title = "鍔充繚鍙戞斁-淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("鍔充繚鍙戞斁-淇敼")
+ @Operation(summary = "鍔充繚鍙戞斁-淇敼")
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody LaborIssue laborIssue){
boolean update = laborIssueService.updateById(laborIssue);
@@ -98,7 +98,7 @@
@DeleteMapping("/delete")
@Log(title = "鍔充繚鍙戞斁-鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("鍔充繚鍙戞斁-鍒犻櫎")
+ @Operation(summary = "鍔充繚鍙戞斁-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids){
boolean delete = laborIssueService.removeBatchByIds(ids);
@@ -106,7 +106,7 @@
}
@GetMapping("/statistics")
- @ApiOperation("鍔充繚鍙戞斁-缁熻")
+ @Operation(summary = "鍔充繚鍙戞斁-缁熻")
public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
return AjaxResult.success(statisticsLaborIssue);
@@ -119,7 +119,7 @@
*/
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ @Operation(summary = "鍔充繚鍙戞斁-瀵煎嚭")
public void export(HttpServletResponse response) {
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
ExcelUtil<LaborIssue> util = new ExcelUtil<LaborIssue>(LaborIssue.class);
@@ -139,7 +139,7 @@
*/
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/exportCopy")
- @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ @Operation(summary = "鍔充繚鍙戞斁-瀵煎嚭")
public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
laborIssueService.exportCopy(response,laborIssue);
}
--
Gitblit v1.9.3