|
|
|
@ -45,33 +45,47 @@ public class AppService { |
|
|
|
ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId); |
|
|
|
List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList()); |
|
|
|
voList.removeAll(Collections.singleton(null)); |
|
|
|
for (int i = 0; i < voList.size(); i++) { |
|
|
|
AppFlowableRecordVo vo = voList.get(i); |
|
|
|
if (vo.getFinishTime() != null) { |
|
|
|
AppFlowCommentVo commentVo = vo.getComment(); |
|
|
|
//类型
|
|
|
|
String type = commentVo.getType(); |
|
|
|
String comment = commentVo.getComment(); |
|
|
|
if (StringUtils.isNotBlank(comment)) { |
|
|
|
vo.setContent(comment); |
|
|
|
} |
|
|
|
String stateValue = FlowComment.getRemarkByType(type); |
|
|
|
if (StringUtils.isNotBlank(stateValue)) { |
|
|
|
String processEndTime = vo.getProcessEndTime(); |
|
|
|
vo.setStateValue(stateValue); |
|
|
|
if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) { |
|
|
|
if (!voList.isEmpty()) { |
|
|
|
for (int i = 0; i < voList.size(); i++) { |
|
|
|
AppFlowableRecordVo vo = voList.get(i); |
|
|
|
if (vo.getFinishTime() != null) { |
|
|
|
AppFlowCommentVo commentVo = vo.getComment(); |
|
|
|
//类型
|
|
|
|
String type = commentVo.getType(); |
|
|
|
String comment = commentVo.getComment(); |
|
|
|
if (StringUtils.isNotBlank(comment)) { |
|
|
|
vo.setContent(comment); |
|
|
|
} |
|
|
|
String stateValue = FlowComment.getRemarkByType(type); |
|
|
|
if (StringUtils.isNotBlank(stateValue)) { |
|
|
|
String processEndTime = vo.getProcessEndTime(); |
|
|
|
vo.setStateValue(stateValue); |
|
|
|
/* if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) { |
|
|
|
vo.setStateValue("已办结");//流程已办结
|
|
|
|
}*/ |
|
|
|
if (StringUtils.isNotBlank(processEndTime) && i == voList.size() - 1 && !"6".equals(type)) { |
|
|
|
voList.get(i - 1).setStateValue("已办结");//流程已办结
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(type)) { |
|
|
|
/* if (StringUtils.isNotBlank(type)) { |
|
|
|
String processEndTime = vo.getProcessEndTime(); |
|
|
|
vo.setStateKey(type); |
|
|
|
if (StringUtils.isNotBlank(processEndTime) && i == 0 && !"6".equals(type)) { |
|
|
|
vo.setStateKey("8");//流程已办结
|
|
|
|
} |
|
|
|
}*/ |
|
|
|
if (StringUtils.isNotBlank(type)) { |
|
|
|
String processEndTime = vo.getProcessEndTime(); |
|
|
|
vo.setStateKey(type); |
|
|
|
if (StringUtils.isNotBlank(processEndTime) && i == voList.size() - 1 && !"6".equals(type)) { |
|
|
|
voList.get(i - 1).setStateKey("8");//流程已办结
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return rb.success().setData(voList); |
|
|
|
} |
|
|
|
|
|
|
|
@ -87,9 +101,9 @@ public class AppService { |
|
|
|
a.setFlowableRecordVo(f); |
|
|
|
a.setState(0 + ""); |
|
|
|
List<AppUserVo> taskUserInfos = f.getTaskUserInfos(); |
|
|
|
if(taskUserInfos.size() == 1){ |
|
|
|
if (taskUserInfos.size() == 1) { |
|
|
|
AppUserVo appUserVo = taskUserInfos.get(0); |
|
|
|
if("admin".equals(appUserVo.getAssigneeName())){ |
|
|
|
if ("admin".equals(appUserVo.getAssigneeName())) { |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -106,20 +120,20 @@ public class AppService { |
|
|
|
list.add(a); |
|
|
|
}); |
|
|
|
// list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime()));
|
|
|
|
if(progressList.size()>0){ |
|
|
|
AppFlowableRecordVo appFlowableRecordVo = progressList.get(progressList.size()-1); |
|
|
|
if(!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())){ |
|
|
|
if (progressList.size() > 0) { |
|
|
|
AppFlowableRecordVo appFlowableRecordVo = progressList.get(progressList.size() - 1); |
|
|
|
if (!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())) { |
|
|
|
String proDefId = appFlowableRecordVo.getProcDefId(); |
|
|
|
Map<String,Object> map = appFlowableRecordVo.getProcVars(); |
|
|
|
Map<String, Object> map = appFlowableRecordVo.getProcVars(); |
|
|
|
FlowableQuery flowableQuery = new FlowableQuery(); |
|
|
|
flowableQuery.setModelId(proDefId); |
|
|
|
flowableQuery.setTaskDefKey(appFlowableRecordVo.getTaskDefKey()); |
|
|
|
flowableQuery.setMap(map); |
|
|
|
ResultBean<List<Map<String,Object>>> resultBean = flowTaskFeign.yuyanTest(flowableQuery); |
|
|
|
if(resultBean.getData() != null){ |
|
|
|
if(!resultBean.getData().isEmpty()){ |
|
|
|
List<Map<String,Object>> mapList = resultBean.getData(); |
|
|
|
mapList.forEach(f->{ |
|
|
|
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.yuyanTest(flowableQuery); |
|
|
|
if (resultBean.getData() != null) { |
|
|
|
if (!resultBean.getData().isEmpty()) { |
|
|
|
List<Map<String, Object>> mapList = resultBean.getData(); |
|
|
|
mapList.forEach(f -> { |
|
|
|
AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo(); |
|
|
|
AppFlowableRecordVo app = new AppFlowableRecordVo(); |
|
|
|
app.setTaskName(f.get("nodeName").toString()); |
|
|
|
@ -131,7 +145,7 @@ public class AppService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
list.sort(Comparator.nullsLast(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime,nullComparator))); |
|
|
|
list.sort(Comparator.nullsLast(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime, nullComparator))); |
|
|
|
return rb.success().setData(list); |
|
|
|
} |
|
|
|
|
|
|
|
|
fanzongzhe
2 years ago