From 7b3ff5b7c7bc669a3da292728c3a647de4fdac4f Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期二, 21 一月 2025 14:46:34 +0800 Subject: [PATCH] 修改流程 增加字典深度翻译 增加List翻译 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java index dff2503..fbec878 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java @@ -1,8 +1,10 @@ package org.jeecg.modules.activiti.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.modules.activiti.entity.AssignFileStream; import org.jeecg.modules.activiti.ext.ActTaskExt; @@ -51,11 +53,10 @@ @AutoLog(value = "DNC娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟") @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟", notes = "DNC娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟") @GetMapping("/find/task/list") - public QueryListResponseResult<ActTaskExt> getUndoTaskList() { - List<ActTaskExt> list = assignFileStreamService.getUndoTaskList(); - if(list == null) - list = Collections.emptyList(); - return new QueryListResponseResult<>(CommonCode.SUCCESS, list); + public Result<?> getUndoTaskList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage<ActTaskExt> actTaskExtIPage = assignFileStreamService.getUndoTaskList(pageNo,pageSize); + return Result.ok(actTaskExtIPage); } @AutoLog(value = "DNC娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�") @@ -80,9 +81,10 @@ @AutoLog(value = "DNC娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇") @ApiOperation(value = "DNC娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇", notes = "DNC娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇") - @GetMapping("/find/page/{page}/{size}") - public QueryPageResponseResult<AssignFileStreamExt> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, AssignFileStreamQueryRequest request) { - return assignFileStreamService.findPageList(page, size, request); + @GetMapping("/find/page") + public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, AssignFileStreamQueryRequest request) { + return assignFileStreamService.findPageList(pageNo, pageSize, request); } @AutoLog(value = "DNC娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�") -- Gitblit v1.9.3