From 138d5f087e386c657d964e4e4c2b8ac65038e085 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 二月 2021 14:47:06 +0800
Subject: [PATCH] 优化 考勤任务上报
---
service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java | 167 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 135 insertions(+), 32 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 721aec5..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,36 +3,29 @@
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;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.dto.workflow.WorkflowStepDto;
import com.java110.dto.workflow.WorkflowStepStaffDto;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.activiti.bpmn.BpmnAutoLayout;
-import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.bpmn.model.EndEvent;
-import org.activiti.bpmn.model.ExclusiveGateway;
-import org.activiti.bpmn.model.FlowNode;
-import org.activiti.bpmn.model.ParallelGateway;
import org.activiti.bpmn.model.Process;
-import org.activiti.bpmn.model.SequenceFlow;
-import org.activiti.bpmn.model.StartEvent;
-import org.activiti.bpmn.model.UserTask;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngines;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
+import org.activiti.bpmn.model.*;
+import org.activiti.engine.*;
import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricActivityInstanceQuery;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.impl.RepositoryServiceImpl;
import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.task.Comment;
import org.activiti.image.ProcessDiagramGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,6 +37,8 @@
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
import java.util.List;
/**
@@ -72,6 +67,9 @@
@Autowired
private RepositoryService repositoryService;
+
+ @Autowired
+ private TaskService taskService;
@Override
public List<WorkflowDto> queryWorkflows(@RequestBody WorkflowDto workflowDto) {
@@ -171,7 +169,7 @@
// 鑾峰彇娴佺▼鍥惧浘鍍忓瓧绗︽祦
ProcessDiagramGenerator pec = processEngine.getProcessEngineConfiguration().getProcessDiagramGenerator();
//閰嶇疆瀛椾綋
- InputStream imageStream = pec.generateDiagram(bpmnModel, "png", executedActivityIdList, flowIds, "瀹嬩綋", "寰蒋闆呴粦", "榛戜綋", null, 2.0);
+ InputStream imageStream = pec.generateDiagram(bpmnModel, "png", executedActivityIdList, flowIds, "瀹嬩綋", "瀹嬩綋", "瀹嬩綋", null, 2.0);
image = Base64Convert.ioToBase64(imageStream);
@@ -242,9 +240,10 @@
public String getWorkflowImage(@RequestBody WorkflowDto workflowDto) {
ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+ String image = "";
List<String> list = processEngine.getRepositoryService()//
.getDeploymentResourceNames(workflowDto.getProcessDefinitionKey());
- String image = "";
+
String resourceName = "";
if (list != null && list.size() > 0) {
for (String name : list) {
@@ -256,6 +255,8 @@
InputStream in = processEngine.getRepositoryService()
.getResourceAsStream(workflowDto.getProcessDefinitionKey(), resourceName);
+
+
try {
image = Base64Convert.ioToBase64(in);
} catch (IOException e) {
@@ -263,6 +264,7 @@
}
return image;
}
+
/**
* @Date锛�2017/11/24
@@ -307,13 +309,14 @@
} else {
//鏅�氭祦杞�
//瀹℃牳鑺傜偣
- process.addFlowElement(createGroupTask("task" + i, step.getWorkflowStepStaffs().get(0).getStaffName(), step.getWorkflowStepStaffs().get(0).getStaffId()));
+ process.addFlowElement(createUserTask("task" + i, step.getWorkflowStepStaffs().get(0).getStaffName(), step.getWorkflowStepStaffs().get(0).getStaffId()));
//鍥為��鑺傜偣
process.addFlowElement(createUserTask("repulse" + i, "鎻愪氦鑰�", "${startUserId}"));
}
}
//缁撴潫鑺傜偣
process.addFlowElement(createEndEvent());
+
//杩炵嚎
for (int y = 0; y < workflowStepDtos.size(); y++) {
@@ -329,9 +332,9 @@
//瀹℃牳鑺傜偣鎴栬�呭苟琛岀綉鍏�-姹囪仛鍒板苟琛岀綉鍏�-鍒嗘敮
//鍒ゆ柇涓婁竴涓妭鐐规槸鍚︽槸浼氱
if (WorkflowStepDto.TYPE_COUNTERSIGN.equals(workflowStepDtos.get(y - 1).getType())) {
- process.addFlowElement(createSequenceFlow("parallelGateway-join" + (y - 1), "parallelGateway-fork" + y, "parallelGateway-join-parallelGateway-fork-鍒嗘敮" + y, ""));
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + (y - 1), "parallelGateway-fork" + y, "parallelGateway-join-parallelGateway-fork-鍒嗘敮" + y, "${flag=='true'}"));
} else {
- process.addFlowElement(createSequenceFlow("task" + (y - 1), "parallelGateway-fork" + y, "task-repulse" + y, ""));
+ process.addFlowElement(createSequenceFlow("task" + (y - 1), "parallelGateway-fork" + y, "task-parallelGateway-fork" + y, "${flag=='true'}"));
}
}
//骞惰缃戝叧-鍒嗘敮鍜屼細绛剧敤鎴疯繛绾匡紝浼氱鐢ㄦ埛鍜屽苟琛岀綉鍏�-姹囪仛杩炵嚎
@@ -340,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'}"));
- process.addFlowElement(createSequenceFlow("repulse" + y, "task" + getNormal(workflowStepDtos, y), "repulse-task" + y, ""));
+ 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=='true'}"));
- }
+
+
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='false'}"));
+
} else {
//鏅�氭祦杞�
//绗竴涓妭鐐�
@@ -359,22 +366,29 @@
if (WorkflowStepDto.TYPE_COUNTERSIGN.equals(workflowStepDtos.get(y - 1).getType())) {
//浼氱
//骞惰缃戝叧-姹囪仛鍒板鏍歌妭鐐�
- process.addFlowElement(createSequenceFlow("parallelGateway-join" + (y - 1), "task" + y, "parallelGateway-join-task" + y, ""));
+ process.addFlowElement(createSequenceFlow("parallelGateway-join" + (y - 1), "task" + y, "parallelGateway-join-task" + y, "${flag=='true'}"));
} else {
//鏅��
process.addFlowElement(createSequenceFlow("task" + (y - 1), "task" + y, "task" + (y - 1) + "task" + y, "${flag=='true'}"));
}
}
//鏄惁鏈�鍚庝竴涓妭鐐�
- if (y == (workflowStepDtos.size() - 1)) {
+ /* if (y == (workflowStepDtos.size() - 1)) {
//瀹℃牳鑺傜偣鍒扮粨鏉熻妭鐐�
- process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "task" + y + "endEvent", "${flag=='true'}"));
- process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, ""));
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "task" + y + "endEvent", "${flag=='false'}"));
+ process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
} else {
//瀹℃牳鑺傜偣鍒板洖閫�鑺傜偣
process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
+ }*/
+ process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "repulse" + y + "endEvent", "${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, ""));
+
+ process.addFlowElement(createSequenceFlow("repulse" + y, "task" + y, "repulse-task" + y, "${flag=='true'}"));
}
}
@@ -439,7 +453,7 @@
userTask.setName(name);
userTask.setId(id);
userTask.setAssignee(userPkno);
- userTask.setCandidateUsers(candidateUsers);
+ //userTask.setCandidateUsers(candidateUsers);
return userTask;
}
@@ -499,6 +513,80 @@
return workflowServiceDaoImpl.queryWorkflowsCount(BeanConvertUtil.beanCovertMap(workflowDto));
}
+ /**
+ * 鏌ヨ瀹℃牳鍘嗗彶
+ *
+ * @param workflowAuditInfoDto
+ * @return
+ */
+ public List<WorkflowAuditInfoDto> queryWorkflowAuditHistory(@RequestBody WorkflowAuditInfoDto workflowAuditInfoDto) {
+ //List<TaskBo> taskBoList = new ArrayList<TaskBo>();
+ HistoricProcessInstance hisProcessInstance = (HistoricProcessInstance) historyService
+ .createHistoricProcessInstanceQuery()
+ .processInstanceBusinessKey(workflowAuditInfoDto.getBusinessKey()).singleResult();
+ // 璇ユ祦绋嬪疄渚嬬殑鎵�鏈夎妭鐐瑰鎵硅褰�
+ List<HistoricActivityInstance> hisActInstList = getHisUserTaskActivityInstanceList(hisProcessInstance
+ .getId());
+ List<WorkflowAuditInfoDto> workflowAuditInfoDtos = new ArrayList<>();
+ WorkflowAuditInfoDto tmpWorkflowAuditInfoDto = null;
+ for (Iterator iterator = hisActInstList.iterator(); iterator.hasNext(); ) {
+ // 闇�瑕佽浆鎹㈡垚HistoricActivityInstance
+ HistoricActivityInstance activityInstance = (HistoricActivityInstance) iterator
+ .next();
+// 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());
+ String msg = "";
+ if (comments != null && comments.size() > 0) {
+ for (Comment comment : comments) {
+ msg += (comment.getFullMessage() + "/");
+ }
+ }
+ msg = msg.endsWith("/") ? msg.substring(0, msg.length() - 1) : msg;
+ tmpWorkflowAuditInfoDto.setUserId(activityInstance.getAssignee());
+ tmpWorkflowAuditInfoDto.setMessage(msg);
+ workflowAuditInfoDtos.add(tmpWorkflowAuditInfoDto);
+ }
+ return workflowAuditInfoDtos;
+ }
+
+ /**
+ * @param processInstanceId
+ * @return
+ * @CreateUser:xxxx
+ * @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")
+ .orderByHistoricActivityInstanceStartTime().asc())
+ .list();
+ return hisActivityInstanceList;
+ }
+
public IWorkflowServiceDao getWorkflowServiceDaoImpl() {
return workflowServiceDaoImpl;
}
@@ -514,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