From b0449f9ed437831018030d57b98a55e1dd43a6ef Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期二, 17 六月 2025 15:39:47 +0800 Subject: [PATCH] 修改计划表表名 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java index 38da7f5..e57a190 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java @@ -13,10 +13,8 @@ import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; -import org.springblade.flow.core.pojo.entity.BladeFlow; -import org.springblade.mdm.flow.excution.StartDispatcher; import org.springblade.mdm.flow.service.FlowBusinessService; -import org.springblade.mdm.flow.vo.TaskAssignVO; +import org.springblade.mdm.flow.vo.FlowVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,8 +37,8 @@ @GetMapping("todo-list") @ApiOperationSupport(order = 3) @Operation(summary = "寰呭姙浠诲姟", description = "浼犲叆娴佺▼淇℃伅") - public R<IPage<BladeFlow>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") LocalDate createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") LocalDate createTimeEnd, Query query) { - IPage<BladeFlow> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword); + public R<IPage<FlowVO>> todoList(@Parameter(description = "鍏抽敭瀛�") String keyword, @Parameter(description = "鍒涘缓鏃堕棿寮�濮�") LocalDate createTimeBegin, @Parameter(description = "鍒涘缓鏃堕棿鎴") LocalDate createTimeEnd, Query query) { + IPage<FlowVO> pages = businessService.selectTodoPage(Condition.getPage(query), createTimeBegin,createTimeEnd,keyword); return R.data(pages); } @@ -50,8 +48,8 @@ @GetMapping("alltask-list") @ApiOperationSupport(order = 3) @Operation(summary = "鎵�鏈変换鍔★紙fortest锛�", description = "浼犲叆娴佺▼淇℃伅") - public R<IPage<BladeFlow>> alltaskList(@Parameter(description = "鍏抽敭瀛�") String keyword,LocalDate createTimeBegin,LocalDate createTimeEnd, Query query) { - IPage<BladeFlow> pages = businessService.selectAllTaskPage(Condition.getPage(query), keyword); + public R<IPage<FlowVO>> alltaskList(@Parameter(description = "鍏抽敭瀛�") String keyword, LocalDate createTimeBegin, LocalDate createTimeEnd, Query query) { + IPage<FlowVO> pages = businessService.selectAllTaskPage(Condition.getPage(query), keyword); return R.data(pages); } -- Gitblit v1.9.3