From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/projectManagement/controller/PlanController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index 5ec8191..9857c27 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -1,7 +1,8 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+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.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
@@ -23,28 +24,30 @@
@RequestMapping("/projectManagement/plan")
@Tag(name = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class PlanController extends BaseController {
+public class PlanController {
private final PlanService planService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public R<?> save(@RequestBody @Valid SavePlanVo savePlanVo) {
+ @Log(title = "椤圭洰璁″垝-淇濆瓨", businessType = BusinessType.INSERT)
+ public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable Long id) {
+ @Log(title = "椤圭洰璁″垝-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@PathVariable Long id) {
planService.deletePlan(id);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public R<?> listPage(@RequestBody SearchPlanVo searchPlanVo) {
- return R.ok(planService.searchPlan(searchPlanVo));
+ public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
+ return AjaxResult.success(planService.searchPlan(searchPlanVo));
}
}
--
Gitblit v1.9.3