From 53b8bf23182c764c1e38039436d5faddfa34b0e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 06 十一月 2019 11:25:38 +0800
Subject: [PATCH] 再次优化审批

---
 CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 d3c46ca..5726f14 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
@@ -166,6 +166,7 @@
                 .taskAssignee(user.getUserId());
         return query.count();
     }
+
     /**
      * 鑾峰彇鐢ㄦ埛瀹℃壒鐨勪换鍔�
      *
@@ -174,10 +175,10 @@
     public List<ComplaintDto> getUserHistoryTasks(@RequestBody AuditUser user) {
         HistoryService historyService = processEngine.getHistoryService();
         Query query = historyService.createHistoricTaskInstanceQuery()
-                                                .processDefinitionKey("complaint")
-                                                .taskAssignee(user.getUserId())
-                                                .orderByHistoricTaskInstanceStartTime()
-                                                .desc();
+                .processDefinitionKey("complaint")
+                .taskAssignee(user.getUserId())
+                .orderByHistoricTaskInstanceStartTime()
+                .desc();
 
         List<HistoricTaskInstance> list = null;
         if (user.getPage() != PageDto.DEFAULT_PAGE) {
@@ -215,6 +216,9 @@
         Map<String, Object> variables = new HashMap<String, Object>();
         variables.put("auditCode", complaintDto.getAuditCode());
         //variables.put("userId", 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