From 8936415a62627e4552dc600e26d92039b26cedfa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 30 一月 2020 15:10:21 +0800
Subject: [PATCH] 加入费用项处理页面
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java b/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
index ee1f32d..cefd7b8 100644
--- a/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
+++ b/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
@@ -4,16 +4,19 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
-import com.java110.dto.FeeDto;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.entity.audit.AuditUser;
import com.java110.utils.util.Assert;
+import org.activiti.engine.HistoryService;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.identity.Authentication;
+import org.activiti.engine.query.Query;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Comment;
import org.activiti.engine.task.Task;
@@ -69,17 +72,17 @@
/**
* 鑷姩鎻愪氦绗竴姝�
*/
- private void autoFinishFirstTask(ComplaintDto complaintDto){
+ private void autoFinishFirstTask(ComplaintDto complaintDto) {
Task task = null;
TaskQuery query = taskService.createTaskQuery().taskCandidateOrAssigned(complaintDto.getCurrentUserId()).active();
List<Task> todoList = query.list();//鑾峰彇鐢宠浜虹殑寰呭姙浠诲姟鍒楄〃
for (Task tmp : todoList) {
- if(tmp.getProcessInstanceId().equals(complaintDto.getProcessInstanceId())){
+ if (tmp.getProcessInstanceId().equals(complaintDto.getProcessInstanceId())) {
task = tmp;//鑾峰彇褰撳墠娴佺▼瀹炰緥锛屽綋鍓嶇敵璇蜂汉鐨勫緟鍔炰换鍔�
break;
}
}
- Assert.notNull(task, "鏈壘鍒板綋鍓嶇敤鎴蜂换鍔serId = "+ complaintDto.getCurrentUserId());
+ Assert.notNull(task, "鏈壘鍒板綋鍓嶇敤鎴蜂换鍔serId = " + complaintDto.getCurrentUserId());
complaintDto.setTaskId(task.getId());
complaintDto.setAuditCode("10000");
complaintDto.setAuditMessage("鎻愪氦");
@@ -113,13 +116,13 @@
query.orderByTaskCreateTime().desc();
List<Task> list = null;
if (user.getPage() != PageDto.DEFAULT_PAGE) {
- list = query.listPage(user.getPage(), user.getRow());
+ list = query.listPage((user.getPage() - 1) * user.getRow(), user.getRow());
} else {
list = query.list();
}
List<String> complaintIds = new ArrayList<>();
- Map<String,String> taskBusinessKeyMap = new HashMap<>();
+ Map<String, String> taskBusinessKeyMap = new HashMap<>();
for (Task task : list) {
String processInstanceId = task.getProcessInstanceId();
//3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
@@ -127,10 +130,10 @@
//4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
String business_key = pi.getBusinessKey();
complaintIds.add(business_key);
- taskBusinessKeyMap.put(business_key,task.getId());
+ taskBusinessKeyMap.put(business_key, task.getId());
}
- if(complaintIds == null || complaintIds.size() == 0){
+ if (complaintIds == null || complaintIds.size() == 0) {
return new ArrayList<>();
}
@@ -141,10 +144,25 @@
complaintDto.setComplaintIds(complaintIds.toArray(new String[complaintIds.size()]));
List<ComplaintDto> tmpComplaintDtos = complaintInnerServiceSMOImpl.queryComplaints(complaintDto);
- for(ComplaintDto tmpComplaintDto : tmpComplaintDtos){
+ for (ComplaintDto tmpComplaintDto : tmpComplaintDtos) {
tmpComplaintDto.setTaskId(taskBusinessKeyMap.get(tmpComplaintDto.getComplaintId()));
}
return tmpComplaintDtos;
+ }
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浠诲姟鏁�
+ *
+ * @param user
+ * @return
+ */
+ public long getUserHistoryTaskCount(@RequestBody AuditUser user) {
+ HistoryService historyService = processEngine.getHistoryService();
+ Query query = historyService.createHistoricTaskInstanceQuery()
+ .processDefinitionKey("complaint")
+ .taskAssignee(user.getUserId());
+ return query.count();
}
/**
@@ -153,23 +171,25 @@
* @param user 鐢ㄦ埛淇℃伅
*/
public List<ComplaintDto> getUserHistoryTasks(@RequestBody AuditUser user) {
- TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("complaint");
- ;
- query.taskAssignee(user.getUserId());
- query.orderByTaskCreateTime().desc();
- List<Task> list = null;
+ HistoryService historyService = processEngine.getHistoryService();
+ Query query = historyService.createHistoricTaskInstanceQuery()
+ .processDefinitionKey("complaint")
+ .taskAssignee(user.getUserId())
+ .orderByHistoricTaskInstanceStartTime()
+ .desc();
+
+ List<HistoricTaskInstance> list = null;
if (user.getPage() != PageDto.DEFAULT_PAGE) {
- list = query.listPage(user.getPage(), user.getRow());
+ list = query.listPage((user.getPage() - 1) * user.getRow(), user.getRow());
} else {
list = query.list();
}
List<String> complaintIds = new ArrayList<>();
- for (Task task : list) {
+ for (HistoricTaskInstance task : list) {
String processInstanceId = task.getProcessInstanceId();
//3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
- ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ HistoricProcessInstance pi = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
//4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
String business_key = pi.getBusinessKey();
complaintIds.add(business_key);
@@ -193,6 +213,10 @@
taskService.addComment(complaintDto.getTaskId(), processInstanceId, complaintDto.getAuditMessage());
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", complaintDto.getAuditCode());
+ variables.put("currentUserId", complaintDto.getCurrentUserId());
+ //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
+ //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
+ //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
taskService.complete(complaintDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
--
Gitblit v1.8.0