|
|
@@ -5425,19 +5425,38 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
for(ProcessRecordListVo p : processRecordListVos){
|
|
|
String comment = p.getComment();
|
|
|
String[] commentArr = comment.split(",");
|
|
|
- String[] approveUserNameArr = commentArr[0].split(":");
|
|
|
- String[] approveResultArr = commentArr[1].split(":");
|
|
|
- String[] approveCommentArr = commentArr[2].split(":");
|
|
|
- userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo(){{
|
|
|
- setNodeType(p.getNodeType());
|
|
|
- setNodeName(p.getNodeName());
|
|
|
- setComment(p.getComment());
|
|
|
- setStartTime(p.getStartTime());
|
|
|
- setCirculateMessage(p.getCirculateMessage());
|
|
|
- setApproveUserName(approveUserNameArr[1]);
|
|
|
- setApproveResult(approveResultArr[1]);
|
|
|
- setApproveComment(approveCommentArr[1]);
|
|
|
- }});
|
|
|
+ if(commentArr.length > 1){
|
|
|
+ String[] approveUserNameArr = commentArr[0].split(":");
|
|
|
+ String[] approveResultArr = commentArr[1].split(":");
|
|
|
+ String[] approveCommentArr = commentArr[2].split(":");
|
|
|
+ userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo(){{
|
|
|
+ setNodeType(p.getNodeType());
|
|
|
+ setNodeName(p.getNodeName());
|
|
|
+ setComment(p.getComment());
|
|
|
+ setStartTime(p.getStartTime());
|
|
|
+ setCirculateMessage(p.getCirculateMessage());
|
|
|
+ setApproveUserName(approveUserNameArr[1]);
|
|
|
+ setApproveResult(approveResultArr[1]);
|
|
|
+ setApproveComment(approveCommentArr[1]);
|
|
|
+ }});
|
|
|
+ }
|
|
|
+
|
|
|
+ if(p.getNodeName().equals("开始节点")) {
|
|
|
+ userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo(){{
|
|
|
+ setNodeType(p.getNodeType());
|
|
|
+ setComment(p.getComment());
|
|
|
+ setStartTime(p.getStartTime());
|
|
|
+ setCirculateMessage(p.getCirculateMessage());
|
|
|
+ setNodeName("流程发起");
|
|
|
+ setApproveResult("发起");
|
|
|
+ Pattern pattern = Pattern.compile("【(.*?)】");
|
|
|
+ Matcher matcher = pattern.matcher(p.getComment());
|
|
|
+ if (matcher.find()) {
|
|
|
+ setApproveUserName(matcher.group(1));
|
|
|
+ }
|
|
|
+ setApproveComment("发起流程");
|
|
|
+ }});
|
|
|
+ }
|
|
|
}
|
|
|
return userDefinedProcessRecordListVos;
|
|
|
}
|