xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-30 15:16:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 调整已办任务排序，添加注释

Browse Source
This commit is contained in:
gssong 2023-06-25 20:52:30 +08:00
parent 1f2cf8368c
commit 596c51e5d9
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
View File

@ -67,6 +67,11 @@ public class TaskVo {
*/
private Date createTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 节点id
*/

10
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
View File

@ -347,6 +347,11 @@ public class ActModelServiceImpl implements IActModelService {
}
}
/**
* 查询用户
*
* @param filter 参数
*/
@Override
public ResultListDataRepresentation getUsers(String filter) {
@ -366,6 +371,11 @@ public class ActModelServiceImpl implements IActModelService {
return new ResultListDataRepresentation(userRepresentations);
}
/**
* 查询用户组
*
* @param filter 参数
*/
@Override
public ResultListDataRepresentation getGroups(String filter) {

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
View File

@ -196,7 +196,7 @@ public class ActTaskServiceImpl implements IActTaskService {
public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
String userId = String.valueOf(LoginHelper.getUserId());
HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().asc();
.taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().desc();
if (StringUtils.isNotBlank(taskBo.getName())) {
query.taskNameLike("%" + taskBo.getName() + "%");
}