Commit 6c14fbfe authored by tangwei's avatar tangwei

工作流执行日志增加备注,以及执行备注

parent 4b5feffe
...@@ -396,18 +396,24 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD ...@@ -396,18 +396,24 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
try { try {
Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(processInstanceId).getResult(); Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(processInstanceId).getResult();
List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger"); List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger");
flowLogger = flowLogger.stream().map(i -> { List<LinkedHashMap> flowLoggernew =new ArrayList<>();
i.put("approvalStatue",i.get("approvalStatue").toString().equals("0")?"通过":"驳回"); for (LinkedHashMap linkedHashMap : flowLogger) {
//审核意见 if(linkedHashMap.get("operateDate")!=null&&!linkedHashMap.get("operateDate").toString().isEmpty()){
List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>)i.get("approvalSuggestion"); LinkedHashMap linke=new LinkedHashMap();
if(approvalSuggestion!=null&&!approvalSuggestion.isEmpty()){ linke.put("approvalStatue",linkedHashMap.get("approvalStatue").toString().equals("0")?"通过":"驳回");
i.put("approvalSuggestion",approvalSuggestion.get(0).get("message")); //审核意见
List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>)linkedHashMap.get("approvalSuggestion");
if(approvalSuggestion!=null&&!approvalSuggestion.isEmpty()){
linke.put("approvalSuggestion",approvalSuggestion.get(0).get("message"));
}
linke.put("taskName",linkedHashMap.get("taskName").toString());
linke.put("operator",linkedHashMap.get("operator").toString());
linke.put("operateDate",linkedHashMap.get("operateDate").toString());
flowLoggernew.add(linke);
}
} }
return i;
}).collect(Collectors.toList());
LoggerDto loggerDto =new LoggerDto(); LoggerDto loggerDto =new LoggerDto();
loggerDto.setLogger(flowLogger); loggerDto.setLogger(flowLoggernew);
surveyInfoAllDto.setOrderTracking(loggerDto); surveyInfoAllDto.setOrderTracking(loggerDto);
} catch (Exception e){ } catch (Exception e){
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment