|
|
@@ -5526,22 +5526,27 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
List<UserDefinedProcessRecordListVo> userDefinedProcessRecordListVos = new ArrayList<>();
|
|
|
for (ProcessRecordListVo p : processRecordListVos) {
|
|
|
String comment = p.getComment();
|
|
|
+ String approveComment = "";
|
|
|
+ if(!"".equals(comment) && comment != null){
|
|
|
+ approveComment = comment.substring(comment.indexOf("审批内容:")+5);
|
|
|
+ }
|
|
|
+
|
|
|
String[] commentArr = comment.split(",");
|
|
|
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());
|
|
|
- setShowNode(p.getShowNode());
|
|
|
- setNodeName(p.getNodeName());
|
|
|
- setComment(p.getComment());
|
|
|
- setStartTime(p.getStartTime());
|
|
|
- setCirculateMessage(p.getCirculateMessage());
|
|
|
- setApproveUserName(approveUserNameArr.length > 1 ? approveUserNameArr[1] : "");
|
|
|
- setApproveResult(approveResultArr.length > 1 ? approveResultArr[1] : "");
|
|
|
- setApproveComment(approveCommentArr.length > 1 ? approveCommentArr[1] : "");
|
|
|
- }});
|
|
|
+ UserDefinedProcessRecordListVo recordListVo = new UserDefinedProcessRecordListVo();
|
|
|
+ recordListVo.setNodeType(p.getNodeType());
|
|
|
+ recordListVo.setShowNode(p.getShowNode());
|
|
|
+ recordListVo.setNodeName(p.getNodeName());
|
|
|
+ recordListVo.setComment(p.getComment());
|
|
|
+ recordListVo.setStartTime(p.getStartTime());
|
|
|
+ recordListVo.setCirculateMessage(p.getCirculateMessage());
|
|
|
+ recordListVo.setApproveUserName(approveUserNameArr.length > 1 ? approveUserNameArr[1] : "");
|
|
|
+ recordListVo.setApproveResult(approveResultArr.length > 1 ? approveResultArr[1] : "");
|
|
|
+ recordListVo.setApproveComment(approveComment);
|
|
|
+ userDefinedProcessRecordListVos.add(recordListVo);
|
|
|
}
|
|
|
|
|
|
if (p.getNodeName().equals("开始节点")) {
|