From 996f620dee5527d12210429cef5b8ad1de6cd5c3 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 07 十一月 2019 13:42:45 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java b/CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
index e4fcffd..0f8ae9e 100644
--- a/CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
+++ b/CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.common.IResourceEntryStoreInnerServiceSMO;
+import com.java110.dto.PageDto;
import com.java110.dto.resourceStore.ResourceOrderDto;
import com.java110.entity.audit.AuditUser;
import org.activiti.engine.ProcessEngine;
@@ -57,16 +58,34 @@
}
/**
+ * 鏌ヨ鐢ㄦ埛浠诲姟鏁�
+ *
+ * @param user
+ * @return
+ */
+ public long getUserTaskCount(@RequestBody AuditUser user) {
+ TaskService taskService = processEngine.getTaskService();
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEntry");
+ query.taskAssignee(user.getUserId());
+ return query.count();
+ }
+
+ /**
* 鑾峰彇鐢ㄦ埛浠诲姟
*
* @param user 鐢ㄦ埛淇℃伅
*/
public List<ResourceOrderDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery();
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEntry");
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
- List<Task> list = query.list();
+ List<Task> list = null;
+ if (user.getPage() != PageDto.DEFAULT_PAGE) {
+ list = query.listPage(user.getPage(), user.getRow());
+ }else{
+ list = query.list();
+ }
List<ResourceOrderDto> resourceOrderDtos = new ArrayList<>();
--
Gitblit v1.8.0