|
@@ -1,5 +1,7 @@
|
|
|
package com.fjhx.flow.service.flow.impl;
|
|
|
|
|
|
+import cn.hutool.core.date.BetweenFormatter;
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
@@ -481,12 +483,17 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
|
|
|
private Page<FlowExampleVo> doSelectExample(FlowExampleSelectDto dto, IWrapper<FlowExample> wrapper) {
|
|
|
|
|
|
wrapper.eq("fd", FlowDefinition::getFlowInfoId, dto.getFlowInfoId())
|
|
|
- .keyword(dto, new SqlField("fe", FlowExample::getTitle),new SqlField("su.nick_name"))
|
|
|
+ .keyword(dto, new SqlField("fe", FlowExample::getTitle), new SqlField("su.nick_name"))
|
|
|
.orderByDesc("fe", FlowExample::getId);
|
|
|
|
|
|
Page<FlowExampleVo> page = baseMapper.selectExample(dto.getPage(), wrapper);
|
|
|
List<FlowExampleVo> records = page.getRecords();
|
|
|
|
|
|
+ //赋值节点耗时
|
|
|
+ for (FlowExampleVo record : records) {
|
|
|
+ record.setDurationStr(DateUtil.formatBetween(new Date(), record.getCreateTime(), BetweenFormatter.Level.MINUTE));
|
|
|
+ }
|
|
|
+
|
|
|
// 赋值流程发起人名称
|
|
|
UserUtil.assignmentNickName(records, BasePo::getCreateUser, FlowExampleVo::setCreateUserName);
|
|
|
|