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/service/impl/AssignFileStreamServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
index 18c2067..82b3031 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/AssignFileStreamServiceImpl.java
@@ -16,6 +16,7 @@
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.activiti.entity.AssignFileStream;
import org.jeecg.modules.activiti.entity.ToEquipmentTask;
@@ -311,7 +312,7 @@
ExceptionCast.cast(CommonCode.INVALID_PARAM);
if(!ValidateUtil.validateString(stream.getDeviceId()))
ExceptionCast.cast(ActivitiCode.ACT_ASSIGN_DEVICE_NONE);
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
@@ -511,8 +512,8 @@
}
@Override
- public List<ActTaskExt> getUndoTaskList() {
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ public IPage<ActTaskExt> getUndoTaskList(Integer pageNo,Integer pageSize) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
return null;
@@ -536,7 +537,10 @@
ext.setAssignFileStream(streamDetail);
extList.add(ext);
});
- return extList;
+ //灏佽Page
+ IPage<ActTaskExt> page = new Page<>(pageNo,pageSize);
+ page.setRecords(extList);
+ return page;
}
@Override
@@ -551,7 +555,7 @@
public boolean approveAssignFile(String taskId, String streamId, AssignFileStream stream) {
if(!ValidateUtil.validateString(taskId) || !ValidateUtil.validateString(streamId) || stream == null)
ExceptionCast.cast(CommonCode.INVALID_PARAM);
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
@@ -693,7 +697,7 @@
}
@Override
- public QueryPageResponseResult<AssignFileStreamExt> findPageList(int page, int size, AssignFileStreamQueryRequest request) {
+ public Result<?> findPageList(int page, int size, AssignFileStreamQueryRequest request) {
if(page < 1 || size < 1) {
ExceptionCast.cast(CommonCode.INVALID_PAGE);
}
@@ -716,7 +720,7 @@
}
}
IPage<AssignFileStreamExt> streamExtIPage = super.getBaseMapper().findByPage(pageData, lambdaQueryWrapper);
- return new QueryPageResponseResult<>(CommonCode.SUCCESS, streamExtIPage);
+ return Result.ok(streamExtIPage);
}
@Override
--
Gitblit v1.9.3