From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 342 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 244 insertions(+), 98 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 0ba8055..473bb14 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,34 +1,28 @@
package com.ycl.service.impl;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.FlowLogEventTypeEnum;
import com.ycl.common.enums.business.HandlerTypeEnum;
+import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
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.FlowLog;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.entity.ProjectProcess;
-import com.ycl.domain.form.RejectTaskForm;
import com.ycl.domain.form.TaskDelegationForm;
-import com.ycl.domain.json.TaskDelegateData;
+import com.ycl.domain.json.DelegateData;
import com.ycl.domain.vo.CustomerTaskVO;
+import com.ycl.domain.vo.IndexCustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
+import com.ycl.event.event.TaskLogEvent;
import com.ycl.mapper.ProjectInfoMapper;
import com.ycl.mapper.ProjectProcessMapper;
-import com.ycl.service.FlowLogService;
import com.ycl.service.ProjectProcessService;
import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,17 +44,15 @@
import org.flowable.identitylink.api.IdentityLink;
import org.flowable.identitylink.api.IdentityLinkInfo;
import org.flowable.identitylink.api.IdentityLinkType;
-import org.flowable.identitylink.api.history.HistoricIdentityLink;
+import org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
-import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import com.ycl.framework.utils.PageUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -87,7 +79,7 @@
private final ISysRoleService sysRoleService;
private final ISysDeptService sysDeptService;
private final TaskCommonService taskCommonService;
- private final FlowLogService flowLogService;
+ private final ApplicationEventPublisher publisher;
/**
* 鍒嗛〉鏌ヨ
@@ -98,13 +90,14 @@
@Override
public Result page(ProjectProcessQuery query) {
IPage<ProjectProcessVO> page = PageUtil.getPage(query, ProjectProcessVO.class);
- baseMapper.getPage(page, query);
+ baseMapper.getPage(query, page);
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());
vo.setFlowableProcessName(processDefinition.getName() + "(v" + processDefinition.getVersion() + ")");
+ vo.setDeployId(processDefinition.getDeploymentId());
}
}
}
@@ -154,6 +147,7 @@
entity.setProcessDefId(processDefId);
entity.setProcessInsId(processInsId);
baseMapper.insert(entity);
+
return Result.ok("娴佺▼鍚姩鎴愬姛");
}
@@ -165,6 +159,14 @@
* @return
*/
private String startPro(Long projectId, String processDefId) {
+
+ ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
+ .select(ProjectInfo::getCreateBy)
+ .eq(ProjectInfo::getId, projectId)
+ .one();
+ if (Objects.isNull(project)) {
+ throw new RuntimeException("椤圭洰涓嶅瓨鍦�");
+ }
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefId)
.latestVersion().singleResult();
if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
@@ -175,6 +177,9 @@
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
+
+ // 灏嗚椤圭洰鐨勭敵璇蜂汉锛堜笟涓绘柟锛変綔涓烘祦绋嬩腑鏌愪簺鐜妭鐨勫鐞嗕汉
+ variables.put(ProcessConstants.DATA_LAUNCH, project.getCreateBy());
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
return processInstance.getId();
}
@@ -254,6 +259,112 @@
}
return ok;
+ }
+
+ @Override
+ public void getIndexTodoTask(String taskName, int pageSize, int pageNum, Result result) {
+ TaskQuery taskQuery = taskService.createTaskQuery()
+ .active()
+ .includeProcessVariables()
+ .orderByTaskCreateTime().desc();
+
+ if (StringUtils.isNotBlank(taskName)) {
+ taskQuery.processDefinitionNameLike(taskName);
+ }
+ if (! SecurityUtils.getLoginUser().getUser().isAdmin()) {
+ taskQuery
+ .or()
+ .taskCandidateGroupIn(taskCommonService.getCurrentUserGroups())
+ .taskCandidateUser(SecurityUtils.getUserId() + "")
+ .taskAssignee(SecurityUtils.getUserId() + "")
+ .endOr();
+ }
+ result.total(taskQuery.count());
+ List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
+ List<IndexCustomerTaskVO> vos = new ArrayList<>();
+ for (Task task : taskList) {
+ IndexCustomerTaskVO taskVO = new IndexCustomerTaskVO();
+ // 褰撳墠娴佺▼淇℃伅
+ 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());
+
+ // 娴佺▼椤圭洰淇℃伅
+ ProjectInfo project = baseMapper.getProjectInfo(task.getProcessInstanceId());
+ if (Objects.nonNull(project)) {
+ taskVO.setProjectId(project.getId());
+ taskVO.setProjectName(project.getProjectName());
+ }
+
+ // 娴佺▼鍙戣捣浜轰俊鎭�
+ this.setPromoterInfo(taskVO);
+
+ // 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
+ List<Long> handlerIds = new ArrayList<>(2);
+ List<String> handlerNames = new ArrayList<>(2);
+ List<Long> handlerUnitIds = new ArrayList<>(2);
+ List<String> handlerUnitNames = new ArrayList<>(2);
+
+ // 娴佺▼澶勭悊浜轰俊鎭�
+ List<IdentityLink> identityLinks = taskService.getIdentityLinksForTask(task.getId());
+// Boolean aboutMe = taskCommonService.taskAboutMe(identityLinks);
+// if (! aboutMe) {
+// continue;
+// }
+ for (IdentityLinkInfo identityLink : identityLinks) {
+ // 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
+ if (StringUtils.isNotBlank(identityLink.getUserId())) {
+ taskVO.setHandlerType(HandlerTypeEnum.USER);
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
+ if (Objects.nonNull(sysUser)) {
+ handlerIds.add(sysUser.getUserId());
+ handlerNames.add(sysUser.getNickName());
+ if (Objects.nonNull(sysUser.getDept())) {
+ handlerUnitIds.add(sysUser.getDept().getDeptId());
+ handlerUnitNames.add(sysUser.getDept().getDeptName());
+ }
+ }
+ // 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
+ } 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)) {
+ handlerUnitIds.add(dept.getDeptId());
+ handlerUnitNames.add(dept.getDeptName());
+ }
+ }
+ } else {
+ taskVO.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ if (Objects.nonNull(role)) {
+ handlerUnitIds.add(role.getRoleId());
+ handlerUnitNames.add(role.getRoleName());
+ }
+ }
+ }
+ }
+ taskVO.setHandlerId(handlerIds);
+ taskVO.setHandlerName(handlerNames);
+ taskVO.setHandlerUnitId(handlerUnitIds);
+ taskVO.setHandlerUnitName(handlerUnitNames);
+ vos.add(taskVO);
+ }
+ result.put("taskList", vos);
}
@Override
@@ -371,20 +482,25 @@
@Override
public Result taskDelegation(TaskDelegationForm form) {
- Task task = taskService.createTaskQuery().taskId(form.getTaskId()).includeIdentityLinks().singleResult();
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
if (Objects.isNull(task)) {
throw new RuntimeException("鏈湪杩愯浠诲姟涓壘鍒拌浠诲姟锛屾棤娉曟墽琛岃浆鍔炴搷浣�");
}
+ List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
// 杞姙涔嬪墠鐨勫鐞嗕汉
List<String> beforeHandlerIds = new ArrayList<>(2);
// 杞姙涔嬪墠鐨勫鐞嗕汉绫诲瀷
HandlerTypeEnum beforeHandlerType = null;
// 闇�瑕佸厛绉婚櫎涔嬪墠鐨勫鐞嗕汉
- for (IdentityLinkInfo identityLink : task.getIdentityLinks()) {
+ for (IdentityLinkInfo identityLink : identityLinksForTask) {
if (StringUtils.isNotBlank(identityLink.getUserId())) {
beforeHandlerIds.add(identityLink.getUserId());
beforeHandlerType = HandlerTypeEnum.USER;
- taskService.deleteCandidateUser(task.getId(), identityLink.getUserId());
+ if (IdentityLinkType.ASSIGNEE.equals(identityLink.getType())) {
+ taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), IdentityLinkType.ASSIGNEE);
+ } else {
+ taskService.deleteCandidateUser(task.getId(), identityLink.getUserId());
+ }
} else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
beforeHandlerIds.add(identityLink.getGroupId());
if (identityLink.getGroupId().contains("dept")) {
@@ -396,7 +512,7 @@
taskService.deleteCandidateGroup(task.getId(), identityLink.getGroupId());
}
}
- TaskDelegateData jsonData = new TaskDelegateData();
+ DelegateData jsonData = new DelegateData();
jsonData.setBeforeHandlerIds(beforeHandlerIds);
jsonData.setBeforeHandlerType(beforeHandlerType);
@@ -441,8 +557,8 @@
}
jsonData.setAfterHandlerIds(afterHandlerIds);
jsonData.setAfterHandlerType(form.getPeopleType());
- // 娣诲姞鏃ュ織
- flowLogService.add(task.getId(), form.getProcessInsId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData));
+ // 鍙戝竷杞姙浜嬩欢
+ publisher.publishEvent(new TaskLogEvent(this, form.getProjectId(), form.getProcessInsId(), task.getId(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
return Result.ok("杞姙鎴愬姛");
}
@@ -471,72 +587,7 @@
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);
-
- // 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
- List<Long> handlerIds = new ArrayList<>(2);
- List<String> handlerNames = new ArrayList<>(2);
- List<Long> handlerUnitIds = new ArrayList<>(2);
- List<String> handlerUnitNames = new ArrayList<>(2);
-
- // 娴佺▼澶勭悊浜轰俊鎭�
- 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)) {
- handlerIds.add(sysUser.getUserId());
- handlerNames.add(sysUser.getNickName());
- if (Objects.nonNull(sysUser.getDept())) {
- handlerUnitIds.add(sysUser.getDept().getDeptId());
- handlerUnitNames.add(sysUser.getDept().getDeptName());
- }
- }
- // 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
- } 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)) {
- handlerUnitIds.add(dept.getDeptId());
- handlerUnitNames.add(dept.getDeptName());
- }
- }
- } else {
- taskVO.setHandlerType(HandlerTypeEnum.ROLE);
- SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
- if (Objects.nonNull(role)) {
- handlerUnitIds.add(Long.parseLong(identityLink.getGroupId()));
- }
- }
- }
- taskVO.setHandlerId(handlerIds);
- taskVO.setHandlerName(handlerNames);
- taskVO.setHandlerUnitId(handlerUnitIds);
- taskVO.setHandlerUnitName(handlerUnitNames);
- }
+ this.setRuntimeTaskInfo(task, taskVO);
vos.add(taskVO);
}
result.put("taskList", vos);
@@ -583,7 +634,10 @@
vo.setDeployId(process.getDeploymentId());
vo.setTaskName(userTask.getName());
vo.setProcessName(process.getProcessDefinitionName());
- Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
+ Task task = taskService.createTaskQuery()
+ .processInstanceId(process.getId())
+ .taskDefinitionKey(userTask.getId())
+ .singleResult();
// 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
List<Long> handlerIds = new ArrayList<>(2);
@@ -647,16 +701,23 @@
vo.setTaskId(historicTasks.get(0).getId());
vo.setExecutionId(historicTasks.get(0).getExecutionId());
vo.setCreateTime(historicTasks.get(0).getStartTime());
+
// 鏌ヨ瀹為檯澶勭悊浜�
long handlerUserId = Long.parseLong(historicTasks.get(0).getAssignee());
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
handlerIds.add(handlerUserId);
handlerNames.add(handlerUser.getNickName());
+ vo.setActualHandlerUserId(historicTasks.get(0).getAssignee());
+ vo.setActualHandlerUserName(handlerUser.getNickName());
}
vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());
this.setPromoterAndHandler(vo, historicTasks.get(0).getIdentityLinks());
}
+ vo.setHandlerId(handlerIds);
+ vo.setHandlerName(handlerNames);
+ vo.setHandlerUnitId(handlerUnitIds);
+ vo.setHandlerUnitName(handlerUnitNames);
} else {
vo.setTaskStatus(TaskStatusEnum.TODO);
vo.setTaskId(task.getId());
@@ -665,11 +726,9 @@
vo.setTaskDefinitionKey(task.getTaskDefinitionKey());
this.setPromoterAndHandler(vo, null);
+ this.setRuntimeTaskInfo(task, vo);
}
- vo.setHandlerId(handlerIds);
- vo.setHandlerName(handlerNames);
- vo.setHandlerUnitId(handlerUnitIds);
- vo.setHandlerUnitName(handlerUnitNames);
+
return vo;
}).collect(Collectors.toList());
result.data(vos);
@@ -712,8 +771,8 @@
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
- vo.setHandlerId(Arrays.asList(handlerUserId));
- vo.setHandlerName(Arrays.asList(handlerUser.getNickName()));
+ vo.setActualHandlerUserId(hisTaskList.get(0).getAssignee());
+ vo.setActualHandlerUserName(handlerUser.getNickName());
}
vo.setTaskDefinitionKey(hisTaskList.get(0).getTaskDefinitionKey());
this.setPromoterAndHandler(vo, hisTaskList.get(0).getIdentityLinks());
@@ -721,6 +780,85 @@
return vo;
}).collect(Collectors.toList());
return vos;
+ }
+
+ /**
+ * 璁剧疆杩愯鏃朵换鍔＄殑淇℃伅
+ *
+ * @param task 浠诲姟
+ * @param taskVO 浠诲姟vo
+ */
+ private void setRuntimeTaskInfo(Task task, CustomerTaskVO taskVO) {
+ // 褰撳墠娴佺▼淇℃伅
+ 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);
+
+ // 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
+ List<Long> handlerIds = new ArrayList<>(2);
+ List<String> handlerNames = new ArrayList<>(2);
+ List<Long> handlerUnitIds = new ArrayList<>(2);
+ List<String> handlerUnitNames = new ArrayList<>(2);
+
+ // 娴佺▼澶勭悊浜轰俊鎭�
+ List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
+ for (IdentityLinkInfo identityLink : identityLinksForTask) {
+// if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
+// continue;
+// }
+ // 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
+ if (StringUtils.isNotBlank(identityLink.getUserId())) {
+ taskVO.setHandlerType(HandlerTypeEnum.USER);
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
+ if (Objects.nonNull(sysUser)) {
+ handlerIds.add(sysUser.getUserId());
+ handlerNames.add(sysUser.getNickName());
+ if (Objects.nonNull(sysUser.getDept())) {
+ handlerUnitIds.add(sysUser.getDept().getDeptId());
+ handlerUnitNames.add(sysUser.getDept().getDeptName());
+ }
+ }
+ // 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
+ } 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)) {
+ handlerUnitIds.add(dept.getDeptId());
+ handlerUnitNames.add(dept.getDeptName());
+ }
+ }
+ } else {
+ taskVO.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+ if (Objects.nonNull(role)) {
+ handlerUnitIds.add(Long.parseLong(identityLink.getGroupId()));
+ handlerUnitNames.add(role.getRoleName());
+ }
+ }
+ }
+ taskVO.setHandlerId(handlerIds);
+ taskVO.setHandlerName(handlerNames);
+ taskVO.setHandlerUnitId(handlerUnitIds);
+ taskVO.setHandlerUnitName(handlerUnitNames);
+ }
}
/**
@@ -774,7 +912,10 @@
vo.setDeployId(process.getDeploymentId());
vo.setTaskName(userTask.getName());
vo.setProcessName(process.getProcessDefinitionName());
- Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
+ Task task = taskService.createTaskQuery()
+ .processInstanceId(process.getId())
+ .taskDefinitionKey(userTask.getId())
+ .singleResult();
if (Objects.isNull(task)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛屽彧鏌ヨ鏈紑濮嬬殑
List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
@@ -830,6 +971,8 @@
} else {
continue;
}
+ } else {
+ this.setRuntimeTaskInfo(task, vo);
}
vos.add(vo);
}
@@ -882,6 +1025,9 @@
if (TaskStatusEnum.TODO.equals(taskVO.getTaskStatus())) {
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(taskVO.getTaskId());
for (IdentityLink identityLink : identityLinksForTask) {
+ if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
+ continue;
+ }
// 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
if (StringUtils.isNotBlank(identityLink.getUserId())) {
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
@@ -924,12 +1070,12 @@
taskVO.setHandlerType(HandlerTypeEnum.USER);
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
-// taskVO.setHandlerId(sysUser.getUserId());
+ handlerIds.add(sysUser.getUserId());
+ handlerNames.add(sysUser.getNickName());
if (Objects.nonNull(sysUser.getDept())) {
handlerUnitIds.add(sysUser.getDept().getDeptId());
handlerUnitNames.add(sysUser.getDept().getDeptName());
}
-// taskVO.setHandlerName(sysUser.getNickName());
}
// 缁戝畾鐨勬槸瑙掕壊锛屾煡鍑鸿鑹插悕绉�
} else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
--
Gitblit v1.8.0