储备项目新-工作流代码提交

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -331,7 +331,7 @@ public class ActTaskService extends BaseService {
         String userId = UserUtils.getUser().getLoginName();//ObjectUtils.toString(UserUtils.getUser().getId());
 
 
-        /*// =============== 已经签收的任务  ===============
+        // =============== 已经签收的任务  ===============
         TaskQuery todoTaskQuery = taskService.createTaskQuery().taskAssignee(userId).active()
                 .includeProcessVariables().orderByTaskCreateTime().desc();
 
@@ -345,7 +345,7 @@ public class ActTaskService extends BaseService {
         }
         if (act.getEndDate() != null) {
             todoTaskQuery.taskCreatedBefore(act.getEndDate());
-        }*/
+        }
 
 
         // =============== 等待签收的任务  ===============
@@ -363,10 +363,10 @@ public class ActTaskService extends BaseService {
             toClaimQuery.taskCreatedBefore(act.getEndDate());
         }
 
-//        long taskCount = todoTaskQuery.count();
+        long taskCount = todoTaskQuery.count();
         long claimCount = toClaimQuery.count();
-//        long total = taskCount + claimCount;
-        long total = claimCount;
+        long total = taskCount + claimCount;
+//        long total = claimCount;
         page.setCount(total);
 
 
@@ -377,7 +377,7 @@ public class ActTaskService extends BaseService {
         // 查询列表
         List<Task> toClaimList = Lists.newArrayList();
         if (end == -1) {//不分页
-//            todoList = todoTaskQuery.list();
+            todoList = todoTaskQuery.list();
             toClaimList = toClaimQuery.list();
         } else {
 
@@ -393,6 +393,8 @@ public class ActTaskService extends BaseService {
                 toClaimList = toClaimQuery.listPage(start, page.getMaxResults());
             }else if (start < claimCount){
                 toClaimList = toClaimQuery.listPage(start, (int) claimCount - start);
+            }else {
+                todoList = todoTaskQuery.listPage(start - (int) claimCount, page.getMaxResults());
             }
         }