|
|
@@ -1546,6 +1546,25 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
vo.setCurrentProgress(x.getCurrentProgress());
|
|
|
vo.setProcessName(x.getProcessName());
|
|
|
});
|
|
|
+ //查询审批记录中的驳回记录是否有驳回(最后一条)或者自动驳回(倒数第二条)
|
|
|
+ List<WorkflowRecord> recordList = workflowRecordMapper.selectList(
|
|
|
+ new QueryWrapper<WorkflowRecord>().lambda()
|
|
|
+ .eq(WorkflowRecord::getProcessId, task.getProcessInstanceId())
|
|
|
+ );
|
|
|
+ if(!recordList.isEmpty() && recordList.size() > 1){
|
|
|
+ String comment = recordList.get(recordList.size() - 1).getMessage();
|
|
|
+ if(comment.contains("【驳回】")){
|
|
|
+ User rejectUser = userService.getById(recordList.get(recordList.size() - 1).getCreateUserId());
|
|
|
+ vo.setRejectState(rejectUser.getName() + "驳回");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!recordList.isEmpty() && recordList.size() > 2){
|
|
|
+ String comment2 = recordList.get(recordList.size() - 2).getMessage();
|
|
|
+ if(comment2.contains("自动驳回")){
|
|
|
+ vo.setRejectState("系统自动驳回");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
vo.setProcessId(task.getProcessInstanceId());
|
|
|
vo.setTaskId(task.getId());
|
|
|
vo.setTaskName(task.getName());
|