From fdbb2b73910384a19e496b85b5b4985c2d218dcc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 17 五月 2020 14:18:53 +0800
Subject: [PATCH] 调试图片下载bug
---
CommonService/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java | 80 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 9 deletions(-)
diff --git a/CommonService/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java b/CommonService/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
index 1cf6349..759b9dd 100644
--- a/CommonService/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
+++ b/CommonService/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
@@ -2,16 +2,25 @@
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.audit.IAuditUserInnerServiceSMO;
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.core.smo.purchaseApplyUser.IPurchaseApplyUserInnerServiceSMO;
+import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
+import com.java110.dto.auditUser.AuditUserDto;
+import com.java110.dto.complaint.ComplaintDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.user.UserDto;
import com.java110.entity.audit.AuditUser;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.Base64Convert;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
+import org.activiti.bpmn.model.BpmnModel;
import org.activiti.engine.HistoryService;
import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.history.HistoricProcessInstance;
@@ -27,7 +36,11 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,8 +59,20 @@
private TaskService taskService;
@Autowired
+ private HistoryService historyService;
+
+ @Autowired
+ private RepositoryService repositoryService;
+
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
private IComplaintInnerServiceSMO complaintInnerServiceSMOImpl;
+ @Autowired
+ private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
/**
* 鍚姩娴佺▼
@@ -58,15 +83,15 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("purchaseApplyDto", purchaseApplyDto);
+ variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
variables.put("userId", purchaseApplyDto.getCurrentUserId());
//寮�鍚祦绋�
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("resourceEntry", purchaseApplyDto.getApplyOrderId(), variables);
- //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
+// //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
- // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
-
+// // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
+//
purchaseApplyDto.setProcessInstanceId(processInstanceId);
- //绗竴涓妭鐐硅嚜鍔ㄦ彁浜�
autoFinishFirstTask(purchaseApplyDto);
return purchaseApplyDto;
}
@@ -78,6 +103,7 @@
Task task = null;
TaskQuery query = taskService.createTaskQuery().taskCandidateOrAssigned(purchaseApplyDto.getCurrentUserId()).active();
List<Task> todoList = query.list();//鑾峰彇鐢宠浜虹殑寰呭姙浠诲姟鍒楄〃
+
for (Task tmp : todoList) {
if (tmp.getProcessInstanceId().equals(purchaseApplyDto.getProcessInstanceId())) {
task = tmp;//鑾峰彇褰撳墠娴佺▼瀹炰緥锛屽綋鍓嶇敵璇蜂汉鐨勫緟鍔炰换鍔�
@@ -171,9 +197,9 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("resourceEnter")
.taskAssignee(user.getUserId());
- if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
+ if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("resourceEnter");
- }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
+ } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("resourceEnterDealUser");
}
@@ -191,10 +217,10 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("resourceEnter")
- .taskAssignee(user.getUserId()) ;
- if(!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())){
+ .taskAssignee(user.getUserId());
+ if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("resourceEnter");
- }else if(!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())){
+ } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("resourceEnterDealUser");
}
@@ -236,10 +262,12 @@
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", purchaseApplyDto.getAuditCode());
variables.put("currentUserId", purchaseApplyDto.getCurrentUserId());
+ variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
//taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
//taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
//taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
+ //taskService.setVariable(purchaseApplyDto.getTaskId(), "purchaseApplyDto", purchaseApplyDto);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
@@ -269,6 +297,40 @@
return auditMessageDtos;
}
+ /**
+ * 鑾峰彇浠诲姟褰撳墠澶勭悊浜�
+ *
+ * @param purchaseApplyDto
+ * @return
+ */
+ public PurchaseApplyDto getTaskCurrentUser(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+
+ TaskService taskService = processEngine.getTaskService();
+ Task task = taskService.createTaskQuery().processInstanceBusinessKey(purchaseApplyDto.getApplyOrderId()).singleResult();
+
+ if (task == null) {
+ purchaseApplyDto.setStaffId("");
+ purchaseApplyDto.setStaffName("");
+ purchaseApplyDto.setStaffTel("");
+ return purchaseApplyDto;
+ }
+
+ String userId = task.getAssignee();
+ List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
+
+ if (users == null || users.size() == 0) {
+ purchaseApplyDto.setStaffId("");
+ purchaseApplyDto.setStaffName("");
+ purchaseApplyDto.setStaffTel("");
+ return purchaseApplyDto;
+ }
+
+ purchaseApplyDto.setCurrentUserId(userId);
+ purchaseApplyDto.setStaffName(users.get(0).getName());
+ purchaseApplyDto.setStaffTel(users.get(0).getTel());
+ return purchaseApplyDto;
+
+ }
--
Gitblit v1.8.0