更新

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -102,7 +102,9 @@ public class TaskController {
         // 获取个人任务
         List<Task> tasks = taskService.createTaskQuery().taskAssigneeLike(username + "%").active().list();
         tasks.forEach(task -> {
-            Map vars = ImmutableMap.of("username", username, "type", CommonConstant.TASK_TYPE_PERSONAL);
+            Map vars = new HashMap();
+            vars.put("username", username);
+            vars.put("type", CommonConstant.TASK_TYPE_PERSONAL);
             // 个人审核任务和补录任务
             if (task.getAssignee().indexOf(":") > 0) {
                 String[] array = task.getAssignee().split(":");
@@ -265,7 +267,7 @@ public class TaskController {
         boolean pass = status == CommonConstant.STATUS_PASS;
         Map vars = new HashMap();
         vars.put(CommonConstant.ACT_SIGN_DATA_AUDIT, pass);
-        taskService.complete(task.getId(), vars);
+
         if (pass) {
             String executionId = task.getExecutionId();
             // 总的会签任务数量
@@ -295,6 +297,7 @@ public class TaskController {
                 activityService.save(activity);
             }
         }
+        taskService.complete(task.getId(), vars);
         return pass ? "审核通过成功" : "审核驳回成功";
     }