mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-30 15:16:41 +08:00
update 调整已办任务排序,添加注释
This commit is contained in:
parent
1f2cf8368c
commit
596c51e5d9
@ -67,6 +67,11 @@ public class TaskVo {
|
|||||||
*/
|
*/
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 结束时间
|
||||||
|
*/
|
||||||
|
private Date endTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 节点id
|
* 节点id
|
||||||
*/
|
*/
|
||||||
|
@ -347,6 +347,11 @@ public class ActModelServiceImpl implements IActModelService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询用户
|
||||||
|
*
|
||||||
|
* @param filter 参数
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ResultListDataRepresentation getUsers(String filter) {
|
public ResultListDataRepresentation getUsers(String filter) {
|
||||||
|
|
||||||
@ -366,6 +371,11 @@ public class ActModelServiceImpl implements IActModelService {
|
|||||||
return new ResultListDataRepresentation(userRepresentations);
|
return new ResultListDataRepresentation(userRepresentations);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询用户组
|
||||||
|
*
|
||||||
|
* @param filter 参数
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ResultListDataRepresentation getGroups(String filter) {
|
public ResultListDataRepresentation getGroups(String filter) {
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|||||||
public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
|
public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
|
||||||
String userId = String.valueOf(LoginHelper.getUserId());
|
String userId = String.valueOf(LoginHelper.getUserId());
|
||||||
HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
|
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())) {
|
if (StringUtils.isNotBlank(taskBo.getName())) {
|
||||||
query.taskNameLike("%" + taskBo.getName() + "%");
|
query.taskNameLike("%" + taskBo.getName() + "%");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user