|
@@ -531,7 +531,13 @@ public class TaskController extends BladeController {
|
|
|
vo.setParallelProcessInstanceId(flow.getProcessInstanceId());
|
|
|
vo.setTaskId(flow.getTaskId());
|
|
|
vo.setTaskStatus(new Integer("1").equals(task.getStatus()) ? "待审批" : new Integer("2").equals(task.getStatus()) ? "已审批" : "已废除", task.getStatus());
|
|
|
- vo.setEVisaContent(taskParallel.getEVisaContent());
|
|
|
+// vo.setEVisaContent(taskParallel.getEVisaContent());
|
|
|
+ if (task.getStatus() == 3) {
|
|
|
+ vo.setEVisaContent("废除成功");
|
|
|
+ }else {
|
|
|
+ vo.setEVisaContent(taskParallel.getEVisaContent());
|
|
|
+ }
|
|
|
+
|
|
|
//获取主流程下所有相关的审批人
|
|
|
List<TaskParallel> linkList = this.taskParallelService.list(Wrappers.<TaskParallel>lambdaQuery().eq(TaskParallel::getProcessInstanceId, task.getProcessInstanceId()).eq(TaskParallel::getIsDeleted, 0));
|
|
|
if (linkList != null && linkList.size() > 0) {
|