From 982e63b981079caaae2be3ad8bb11d29cf9cd97b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 24 十二月 2024 14:43:36 +0800
Subject: [PATCH] 驳回使用自带驳回，对已完成流程查看流程推进的处理
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 656 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 561 insertions(+), 95 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index ab53566..ae71ab6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.impl;
+
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,15 +8,18 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.core.domain.AjaxResult;
+import com.ycl.common.core.domain.entity.SysDept;
import com.ycl.common.core.domain.entity.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.FlowComment;
+import com.ycl.common.enums.business.HandlerTypeEnum;
import com.ycl.common.enums.business.TaskStatusEnum;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.TaskTypeConstant;
import com.ycl.domain.dto.FlowTaskDto;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.entity.ProjectProcess;
+import com.ycl.domain.form.RejectTaskForm;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
import com.ycl.mapper.ProjectInfoMapper;
@@ -26,11 +30,14 @@
import com.ycl.domain.form.ProjectProcessForm;
import com.ycl.domain.vo.ProjectProcessVO;
import com.ycl.domain.query.ProjectProcessQuery;
+import com.ycl.service.common.TaskCommonService;
+import com.ycl.system.service.ISysDeptService;
import com.ycl.system.service.ISysRoleService;
import com.ycl.system.service.ISysUserService;
import org.apache.commons.lang3.StringUtils;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
+import org.flowable.common.engine.impl.util.CollectionUtil;
import org.flowable.engine.*;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
@@ -48,6 +55,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,9 +79,12 @@
private final HistoryService historyService;
private final ISysUserService sysUserService;
private final ISysRoleService sysRoleService;
+ private final ISysDeptService sysDeptService;
+ private final TaskCommonService taskCommonService;
/**
* 鍒嗛〉鏌ヨ
+ *
* @param query
* @return
*/
@@ -81,60 +92,88 @@
public Result page(ProjectProcessQuery query) {
IPage<ProjectProcessVO> page = PageUtil.getPage(query, ProjectProcessVO.class);
baseMapper.getPage(page, query);
+ for (ProjectProcessVO vo : page.getRecords()) {
+ if (Objects.nonNull(vo.getProcessDefId())) {
+ ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(vo.getProcessDefId()).singleResult();
+ if (Objects.nonNull(processDefinition)) {
+ vo.setSuspended(processDefinition.isSuspended());
+ }
+ }
+ }
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result projectSetProcess(ProjectProcessForm form) {
// 鏌ヨ璇ラ」鐩槸鍚﹀凡缁忕粦瀹氳繃娴佺▼浜嗭紝妫�鏌ョ粦瀹氱殑娴佺▼鏄惁鍦ㄨ繍琛岋紝鍦ㄨ繍琛屽氨鍒犱簡
ProjectProcess pp = new LambdaQueryChainWrapper<>(baseMapper)
.eq(ProjectProcess::getProjectId, form.getProjectId())
.one();
- if (Objects.nonNull(pp)) {
- // TODO 澶勭悊涔嬪墠缁戝畾杩囩殑娴佺▼鏁版嵁
- new LambdaUpdateChainWrapper<>(baseMapper)
- .eq(ProjectProcess::getProjectId, form.getProjectId())
- .set(ProjectProcess::getProcessDefId, form.getProcessDefId())
- .update();
- } else {
- ProjectProcess entity = ProjectProcessForm.getEntityByForm(form, null);
- baseMapper.insert(entity);
+ if (Objects.isNull(pp)) {
+ throw new RuntimeException("璇ラ」鐩湭缁戝畾娴佺▼");
}
+ if (Objects.nonNull(pp.getProcessInsId())) {
+ HistoricProcessInstance historicProcessInstance =
+ historyService.createHistoricProcessInstanceQuery().processInstanceId(pp.getProcessInsId()).singleResult();
+ if (Objects.nonNull(historicProcessInstance)) {
+ // 鍒犻櫎涔嬪墠娴佺▼鐨勬暟鎹�
+ if (historicProcessInstance.getEndTime() != null) {
+ historyService.deleteHistoricProcessInstance(historicProcessInstance.getId());
+ } else {
+ // 鍒犻櫎娴佺▼瀹炰緥
+ runtimeService.deleteProcessInstance(pp.getProcessInsId(), "");
+ // 鍒犻櫎鍘嗗彶娴佺▼瀹炰緥
+ historyService.deleteHistoricProcessInstance(pp.getProcessInsId());
+ }
+ }
+ }
+ String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId());
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .eq(ProjectProcess::getProjectId, form.getProjectId())
+ .set(ProjectProcess::getProcessDefId, form.getProcessDefId())
+ .set(ProjectProcess::getProcessInsId, processInsId)
+ .update();
return Result.ok("娴佺▼鍙樻洿鎴愬姛");
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Result startProcess(String projectId, String processDefId) {
+ public Result startProcess(Long projectId, String processDefId) {
+ String processInsId = this.startPro(projectId, processDefId);
+ ProjectProcess entity = new ProjectProcess();
+ entity.setProjectId(projectId);
+ entity.setProcessDefId(processDefId);
+ entity.setProcessInsId(processInsId);
+ baseMapper.insert(entity);
+ return Result.ok("娴佺▼鍚姩鎴愬姛");
+ }
+
+ /**
+ * 鍚姩娴佺▼
+ *
+ * @param projectId
+ * @param processDefId
+ * @return
+ */
+ private String startPro(Long projectId, String processDefId) {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefId)
.latestVersion().singleResult();
if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
- return Result.error("璇ユ祦绋嬪凡琚寕璧�,璇峰厛婵�娲绘祦绋�");
+ throw new RuntimeException("璇ユ祦绋嬪凡琚寕璧�,璇峰厛婵�娲绘祦绋�");
}
Map<String, Object> variables = new HashMap<>(2);
// 璁剧疆娴佺▼鍙戣捣浜篒d鍒版祦绋嬩腑
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
- ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId, variables);
-// // 娴佺▼鍙戣捣鏃� 璺宠繃鍙戣捣浜鸿妭鐐�
-// // 缁欑涓�姝ョ敵璇蜂汉鑺傜偣璁剧疆浠诲姟鎵ц浜哄拰鎰忚
-// Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
-// if (Objects.nonNull(task)) {
-// taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), sysUser.getNickName() + "鍙戣捣娴佺▼鐢宠");
-// taskService.complete(task.getId(), variables);
-// }
- // 椤圭洰娴佺▼鍏宠仈娴佺▼瀹炰緥id
- new LambdaUpdateChainWrapper<>(baseMapper)
- .eq(ProjectProcess::getProjectId, projectId)
- .eq(ProjectProcess::getProcessDefId, processDefId)
- .set(ProjectProcess::getProcessInsId, processInstance.getProcessInstanceId())
- .update();
- return Result.ok("娴佺▼鍚姩鎴愬姛");
+ ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
+ return processInstance.getId();
}
/**
* 鑾峰彇娴佺▼璇︽儏
+ *
* @param projectId
* @return
*/
@@ -167,14 +206,15 @@
// 鐘舵�佺粺璁�
taskStatistics.setTotalTaskNum(this.getTotalTaskNum(processDefId));
taskStatistics.setTodoTaskNum(this.getTodoTaskNum(projectProcess.getProcessInsId()));
+ taskStatistics.setRemainingTaskNum(this.getRemainingTaskNum(processDefId, projectProcess.getProcessInsId()));
// taskStatistics.setCurrentTask(this.getCurrentNodeTaskList(projectProcess.getProcessInstanceId()));
- taskStatistics.setRemainingTaskNum(this.getNotFinishedTaskNum(projectProcess.getProcessInsId()));
+ taskStatistics.setRemainingTaskNum(this.getRemainingTaskNum(projectProcess.getProcessDefId(), projectProcess.getProcessInsId()));
detail.setStatistics(taskStatistics);
Result result = Result.ok();
// 浠ｅ姙浠诲姟
- this.getTodoTaskList(projectProcess.getProcessInsId(),"", 5, 1, result);
+ this.getTodoTaskList(projectProcess.getProcessInsId(), "", 5, 1, result);
return result.data(detail);
}
@@ -191,28 +231,31 @@
Result ok = Result.ok();
switch (query.getTaskType()) {
case TaskTypeConstant.ALL:
- this.getAllUserTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName (), (int)query.getCurrentPage(), (int)query.getPageSize(), ok);
+ this.getAllUserTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+ break;
case TaskTypeConstant.TODO:
- this.getTodoTaskList(projectProcess.getProcessInsId(), query.getTaskName(), (int)query.getPageSize(), (int)query.getCurrentPage(), ok);
+ this.getTodoTaskList(projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getPageSize(), (int) query.getCurrentPage(), ok);
+ ok.data(ok.get("taskList"));
+ break;
case TaskTypeConstant.CURRENT:
-
+ break;
case TaskTypeConstant.REMAINING:
-
+ this.getRemainingTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+ break;
default:
-
+ break;
}
return ok;
}
- private void getTodoTaskList(String processInsId, String taskName, int pageSize, int pageNum, Result result) {
+ @Override
+ public void getAllTodoTask(String taskName, int pageSize, int pageNum, Result result) {
TaskQuery taskQuery = taskService.createTaskQuery()
.active()
- .processInstanceId(processInsId)
.includeProcessVariables()
.orderByTaskCreateTime().desc();
-// TODO 浼犲叆鍚嶇О鏌ヨ涓嶅埌鏁版嵁?
if (StringUtils.isNotBlank(taskName)) {
taskQuery.processDefinitionNameLike(taskName);
}
@@ -235,21 +278,17 @@
taskVO.setDeployId(pd.getDeploymentId());
taskVO.setProcessName(pd.getName());
taskVO.setProcessInsId(task.getProcessInstanceId());
+ taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());
// 娴佺▼鍙戣捣浜轰俊鎭�
- HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(task.getProcessInstanceId())
- .singleResult();
- SysUser startUser = sysUserService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId()));
- taskVO.setPromoterId(startUser.getUserId());
- taskVO.setPromoterName(startUser.getNickName());
- taskVO.setPromoterUnitName(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptName() : "");
- taskVO.setPromoterUnitId(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptId() : null);
+ this.setPromoterInfo(taskVO);
+
// 娴佺▼澶勭悊浜轰俊鎭�
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
for (IdentityLink identityLink : identityLinksForTask) {
// 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
if (StringUtils.isNotBlank(identityLink.getUserId())) {
+ taskVO.setHandlerType(HandlerTypeEnum.USER);
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
taskVO.setHandlerId(sysUser.getUserId());
@@ -259,14 +298,156 @@
}
taskVO.setHandlerName(sysUser.getNickName());
}
- // 缁戝畾鐨勬槸瑙掕壊锛屾煡鍑鸿鑹插悕绉�
+ // 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
} else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
- SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
- if (Objects.nonNull(role)) {
- taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
- taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
- taskVO.setHandlerName("鏆傛湭澶勭悊");
- taskVO.setHandlerId(null);
+ if (identityLink.getGroupId().startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ taskVO.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = identityLink.getGroupId().split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ taskVO.setHandlerUnitId(dept.getDeptId());
+ taskVO.setHandlerUnitName(dept.getDeptName());
+ taskVO.setHandlerName("鏆傛湭澶勭悊");
+ taskVO.setHandlerId(null);
+ }
+ }
+ } else {
+ taskVO.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ if (Objects.nonNull(role)) {
+ taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
+ taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+ taskVO.setHandlerName("鏆傛湭澶勭悊");
+ taskVO.setHandlerId(null);
+ }
+ }
+ }
+ }
+ vos.add(taskVO);
+ }
+ result.put("taskList", vos);
+ }
+
+ @Override
+ public Result detailByProcessInsId(com.ycl.domain.query.TaskQuery query) {
+ List<ProjectProcess> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectProcess::getProcessInsId, query.getProcessInsId())
+ .eq(ProjectProcess::getProcessDefId, query.getProcessDefId())
+ .list();
+ return Result.ok().data(list);
+ }
+
+ @Override
+ public Result taskIsAuditing(String processDefinitionId, String taskId) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+ Collection<Process> processes = bpmnModel.getProcesses();
+ Boolean needAuditing = Boolean.FALSE;
+ for (Process process : processes) {
+ Collection<FlowElement> flowElements = process.getFlowElements();
+ for (FlowElement flowElement : flowElements) {
+ if (flowElement instanceof UserTask && flowElement.getId().equals(task.getTaskDefinitionKey())) {
+ UserTask userTask = (UserTask) flowElement;
+ needAuditing = taskCommonService.checkTaskNeedAuditing(userTask.getExtensionElements().get("properties"));
+ break;
+ }
+
+ }
+ }
+ return Result.ok().data(needAuditing);
+ }
+
+ @Override
+ public Result rejectTask(RejectTaskForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ taskCommonService.reject(form.getRejectedTaskDefKey(), task.getTaskDefinitionKey(), task.getProcessInstanceId(), form.getTaskId(), form.getAuditOpinion());
+ return Result.ok("椹冲洖鎴愬姛");
+ }
+
+ /**
+ * 鏌ヨ寰呭姙浠诲姟
+ *
+ * @param processInsId
+ * @param taskName
+ * @param pageSize
+ * @param pageNum
+ * @param result
+ */
+ public void getTodoTaskList(String processInsId, String taskName, int pageSize, int pageNum, Result result) {
+ TaskQuery taskQuery = taskService.createTaskQuery()
+ .active()
+ .processInstanceId(processInsId)
+ .includeProcessVariables()
+ .orderByTaskCreateTime().desc();
+
+ if (StringUtils.isNotBlank(taskName)) {
+ taskQuery.processDefinitionNameLike(taskName);
+ }
+ result.total(taskQuery.count());
+ List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
+ List<CustomerTaskVO> vos = new ArrayList<>();
+ for (Task task : taskList) {
+ CustomerTaskVO taskVO = new CustomerTaskVO();
+ // 褰撳墠娴佺▼淇℃伅
+ taskVO.setTaskId(task.getId());
+ taskVO.setCreateTime(task.getCreateTime());
+ taskVO.setProcessDefId(task.getProcessDefinitionId());
+ taskVO.setExecutionId(task.getExecutionId());
+ taskVO.setTaskName(task.getName());
+ taskVO.setTaskStatus(TaskStatusEnum.TODO);
+ // 娴佺▼瀹氫箟淇℃伅
+ ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
+ .processDefinitionId(task.getProcessDefinitionId())
+ .singleResult();
+ taskVO.setDeployId(pd.getDeploymentId());
+ taskVO.setProcessName(pd.getName());
+ taskVO.setProcessInsId(task.getProcessInstanceId());
+ taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());
+
+ // 娴佺▼鍙戣捣浜轰俊鎭�
+ this.setPromoterInfo(taskVO);
+
+ // 娴佺▼澶勭悊浜轰俊鎭�
+ List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
+ for (IdentityLink identityLink : identityLinksForTask) {
+ // 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
+ if (StringUtils.isNotBlank(identityLink.getUserId())) {
+ taskVO.setHandlerType(HandlerTypeEnum.USER);
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
+ if (Objects.nonNull(sysUser)) {
+ taskVO.setHandlerId(sysUser.getUserId());
+ if (Objects.nonNull(sysUser.getDept())) {
+ taskVO.setHandlerUnitId(sysUser.getDept().getDeptId());
+ taskVO.setHandlerUnitName(sysUser.getDept().getDeptName());
+ }
+ taskVO.setHandlerName(sysUser.getNickName());
+ }
+ // 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
+ } else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
+ if (identityLink.getGroupId().startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ taskVO.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = identityLink.getGroupId().split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ taskVO.setHandlerUnitId(dept.getDeptId());
+ taskVO.setHandlerUnitName(dept.getDeptName());
+ taskVO.setHandlerName("鏆傛湭澶勭悊");
+ taskVO.setHandlerId(null);
+ }
+ }
+ } else {
+ taskVO.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ if (Objects.nonNull(role)) {
+ taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
+ taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+ taskVO.setHandlerName("鏆傛湭澶勭悊");
+ taskVO.setHandlerId(null);
+ }
}
}
}
@@ -279,7 +460,7 @@
* 鑾峰彇鎵�鏈変换鍔�
*
* @param processDefinitionId 娴佺▼杩愯id
- * @param processInsId 娴佺▼瀹炰緥id
+ * @param processInsId 娴佺▼瀹炰緥id
* @param pageNum
* @param pageSize
* @param result
@@ -289,7 +470,6 @@
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);
- result.total(allUserTaskElement.size());
if (startNum >= allUserTaskElement.size()) {
// 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
return new ArrayList<>();
@@ -298,10 +478,17 @@
// 妯℃嫙妯＄硦鏌ヨ
allUserTaskElement = allUserTaskElement.stream().filter(taskEl -> taskEl.getName().contains(taskName)).collect(Collectors.toList());
}
+ result.total(allUserTaskElement.size());
int end = Math.min(endNum, allUserTaskElement.size());
List<UserTask> userTasks = allUserTaskElement.subList(startNum, end);
// 鏌ュ嚭娴佺▼
ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ if (Objects.isNull(process)) {
+ // 濡傛灉杩愯鏃舵壘涓嶅埌璇存槑鏄凡瀹屾垚鐨勬祦绋嬶紝鐩存帴鏌ュ巻鍙蹭换鍔�
+ List<CustomerTaskVO> vos = this.getFinishedProcessTaskInfo(userTasks, processInsId, processDefinitionId);
+ result.data(vos);
+ return vos;
+ }
// 鍒ゆ柇浠诲姟鐘舵��
List<CustomerTaskVO> vos = userTasks.stream().map(userTask -> {
CustomerTaskVO vo = new CustomerTaskVO();
@@ -313,33 +500,76 @@
Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
if (Objects.isNull(task)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛岄渶瑕佷粠鍘嗗彶浠诲姟涓啀鎵句竴涓�
- HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(process.getProcessInstanceId())
.taskDefinitionKey(userTask.getId())
.includeIdentityLinks()
- .singleResult();
- if (Objects.isNull(historicTask)) {
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(historicTasks)) {
+ vo.setPromoterName("鏆傛棤");
+ vo.setPromoterUnitName("鏆傛棤");
+ // 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
+ if (StringUtils.isNotBlank(userTask.getAssignee())) {
+ vo.setHandlerType(HandlerTypeEnum.USER);
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
+ if (Objects.nonNull(sysUser)) {
+ vo.setHandlerId(sysUser.getUserId());
+ vo.setHandlerName(sysUser.getNickName());
+ vo.setHandlerUnitId(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptId() : null);
+ vo.setHandlerUnitName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : null);
+ }
+ } else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
+ String groupId = userTask.getCandidateGroups().get(0);
+ if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ vo.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = groupId.split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ vo.setHandlerUnitId(dept.getDeptId());
+ vo.setHandlerUnitName(dept.getDeptName());
+ vo.setHandlerName("鏈紑濮�");
+ vo.setHandlerId(null);
+ }
+ }
+ } else {
+ vo.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(groupId));
+ if (Objects.nonNull(role)) {
+ vo.setHandlerUnitId(Long.parseLong(groupId));
+ vo.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+ vo.setHandlerName("鏈紑濮�");
+ vo.setHandlerId(null);
+ }
+ }
+ }
vo.setTaskStatus(TaskStatusEnum.NOT_START);
} else {
vo.setTaskStatus(TaskStatusEnum.FINISHED);
// 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
- vo.setTaskId(historicTask.getId());
- vo.setExecutionId(historicTask.getExecutionId());
- vo.setCreateTime(historicTask.getStartTime());
+ vo.setTaskId(historicTasks.get(0).getId());
+ vo.setExecutionId(historicTasks.get(0).getExecutionId());
+ vo.setCreateTime(historicTasks.get(0).getStartTime());
// 鏌ヨ瀹為檯澶勭悊浜�
- long handlerUserId = Long.parseLong(historicTask.getAssignee());
+ long handlerUserId = Long.parseLong(historicTasks.get(0).getAssignee());
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
vo.setHandlerId(handlerUserId);
vo.setHandlerName(handlerUser.getNickName());
}
- this.setPromoterAndHandler(vo, historicTask.getIdentityLinks());
+ vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());
+ this.setPromoterAndHandler(vo, historicTasks.get(0).getIdentityLinks());
}
} else {
vo.setTaskStatus(TaskStatusEnum.TODO);
vo.setTaskId(task.getId());
vo.setExecutionId(task.getExecutionId());
vo.setCreateTime(task.getCreateTime());
+ vo.setTaskDefinitionKey(task.getTaskDefinitionKey());
+
this.setPromoterAndHandler(vo, null);
}
return vo;
@@ -349,21 +579,200 @@
}
/**
- * 璁剧疆浠诲姟鐨勫彂璧蜂汉&澶勭悊浜�
+ * 鏌ヨ宸插畬鎴愮殑娴佺▼鐨勪换鍔′俊鎭�
+ *
+ * @param userTasks 浠诲姟鑺傜偣鍒楄〃
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @param processDefId 娴佺▼瀹氫箟id
+ * @return
+ */
+ private List<CustomerTaskVO> getFinishedProcessTaskInfo(List<UserTask> userTasks, String processInsId, String processDefId) {
+ HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ List<CustomerTaskVO> vos = userTasks.stream().map(userTask -> {
+ CustomerTaskVO vo = new CustomerTaskVO();
+ vo.setProcessInsId(hisProcess.getId());
+ vo.setProcessDefId(processDefId);
+ vo.setDeployId(hisProcess.getDeploymentId());
+ vo.setTaskName(userTask.getName());
+ vo.setProcessName(hisProcess.getProcessDefinitionName());
+
+ // 鏌ュ涓槸鍥犱负椹冲洖鍚庝細鏌ュ嚭涓ゆ潯鍙婁互涓婏紝鍙栨渶鏂颁竴鏉�
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(hisProcess.getId())
+ .taskDefinitionKey(userTask.getId()).includeIdentityLinks()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+
+ vo.setTaskStatus(TaskStatusEnum.FINISHED);
+ // 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
+ vo.setTaskId(hisTaskList.get(0).getId());
+ vo.setExecutionId(hisTaskList.get(0).getExecutionId());
+ vo.setCreateTime(hisTaskList.get(0).getStartTime());
+ // 鏌ヨ瀹為檯澶勭悊浜�
+ long handlerUserId = Long.parseLong(hisTaskList.get(0).getAssignee());
+ SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
+ if (Objects.nonNull(handlerUser)) {
+ vo.setHandlerId(handlerUserId);
+ vo.setHandlerName(handlerUser.getNickName());
+ }
+ vo.setTaskDefinitionKey(hisTaskList.get(0).getTaskDefinitionKey());
+ this.setPromoterAndHandler(vo, hisTaskList.get(0).getIdentityLinks());
+
+ return vo;
+ }).collect(Collectors.toList());
+ return vos;
+ }
+
+ /**
+ * 鏌ヨ鍓╀綑浜嬮」锛堟湭寮�濮嬬殑浠诲姟锛�
+ *
+ * @param processDefinitionId
+ * @param processInsId
+ * @param taskName
+ * @param pageNum
+ * @param pageSize
+ * @param result
+ * @return
+ */
+ private List<CustomerTaskVO> getRemainingTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
+ int startNum = pageSize * (pageNum - 1);
+ int endNum = startNum + pageSize;
+ List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);
+
+ if (startNum >= allUserTaskElement.size()) {
+ // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+ return new ArrayList<>();
+ }
+ if (StringUtils.isNotBlank(taskName)) {
+ // 妯℃嫙妯＄硦鏌ヨ
+ allUserTaskElement = allUserTaskElement.stream().filter(taskEl -> taskEl.getName().contains(taskName)).collect(Collectors.toList());
+ }
+ result.total(allUserTaskElement.size());
+ int end = Math.min(endNum, allUserTaskElement.size());
+ List<UserTask> userTasks = allUserTaskElement.subList(startNum, end);
+ // 鏌ュ嚭娴佺▼
+ ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ if (Objects.isNull(process)) {
+ // 濡傛灉娴佺▼宸茬粡瀹屾垚锛岄偅涔堟病鏈夊墿浣欎簨椤逛簡
+ List<CustomerTaskVO> vos = new ArrayList<>(1);
+ result.data(vos);
+ return vos;
+ }
+ // 鍒ゆ柇浠诲姟鐘舵��
+ List<CustomerTaskVO> vos = userTasks.stream().map(userTask -> {
+ CustomerTaskVO vo = new CustomerTaskVO();
+ vo.setProcessInsId(process.getId());
+ vo.setProcessDefId(processDefinitionId);
+ vo.setDeployId(process.getDeploymentId());
+ vo.setTaskName(userTask.getName());
+ vo.setProcessName(process.getProcessDefinitionName());
+ Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
+ if (Objects.isNull(task)) {
+ // 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛屽彧鏌ヨ鏈紑濮嬬殑
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(process.getProcessInstanceId())
+ .taskDefinitionKey(userTask.getId())
+ .includeIdentityLinks()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(historicTasks)) {
+ // 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
+ if (StringUtils.isNotBlank(userTask.getAssignee())) {
+ vo.setHandlerType(HandlerTypeEnum.USER);
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
+ if (Objects.nonNull(sysUser)) {
+ vo.setHandlerId(sysUser.getUserId());
+ vo.setHandlerName(sysUser.getNickName());
+ vo.setHandlerUnitId(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptId() : null);
+ vo.setHandlerUnitName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : null);
+ }
+ } else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
+ String groupId = userTask.getCandidateGroups().get(0);
+ if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ vo.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = groupId.split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ vo.setHandlerUnitId(dept.getDeptId());
+ vo.setHandlerUnitName(dept.getDeptName());
+ vo.setHandlerName("鏈紑濮�");
+ vo.setHandlerId(null);
+ }
+ }
+ } else {
+ vo.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(groupId));
+ if (Objects.nonNull(role)) {
+ vo.setHandlerUnitId(Long.parseLong(groupId));
+ vo.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+ vo.setHandlerName("鏈紑濮�");
+ vo.setHandlerId(null);
+ }
+ }
+ }
+ vo.setTaskStatus(TaskStatusEnum.NOT_START);
+ return vo;
+ } else {
+ return null;
+ }
+ } else {
+ return null;
+ }
+ }).filter(Objects::nonNull).collect(Collectors.toList());
+ result.data(vos);
+ return vos;
+ }
+
+ /**
+ * 鏌ヨ鍓╀綑浜嬮」锛堟湭寮�濮嬬殑浠诲姟锛夋暟閲�
+ *
+ * @param processDefinitionId 娴佺▼瀹氫箟id
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @return
+ */
+ private Long getRemainingTaskNum(String processDefinitionId, String processInsId) {
+
+ List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);
+ // 鏌ュ嚭娴佺▼
+ ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ if (Objects.isNull(process)) {
+ // 杩愯鏃舵湭鎵惧埌娴佺▼锛岃鏄庢祦绋嬪凡缁忕粨鏉熶簡
+ return 0L;
+ }
+ long num = 0L;
+ // 鍒ゆ柇浠诲姟鐘舵��
+ for (UserTask userTask : allUserTaskElement) {
+ Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
+ if (Objects.isNull(task)) {
+ // 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛屽彧鏌ヨ鏈紑濮嬬殑
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(process.getProcessInstanceId())
+ .taskDefinitionKey(userTask.getId())
+ .includeIdentityLinks()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(historicTasks)) {
+ num++;
+ }
+ }
+ }
+ return num;
+ }
+
+
+ /**
+ * 璁剧疆浠诲姟鐨勫彂璧蜂汉&澶勭悊浜� 鍙湁寰呭姙浠诲姟鍜屽凡瀹屾垚浠诲姟鎵嶄細鎺夎繖涓柟娉�
*
* @param taskVO
* @param identityLinkInfos 濡傛灉鏄凡瀹屾垚鐨勪换鍔★紝鐢ㄨ繖涓幓鍙栧叧鑱旂殑鐢ㄦ埛/鐢ㄦ埛缁�
*/
private void setPromoterAndHandler(CustomerTaskVO taskVO, List<? extends IdentityLinkInfo> identityLinkInfos) {
- // 娴佺▼鍙戣捣浜轰俊鎭�
- HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(taskVO.getProcessInsId())
- .singleResult();
- SysUser startUser = sysUserService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId()));
- taskVO.setPromoterId(startUser.getUserId());
- taskVO.setPromoterName(startUser.getNickName());
- taskVO.setPromoterUnitId(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptId() : null);
- taskVO.setPromoterUnitName(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptName() : "");
+ this.setPromoterInfo(taskVO);
// 娴佺▼澶勭悊浜轰俊鎭�
if (TaskStatusEnum.TODO.equals(taskVO.getTaskStatus())) {
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(taskVO.getTaskId());
@@ -372,6 +781,7 @@
if (StringUtils.isNotBlank(identityLink.getUserId())) {
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
+ taskVO.setHandlerType(HandlerTypeEnum.USER);
taskVO.setHandlerId(sysUser.getUserId());
if (Objects.nonNull(sysUser.getDept())) {
taskVO.setHandlerUnitId(sysUser.getDept().getDeptId());
@@ -379,21 +789,38 @@
}
taskVO.setHandlerName(sysUser.getNickName());
}
- // 缁戝畾鐨勬槸瑙掕壊锛屾煡鍑鸿鑹插悕绉�
+ // 缁戝畾鐨勬槸瑙掕壊鎴栬�呮槸閮ㄩ棬锛岄渶瑕佹牴鎹甶d鍒ゆ柇
} else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
- SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
- if (Objects.nonNull(role)) {
- taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
- taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
- taskVO.setHandlerName("鏆傛湭澶勭悊");
- taskVO.setHandlerId(null);
+ if (identityLink.getGroupId().startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ taskVO.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = identityLink.getGroupId().split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ taskVO.setHandlerUnitId(dept.getDeptId());
+ taskVO.setHandlerUnitName(dept.getDeptName());
+ taskVO.setHandlerName("鏆傛湭澶勭悊");
+ taskVO.setHandlerId(null);
+ }
+ }
+ } else {
+ taskVO.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ if (Objects.nonNull(role)) {
+ taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
+ taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+ taskVO.setHandlerName("鏆傛湭澶勭悊");
+ taskVO.setHandlerId(null);
+ }
}
}
}
- } else if (TaskStatusEnum.FINISHED.equals(taskVO.getTaskStatus())){
+ } else if (TaskStatusEnum.FINISHED.equals(taskVO.getTaskStatus())) {
for (IdentityLinkInfo identityLink : identityLinkInfos) {
// 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
if (StringUtils.isNotBlank(identityLink.getUserId())) {
+ taskVO.setHandlerType(HandlerTypeEnum.USER);
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
// taskVO.setHandlerId(sysUser.getUserId());
@@ -405,17 +832,66 @@
}
// 缁戝畾鐨勬槸瑙掕壊锛屾煡鍑鸿鑹插悕绉�
} else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
- SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
- if (Objects.nonNull(role)) {
- taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
- taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
+ if (identityLink.getGroupId().startsWith("dept")) {
+ taskVO.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = identityLink.getGroupId().split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ taskVO.setHandlerUnitId(dept.getDeptId());
+ taskVO.setHandlerUnitName(dept.getDeptName());
+ }
+ }
+ } else {
+ taskVO.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ if (Objects.nonNull(role)) {
+ taskVO.setHandlerUnitId(Long.parseLong(identityLink.getGroupId()));
+ taskVO.setHandlerUnitName("鐢辨嫢鏈夎鑹诧細銆�" + role.getRoleName() + "銆戠殑浜哄鐞�");
// taskVO.setHandlerName(role.getRoleName());
// taskVO.setHandlerId(null);
+ }
}
}
}
}
+ }
+
+ /**
+ * 璁剧疆浠诲姟鍙戣捣浜�
+ *
+ * @param taskVO
+ */
+ private void setPromoterInfo(CustomerTaskVO taskVO) {
+ // 鍙戣捣浜哄簲涓轰笂涓�鑺傜偣鐨勫鐞嗕汉
+ List<String> beforeNodeKey = taskCommonService.getBeforeNodeInfo(taskVO.getProcessDefId(), taskVO.getTaskDefinitionKey());
+ List<SysUser> userList = beforeNodeKey.stream().map(key -> {
+ List<HistoricTaskInstance> historicTaskInstances = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(taskVO.getProcessInsId())
+ .taskDefinitionKey(key)
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list(); // 涔嬫墍浠ョ敤list鏄洜涓哄鏋滄煇涓换鍔¤椹冲洖杩囷紝涓斿鏋滆浠诲姟鍐嶆鎵ц鏃朵細鏈夊鏉℃暟鎹紝鍙栨渶鏂扮殑涓�鏉�
+ if (! CollectionUtils.isEmpty(historicTaskInstances)) {
+ // 瀹為檯棰嗗彇杩欎釜浠诲姟鐨勪汉锛屼篃灏辨槸澶勭悊浜�
+ String assignee = historicTaskInstances.get(0).getAssignee();
+ SysUser startUser = sysUserService.selectUserById(Long.parseLong(assignee));
+ return startUser;
+ } else {
+ return null;
+ }
+ }).filter(user -> Objects.nonNull(user)).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(userList)) {
+ taskVO.setPromoterName("鏆傛棤");
+ taskVO.setPromoterUnitName("鏆傛棤");
+ } else {
+ taskVO.setPromoterId(userList.stream().map(user -> { return user.getUserId() + ""; }).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterName(userList.stream().map(user -> { return user.getNickName(); }).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> { return user.getDept().getDeptId() + "";}).collect(Collectors.joining("銆�")));
+ taskVO.setPromoterUnitName(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> { return user.getDept().getDeptName() + "";}).collect(Collectors.joining("銆�")));
+ }
}
/**
@@ -456,21 +932,11 @@
/**
* 鑾峰彇娴佺▼鑺傜偣鏁帮紙鎬讳换鍔℃暟锛屼笉鍖呭惈寮�濮嬨�佺粨鏉熺瓑鐗规畩鐨勶紝鍙粺璁serTask绫诲瀷鐨勶級
*
- * @param processDefinitionId 娴佺▼瀹氫箟id
+ * @param processDefinitionId 娴佺▼瀹氫箟id
* @return
*/
private Long getTotalTaskNum(String processDefinitionId) {
return Long.valueOf(this.getAllUserTaskElement(processDefinitionId).size());
- }
-
- /**
- * 鑾峰彇娴佺▼鍓╀綑鏈畬鎴愮殑浠诲姟鏁�
- *
- * @param processInstanceId
- * @return
- */
- private Long getNotFinishedTaskNum(String processInstanceId) {
- return historyService.createHistoricTaskInstanceQuery().processInstanceId(processInstanceId).processUnfinished().count();
}
/**
@@ -490,6 +956,6 @@
* @return
*/
private List<Task> getCurrentNodeTaskList(String processInstanceId) {
- return taskService.createTaskQuery().processDefinitionId(processInstanceId).list();
+ return taskService.createTaskQuery().processDefinitionId(processInstanceId).list();
}
}
--
Gitblit v1.8.0