abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整已办排序

Browse Source
This commit is contained in:
gssong 2024-12-08 15:36:55 +08:00
parent 91cc65890c
commit 1723a63138
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -220,6 +220,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
} }
} }
wrapper.eq(FlowInstance::getCreateBy, LoginHelper.getUserIdStr()); wrapper.eq(FlowInstance::getCreateBy, LoginHelper.getUserIdStr());
wrapper.orderByDesc(FlowInstance::getCreateTime);
Page<FlowInstance> page = flowInstanceMapper.selectPage(pageQuery.build(), wrapper); Page<FlowInstance> page = flowInstanceMapper.selectPage(pageQuery.build(), wrapper);
TableDataInfo<FlowInstanceVo> build = TableDataInfo.build(); TableDataInfo<FlowInstanceVo> build = TableDataInfo.build();
List<FlowInstanceVo> flowInstanceVos = BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class); List<FlowInstanceVo> flowInstanceVos = BeanUtil.copyToList(page.getRecords(), FlowInstanceVo.class);

1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -275,6 +275,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo); QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
queryWrapper.in("t.approver", LoginHelper.getUserIdStr()); queryWrapper.in("t.approver", LoginHelper.getUserIdStr());
queryWrapper.orderByDesc("t.create_time").orderByDesc("t.update_time");
Page<FlowHisTaskVo> page = flwTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper); Page<FlowHisTaskVo> page = flwTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper);
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }