From dd0a331654e90b6584354e32d80b5b94206d609f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 01 八月 2020 16:06:16 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 90 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
index 189ab31..b874fd8 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java
@@ -3,8 +3,8 @@
import com.java110.common.dao.IWorkflowServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IWorkflowInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.workflow.WorkflowAuditInfoDto;
@@ -25,10 +25,8 @@
import org.activiti.engine.impl.RepositoryServiceImpl;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
import org.activiti.engine.repository.Deployment;
-import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Comment;
import org.activiti.image.ProcessDiagramGenerator;
-import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +37,7 @@
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -259,7 +257,6 @@
.getResourceAsStream(workflowDto.getProcessDefinitionKey(), resourceName);
-
try {
image = Base64Convert.ioToBase64(in);
} catch (IOException e) {
@@ -320,6 +317,7 @@
//缁撴潫鑺傜偣
process.addFlowElement(createEndEvent());
+
//杩炵嚎
for (int y = 0; y < workflowStepDtos.size(); y++) {
WorkflowStepDto step = workflowStepDtos.get(y);
@@ -345,14 +343,18 @@
process.addFlowElement(createSequenceFlow("parallelGateway-fork" + y, "userTask" + y + u, "parallelGateway-fork-userTask" + y + u, ""));
process.addFlowElement(createSequenceFlow("userTask" + y + u, "parallelGateway-join" + y, "userTask-parallelGateway-join", ""));
if (u == (userList.size() - 1)) {
- process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", "${flag=='false'}"));
+ if (y == (workflowStepDtos.size() - 1)) {
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", ""));
+ } else {
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + y, "repulse" + y, "parallelGateway-join-repulse", "${flag=='false'}"));
+ }
process.addFlowElement(createSequenceFlow("repulse" + y, "task" + getNormal(workflowStepDtos, y), "repulse-task" + y, "${flag=='true'}"));
}
}
- //鏈�鍚庝竴涓妭鐐� 骞惰缃戝叧-姹囪仛鍒扮粨鏉熻妭鐐�
- //if (y == (workflowStepDtos.size() - 1)) {
- process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='false'}"));
- // }
+
+
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='false'}"));
+
} else {
//鏅�氭祦杞�
//绗竴涓妭鐐�
@@ -380,7 +382,12 @@
process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
}*/
process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "repulse" + y + "endEvent", "${flag=='false'}"));
- process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
+ if (y == (workflowStepDtos.size() - 1)) {
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, ""));
+ } else {
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
+ }
+
process.addFlowElement(createSequenceFlow("repulse" + y, "task" + y, "repulse-task" + y, "${flag=='true'}"));
}
}
@@ -508,6 +515,7 @@
/**
* 鏌ヨ瀹℃牳鍘嗗彶
+ *
* @param workflowAuditInfoDto
* @return
*/
@@ -525,23 +533,36 @@
// 闇�瑕佽浆鎹㈡垚HistoricActivityInstance
HistoricActivityInstance activityInstance = (HistoricActivityInstance) iterator
.next();
- if (activityInstance.getEndTime() == null) {
- continue;
+// if (activityInstance.getEndTime() == null) {
+// continue;
+// }
+
+ tmpWorkflowAuditInfoDto = new WorkflowAuditInfoDto();
+ tmpWorkflowAuditInfoDto.setAuditName(activityInstance.getActivityName());
+ if (activityInstance.getEndTime() != null) {
+ tmpWorkflowAuditInfoDto.setAuditTime(DateUtil.getFormatTimeString(activityInstance.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+ tmpWorkflowAuditInfoDto.setStateName("瀹屾垚");
+ tmpWorkflowAuditInfoDto.setState(WorkflowAuditInfoDto.STATE_FINISH);
+ } else {
+ tmpWorkflowAuditInfoDto.setStateName("姝ｅ湪澶勭悊");
+ tmpWorkflowAuditInfoDto.setState(WorkflowAuditInfoDto.STATE_NO);
}
+ Long time = activityInstance.getDurationInMillis() == null ? new Date().getTime() - activityInstance.getStartTime().getTime()
+ : activityInstance.getDurationInMillis();
+ tmpWorkflowAuditInfoDto.setDuration(getCostTime(time));
+
//濡傛灉杩樻病缁撴潫鍒欎笉鏀鹃噷闈�
List<Comment> comments = taskService.getTaskComments(activityInstance.getTaskId());
- if (comments == null || comments.size() < 1) {
- continue;
+ String msg = "";
+ if (comments != null && comments.size() > 0) {
+ for (Comment comment : comments) {
+ msg += (comment.getFullMessage() + "/");
+ }
}
- for (Comment comment : comments) {
- tmpWorkflowAuditInfoDto = new WorkflowAuditInfoDto();
- tmpWorkflowAuditInfoDto.setAuditName(activityInstance.getActivityName());
- tmpWorkflowAuditInfoDto.setAuditTime(DateUtil.getFormatTimeString(activityInstance.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
- tmpWorkflowAuditInfoDto.setDuration(activityInstance.getDurationInMillis() + "");
- tmpWorkflowAuditInfoDto.setUserId(comment.getUserId());
- tmpWorkflowAuditInfoDto.setMessage(comment.getFullMessage());
- workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);
- }
+ msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 1) : msg;
+ tmpWorkflowAuditInfoDto.setUserId(activityInstance.getAssignee());
+ tmpWorkflowAuditInfoDto.setMessage(msg);
+ workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);
}
return workflowAuditInfoDtos;
}
@@ -553,13 +574,15 @@
* @ReturnType:List
* @CreateDate:2014-6-25涓嬪崍5:03:13
* @UseFor :鍦� ACT_HI_ACTINST 琛ㄤ腑鎵惧埌瀵瑰簲娴佺▼瀹炰緥鐨剈serTask鑺傜偣 涓嶅寘鎷瑂tartEvent
+ * <p>
+ * .finished()
*/
private List<HistoricActivityInstance> getHisUserTaskActivityInstanceList(
String processInstanceId) {
List<HistoricActivityInstance> hisActivityInstanceList = ((HistoricActivityInstanceQuery) historyService
.createHistoricActivityInstanceQuery()
.processInstanceId(processInstanceId).activityType("userTask")
- .finished().orderByHistoricActivityInstanceEndTime().desc())
+ .orderByHistoricActivityInstanceStartTime().asc())
.list();
return hisActivityInstanceList;
}
@@ -579,4 +602,19 @@
public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
}
+
+ public String getCostTime(Long time) {
+ if (time == null) {
+ return "00:00";
+ }
+ long hours = time / (1000 * 60 * 60);
+ long minutes = (time - hours * (1000 * 60 * 60)) / (1000 * 60);
+ String diffTime = "";
+ if (minutes < 10) {
+ diffTime = hours + ":0" + minutes;
+ } else {
+ diffTime = hours + ":" + minutes;
+ }
+ return diffTime;
+ }
}
--
Gitblit v1.8.0