From 1b9936ba920d65df09ab8dba79c6252568ee26e4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 三月 2025 12:16:02 +0800
Subject: [PATCH] 任务统计bug

---
 business/src/main/java/com/ycl/controller/FlowableTypeController.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/business/src/main/java/com/ycl/controller/FlowableTypeController.java b/business/src/main/java/com/ycl/controller/FlowableTypeController.java
index 3541bf4..e7f1588 100644
--- a/business/src/main/java/com/ycl/controller/FlowableTypeController.java
+++ b/business/src/main/java/com/ycl/controller/FlowableTypeController.java
@@ -3,6 +3,10 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.common.base.Result;
+import com.ycl.common.constant.UserConstants;
+import com.ycl.common.core.controller.BaseController;
+import com.ycl.common.core.domain.AjaxResult;
+import com.ycl.common.core.domain.entity.SysMenu;
 import com.ycl.common.group.Add;
 import com.ycl.common.group.Update;
 import com.ycl.domain.entity.FlowableType;
@@ -21,6 +25,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,7 +36,7 @@
 @Api(value = "宸ヤ綔娴佸垎绫�", tags = "宸ヤ綔娴佸垎绫荤鐞�")
 @RestController
 @RequestMapping("/flowable_type")
-public class FlowableTypeController {
+public class FlowableTypeController extends BaseController {
 
     private final FlowableTypeService flowableTypeService;
 
@@ -39,6 +44,10 @@
     @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
 //    @PreAuthorize("hasAuthority('flowableType:add')")
     public Result add(@RequestBody @Validated(Add.class) FlowableType form) {
+        form.setCreateBy(getUsername());
+        form.setCreateTime(new Date());
+        form.setUpdateBy(getUsername());
+        form.setUpdateTime(new Date());
         flowableTypeService.save(form);
         return Result.ok();
     }
@@ -60,13 +69,15 @@
     }
 
 
-    @GetMapping("/page")
-    @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+    @GetMapping("/list")
 //    @PreAuthorize("hasAuthority('flowableType:page')")
-    public Result page(AbsQuery query) {
-        IPage<FlowableType> page = PageUtil.getPage(query, FlowableType.class);
-        flowableTypeService.page(page);
-        return Result.ok().data(page.getRecords()).total(page.getTotal());
+    public Result list(FlowableType flowableType) {
+        List<FlowableType> list = flowableTypeService.selectTypeList(flowableType);
+        return Result.ok().data(list);
     }
-
+    @GetMapping("/tree_select")
+    public AjaxResult treeSelect(FlowableType flowableType) {
+        List<FlowableType> list = flowableTypeService.selectTypeList(flowableType);
+        return success(flowableTypeService.buildTreeSelect(list));
+    }
 }

--
Gitblit v1.8.0