From d598f850efae87106b572a5b17cab5d83117b7d5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 29 二月 2020 16:19:17 +0800
Subject: [PATCH] 优化工作流手环节查询
---
CommonService/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 65d6404..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<>();
@@ -83,7 +102,7 @@
public boolean agreeCompleteTask(@RequestBody ResourceOrderDto resourceOrderDto) {
TaskService taskService = processEngine.getTaskService();
Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("auditFlag", true);
+ variables.put("auditCode", resourceOrderDto.getAuditCode());
taskService.complete(resourceOrderDto.getTaskId(), variables);
return true;
}
@@ -91,7 +110,7 @@
public boolean refuteCompleteTask(@RequestBody ResourceOrderDto resourceOrderDto) {
TaskService taskService = processEngine.getTaskService();
Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("auditFlag", true);
+ variables.put("auditCode", resourceOrderDto.getAuditCode());
taskService.complete(resourceOrderDto.getTaskId(), variables);
return true;
}
--
Gitblit v1.8.0