feat: 征求意见流程汇总意见节点显示所有意见
This commit is contained in:
+7
-8
@@ -44,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.jero.modules.activiti.common.ActivitiCommon.MAIN_INSTANCE_ID;
|
||||
import static com.jero.modules.activiti.process.esRevisionAdvice.common.RevisionTaskNodeIdConstant.*;
|
||||
@@ -184,13 +183,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
||||
if (Objects.nonNull(data)) {
|
||||
detailQueryWrapper.eq(EsRevisionAdvice::getProcessInstanceId, processInstanceId);
|
||||
adviceList = adviceService.list(detailQueryWrapper);
|
||||
// 筛选出最新一轮
|
||||
if (!adviceList.isEmpty()) {
|
||||
Map<Integer, List<EsRevisionAdvice>> map = adviceList.stream().collect(Collectors.groupingBy(EsRevisionAdvice::getBatchNum));
|
||||
// 获取轮数最大的轮数
|
||||
Integer maxNum = this.calculateAdviceBatchNum(adviceList);
|
||||
adviceList = map.get(maxNum);
|
||||
}
|
||||
// // 筛选出最新一轮
|
||||
// if (!adviceList.isEmpty()) {
|
||||
// Map<Integer, List<EsRevisionAdvice>> map = adviceList.stream().collect(Collectors.groupingBy(EsRevisionAdvice::getBatchNum));
|
||||
// // 获取轮数最大的轮数
|
||||
// Integer maxNum = this.calculateAdviceBatchNum(adviceList);
|
||||
// adviceList = map.get(maxNum);
|
||||
// }
|
||||
}
|
||||
// 获取当前流程
|
||||
String xmlNodeId = record.getNodeId();
|
||||
|
||||
Reference in New Issue
Block a user