From 52227c836113c1100741ee627e3b37a7d8d2c6fa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 04 十一月 2019 12:01:46 +0800
Subject: [PATCH] 暂存代码
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 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 59856ab..12fae14 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,12 +4,16 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.complaint.IComplaintUserInnerServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.entity.audit.AuditUser;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
+import org.activiti.engine.impl.identity.Authentication;
import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
+import org.activiti.engine.task.Comment;
import org.activiti.engine.task.Task;
import org.activiti.engine.task.TaskQuery;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +48,9 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("complaintDto", complaintDto);
+ variables.put("userId", complaintDto.getCurrentUserId());
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("complaint", variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("complaint", complaintDto.getComplaintId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
@@ -75,13 +80,14 @@
*/
public List<ComplaintDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("complaint");;
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey("complaint");
+ ;
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
List<Task> list = null;
if (user.getPage() != PageDto.DEFAULT_PAGE) {
list = query.listPage(user.getPage(), user.getRow());
- }else{
+ } else {
list = query.list();
}
@@ -97,33 +103,42 @@
return complaintDtos;
}
- public boolean agreeCompleteTask(@RequestBody ComplaintDto complaintDto) {
+ public boolean completeTask(@RequestBody ComplaintDto complaintDto) {
TaskService taskService = processEngine.getTaskService();
+ Task task = taskService.createTaskQuery().taskId(complaintDto.getTaskId()).singleResult();
+ String processInstanceId = task.getProcessInstanceId();
+ Authentication.setAuthenticatedUserId(complaintDto.getCurrentUserId());
+ taskService.addComment(complaintDto.getTaskId(), processInstanceId, complaintDto.getAuditMessage());
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", complaintDto.getAuditCode());
taskService.complete(complaintDto.getTaskId(), variables);
- return true;
+
+ ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ if (pi == null) {
+ return true;
+ }
+ return false;
}
- public boolean refuteCompleteTask(@RequestBody ComplaintDto complaintDto) {
- TaskService taskService = processEngine.getTaskService();
- Map<String, Object> variables = new HashMap<String, Object>();
- variables.put("auditCode", complaintDto.getAuditCode());
- taskService.complete(complaintDto.getTaskId(), variables);
- return true;
- }
+ public List<AuditMessageDto> getAuditMessage(@RequestBody ComplaintDto complaintDto) {
- /**
- * 瀹℃牳 褰撳墠浠诲姟
- *
- * @param complaintDto 璧勬簮璁㈠崟
- * @return
- */
- public boolean complete(@RequestBody ComplaintDto complaintDto) {
TaskService taskService = processEngine.getTaskService();
+ Task task = taskService.createTaskQuery().taskId(complaintDto.getTaskId()).singleResult();
+ String processInstanceId = task.getProcessInstanceId();
+ List<Comment> comments = taskService.getProcessInstanceComments(processInstanceId);
+ List<AuditMessageDto> auditMessageDtos = new ArrayList<>();
+ if (comments == null || comments.size() < 1) {
+ return auditMessageDtos;
+ }
+ AuditMessageDto messageDto = null;
+ for (Comment comment : comments) {
+ messageDto = new AuditMessageDto();
+ messageDto.setCreateTime(comment.getTime());
+ messageDto.setUserId(comment.getUserId());
+ messageDto.setMessage(comment.getFullMessage());
+ }
- taskService.complete(complaintDto.getTaskId());
- return true;
+ return auditMessageDtos;
}
--
Gitblit v1.8.0