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/collaborativeApproval/controller/DutyPlanController.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index c5023eb..8be45b5 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -7,8 +7,9 @@
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -20,42 +21,42 @@
@RestController
@RequestMapping("/dutyPlan")
@AllArgsConstructor
-public class DutyPlanController {
+public class DutyPlanController extends BaseController {
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
- return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
+ @Operation(summary = "鍒嗛〉鏌ヨ")
+ public R<?> listPage(Page page, DutyPlanDTO dutyPlanDTO){
+ return R.ok(dutyPlanService.listPage(page, dutyPlanDTO));
}
@GetMapping("/getNum")
- @ApiOperation("鑾峰彇绛夌骇鏁版嵁")
- public AjaxResult getNum(){
- return AjaxResult.success(dutyPlanService.getNum());
+ @Operation(summary = "鑾峰彇绛夌骇鏁版嵁")
+ public R<?> getNum(){
+ return R.ok(dutyPlanService.getNum());
}
@PostMapping("/add")
- @ApiOperation("鏂板")
- public AjaxResult add(@RequestBody DutyPlan dutyPlan){
- return AjaxResult.success(dutyPlanService.save(dutyPlan));
+ @Operation(summary = "鏂板")
+ public R<?> add(@RequestBody DutyPlan dutyPlan){
+ return R.ok(dutyPlanService.save(dutyPlan));
}
@PostMapping("/update")
- @ApiOperation("淇敼")
- public AjaxResult update(@RequestBody DutyPlan dutyPlan){
- return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
+ @Operation(summary = "淇敼")
+ public R<?> update(@RequestBody DutyPlan dutyPlan){
+ return R.ok(dutyPlanService.updateById(dutyPlan));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
- public AjaxResult delete(@RequestBody List<Long> ids){
+ @Operation(summary = "鍒犻櫎")
+ public R<?> delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
+ return R.ok(dutyPlanService.removeBatchByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("瀵煎嚭")
+ @Operation(summary = "瀵煎嚭")
public void exportData(HttpServletResponse response, DutyPlanDTO dutyPlanDTO){
dutyPlanService.exportData(response, dutyPlanDTO);
}
--
Gitblit v1.9.3