|
|
@ -40,7 +40,8 @@ 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 (AppFlowableRecordVo vo : voList) { |
|
|
|
for (int i=0;i<voList.size();i++) { |
|
|
|
AppFlowableRecordVo vo=voList.get(i); |
|
|
|
if (vo.getFinishTime() != null) { |
|
|
|
AppFlowCommentVo commentVo = vo.getComment(); |
|
|
|
//类型
|
|
|
@ -53,14 +54,14 @@ public class AppService { |
|
|
|
if (StringUtils.isNotBlank(stateValue)) { |
|
|
|
String processEndTime = vo.getProcessEndTime(); |
|
|
|
vo.setStateValue(stateValue); |
|
|
|
if(StringUtils.isNotBlank(processEndTime)){ |
|
|
|
if(StringUtils.isNotBlank(processEndTime)&&i==0&&!"6".equals(type)){ |
|
|
|
vo.setStateValue("已办结");//流程已办结
|
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(type)) { |
|
|
|
String processEndTime = vo.getProcessEndTime(); |
|
|
|
vo.setStateKey(type); |
|
|
|
if(StringUtils.isNotBlank(processEndTime)){ |
|
|
|
if(StringUtils.isNotBlank(processEndTime)&&i==0&&!"6".equals(type)){ |
|
|
|
vo.setStateKey("8");//流程已办结
|
|
|
|
} |
|
|
|
|
|
|
|