更新

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

@@ -76,33 +76,33 @@ public class ExcelController {
             vars.put("auditUser", "审核人");
         } else {
             vars.put("NeedDataAudit", false);
-        }
 
-        String executionId = task.getExecutionId();
-        // 总的会签任务数量
-        int nrOfInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfInstances").toString());
-        // 当前获取的会签任务数量
-        int nrOfActiveInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfActiveInstances").toString());
-        // 已经完成的会签任务数量
-        int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
-        Activity activity = process.getActivity();
-
-        if (nrOfCompletedInstances == nrOfInstances - 1) {
-            if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
-                vars.put("NeedConfirm", true);
-                vars.put("manager", "审核人");
-            } else {
-                vars.put("NeedConfirm", false);
+            String executionId = task.getExecutionId();
+            // 总的会签任务数量
+            int nrOfInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfInstances").toString());
+            // 当前获取的会签任务数量
+            int nrOfActiveInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfActiveInstances").toString());
+            // 已经完成的会签任务数量
+            int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
+            Activity activity = process.getActivity();
+
+            if (nrOfCompletedInstances == nrOfInstances - 1) {
+                if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
+                    vars.put("NeedConfirm", true);
+                    vars.put("manager", "审核人");
+                } else {
+                    vars.put("NeedConfirm", false);
 //                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
 //                    vars.put("NeedDataBack", true);
 //                    vars.put("backFlowUser", "数据回流人");
 //                } else {
-                vars.put("NeedDataBack", false);
-                // 流程完
+                    vars.put("NeedDataBack", false);
+                    // 流程完
 //                }
+                }
+                activity.setStatus(Activity.STATUS_WAIT);
+                activityService.save(activity);
             }
-            activity.setStatus(Activity.STATUS_WAIT);
-            activityService.save(activity);
         }
         taskService.complete(task.getId(), vars);
 

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

@@ -80,7 +80,6 @@ public class TaskController {
         } else {
             page = activityService.findAll(pageNo, pageSize, orderBy, propBy);
         }
-        SimpleTask.convert(page.getContent());
         return SimplePage.of(page);
     }
 
@@ -104,7 +103,7 @@ public class TaskController {
         List<Mission> missions = new ArrayList<>();
 
         // 获取个人任务
-        List<Task> tasks = taskService.createTaskQuery().taskAssigneeLike("%" + username + "%").active().list();
+        List<Task> tasks = taskService.createTaskQuery().taskAssignee(username).active().list();
         tasks.forEach(task -> {
             missions.add(convertTaskToMission(task, ImmutableMap.of("username", username, "type", TaskConstant.TASK_TYPE_PERSONAL)));
         });
@@ -246,12 +245,42 @@ public class TaskController {
 
     @ApiOperation(value = "审核通过活动")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "taskId", value = "活动id", paramType = "path", required = true, dataType = "long")
+            @ApiImplicitParam(name = "taskId", value = "活动id", paramType = "path", required = true, dataType = "string")
     })
     @PostMapping(value = "/task/pass/{taskId}")
-    public Object passTask(@PathVariable long taskId) {
-        Activity activity = activityService.findById(taskId);
-        // 完结活动， 流程跑完
+    public Object passTask(@PathVariable String taskId) {
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        CommonValidator.notNull(task, "任务不存在");
+        Map vars = new HashMap();
+        vars.put("DataAudit", true);
+
+        String executionId = task.getExecutionId();
+        // 总的会签任务数量
+        int nrOfInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfInstances").toString());
+        // 当前获取的会签任务数量
+        int nrOfActiveInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfActiveInstances").toString());
+        // 已经完成的会签任务数量
+        int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
+        String processInstanceId = task.getProcessInstanceId();
+        Process process = processService.findByProcessId(processInstanceId);
+        Activity activity = process.getActivity();
+        if (nrOfCompletedInstances == nrOfInstances - 1) {
+            if (activity.getNeedConfirm() == Activity.NEED_CONFIRM) {
+                vars.put("NeedConfirm", true);
+                vars.put("manager", TaskConstant.USER_NAME_MANAGER);
+            } else {
+                vars.put("NeedConfirm", false);
+//                if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
+//                    vars.put("NeedDataBack", true);
+//                    vars.put("backFlowUser", "数据回流人");
+//                } else {
+                vars.put("NeedDataBack", false);
+                // 流程完
+//                }
+            }
+            activity.setStatus(Activity.STATUS_WAIT);
+            activityService.save(activity);
+        }
         return "审核通过成功";
     }
 

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

@@ -62,14 +62,16 @@ public class UserController {
         List<Map> subNodes = (List<Map>) tree.get("subNodes");
         List<Map> orgs = (List<Map>) subNodes.get(0).get("subNodes");
         orgs.forEach(org -> {
-            List<Map> groups = feignAuthService.getUserGroups(0L, Long.parseLong(((Map) org.get("node")).get("id").toString()));
+            long orgId = Long.parseLong(((Map) org.get("node")).get("id").toString());
+            List<Map> groups = feignAuthService.getUserGroups(0L, orgId);
             groups.forEach(group -> {
-                List<Map> users = feignAuthService.getGroupUsers(0L, Long.parseLong(group.get("id").toString()));
+                long groupId = Long.parseLong(group.get("id").toString());
+                List<Map> users = feignAuthService.getGroupUsers(0L, groupId);
                 List<Map> groupSubNodes = new ArrayList<>();
                 users.forEach(user -> {
                     Map node = new HashMap();
-                    node.put("node", ImmutableMap.of("id", Long.parseLong(user.get("id").toString()), "name", user.get("name").toString()));
-                    node.put("subNodes", Collections.emptyList());
+                    long userId = Long.parseLong(user.get("id").toString());
+                    node.put("node", ImmutableMap.of("id", userId, "name", user.get("name").toString(), "orgId", orgId));
                     groupSubNodes.add(node);
                 });
                 group.put("subNodes", groupSubNodes);

src/main/java/com/keymobile/rest/service/FeignAuthService.java

@@ -36,6 +36,8 @@ public interface FeignAuthService {
     @GetMapping("/user")
     Map getUserByName(@RequestParam("name") String name);
 
+    @GetMapping("/users/{userId}/org")
+    Map getUserOrgById(@PathVariable("userId") long userId);
 
     /**
      * 获取所有用户组