Merge branch 'pre'

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -5669,7 +5669,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 //新增流程发起流程记录
                 WorkflowRecord record = new WorkflowRecord();
                 record.setNodeId(task.getId());
-                record.setNodeName(task.getName());
+                record.setNodeName("系统");
                 record.setNodeType(WorkflowConstant.USER_TASK_TYPE_NAME);
                 record.setProcessId(task.getProcessInstanceId());
                 record.setSchemaId(schemaId);
@@ -5678,14 +5678,14 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
 //                    record.setMessage("【审批人:" + user.getName() + "】 将 【任务:" + task.getName() + "】 驳回到 【任务:" + rejectUserTaskConfig.getName() + "】");
 //                record.setMessage("审批信息：由于审批超时，【系统】【自动驳回】审批,审批意见为：“系统自动驳回审批”，由【" + task.getName() + "】 流转到【" + rejectUserTaskConfig.getName() + "】");
-                String message = "【审阅】后未选择【" + task.getName() + "】，系统已自动驳回，请重新【审阅】并选择【" + task.getName() + "】";
+                String message = "【审阅】后未选择下一节点审核人，系统自动驳回，请重新【审阅】后选择下一节点审核。";
                 record.setMessage(message);
                 workflowRecordMapper.insert(record);
 
                 //新增流程发起流程记录
                 XjrWorkflowOperateRecord operateRecord = new XjrWorkflowOperateRecord();
                 operateRecord.setNodeId(task.getId());
-                operateRecord.setNodeName(task.getName());
+                operateRecord.setNodeName("系统");
                 operateRecord.setNodeType(WorkflowConstant.USER_TASK_TYPE_NAME);
                 operateRecord.setProcessId(task.getProcessInstanceId());
                 operateRecord.setSchemaId(schemaId);
@@ -5782,10 +5782,12 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 String[] approveResultArr = commentArr[1].split("：");
                 UserDefinedProcessRecordListVo recordListVo = new UserDefinedProcessRecordListVo();
                 recordListVo.setIsReject(0);
+                recordListVo.setApproveComment(approveComment);
                 if (approveResultArr.length > 1 && "驳回".equals(approveResultArr[1])) {
                     recordListVo.setIsReject(1);
                 }else if(comment.contains("自动驳回")){
                     recordListVo.setIsReject(1);
+                    recordListVo.setApproveComment(p.getComment());
                 }
 
                 recordListVo.setNodeType(p.getNodeType());
@@ -5796,7 +5798,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 recordListVo.setCirculateMessage(p.getCirculateMessage());
                 recordListVo.setApproveUserName(approveUserNameArr.length > 1 ? approveUserNameArr[1] : "");
                 recordListVo.setApproveResult(approveResultArr.length > 1 ? approveResultArr[1] : "");
-                recordListVo.setApproveComment(approveComment);
+
                 userDefinedProcessRecordListVos.add(recordListVo);
             }