From a0e8d1bbff7a02f538be76e852aa233324bd8810 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 13:31:51 +0800
Subject: [PATCH] 赋码
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 248 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 187 insertions(+), 61 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 cc5d7b9..61d4bc3 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -19,6 +19,8 @@
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.form.TaskDelegationForm;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
import com.ycl.mapper.ProjectInfoMapper;
@@ -29,6 +31,7 @@
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;
@@ -42,6 +45,7 @@
import org.flowable.engine.runtime.ProcessInstance;
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.task.api.Task;
import org.flowable.task.api.TaskQuery;
@@ -78,6 +82,7 @@
private final ISysUserService sysUserService;
private final ISysRoleService sysRoleService;
private final ISysDeptService sysDeptService;
+ private final TaskCommonService taskCommonService;
/**
* 鍒嗛〉鏌ヨ
@@ -113,14 +118,16 @@
if (Objects.nonNull(pp.getProcessInsId())) {
HistoricProcessInstance historicProcessInstance =
historyService.createHistoricProcessInstanceQuery().processInstanceId(pp.getProcessInsId()).singleResult();
- // 鍒犻櫎涔嬪墠娴佺▼鐨勬暟鎹�
- if (historicProcessInstance.getEndTime() != null) {
- historyService.deleteHistoricProcessInstance(historicProcessInstance.getId());
- } else {
- // 鍒犻櫎娴佺▼瀹炰緥
- runtimeService.deleteProcessInstance(pp.getProcessInsId(), "");
- // 鍒犻櫎鍘嗗彶娴佺▼瀹炰緥
- historyService.deleteHistoricProcessInstance(pp.getProcessInsId());
+ 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());
@@ -249,6 +256,7 @@
TaskQuery taskQuery = taskService.createTaskQuery()
.active()
.includeProcessVariables()
+ .includeIdentityLinks()
.orderByTaskCreateTime().desc();
if (StringUtils.isNotBlank(taskName)) {
@@ -273,19 +281,14 @@
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) {
+ List<? extends IdentityLinkInfo> identityLinks = task.getIdentityLinks();
+ for (IdentityLinkInfo identityLink : identityLinks) {
// 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
if (StringUtils.isNotBlank(identityLink.getUserId())) {
taskVO.setHandlerType(HandlerTypeEnum.USER);
@@ -341,26 +344,55 @@
@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) {
+ if (flowElement instanceof UserTask && flowElement.getId().equals(task.getTaskDefinitionKey())) {
UserTask userTask = (UserTask) flowElement;
- List<ExtensionElement> extensionElements = userTask.getExtensionElements().get("flowable:properties");
- if (! CollectionUtils.isEmpty(extensionElements)) {
- for (ExtensionElement extensionElement : extensionElements) {
- String fieldName = extensionElement.getAttributeValue(taskId,"name");
- String fieldValue = extensionElement.getAttributeValue(taskId,"value");
- System.out.println("Field Name: " + fieldName + ", Field Value: " + fieldValue);
- }
- }
+ needAuditing = taskCommonService.checkTaskNeedAuditing(userTask.getExtensionElements().get("properties"));
+ break;
}
}
}
- return null;
+ return Result.ok().data(needAuditing);
+ }
+
+ @Override
+ public Result taskDelegation(TaskDelegationForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).includeIdentityLinks().singleResult();
+ if (Objects.isNull(task)) {
+ throw new RuntimeException("鏈湪杩愯浠诲姟涓壘鍒拌浠诲姟锛屾棤娉曟墽琛岃浆鍔炴搷浣�");
+ }
+ // 闇�瑕佸厛绉婚櫎涔嬪墠鐨勫鐞嗕汉
+ for (IdentityLinkInfo identityLink : task.getIdentityLinks()) {
+ if (StringUtils.isNotBlank(identityLink.getUserId())) {
+ taskService.deleteCandidateUser(task.getId(), identityLink.getUserId());
+ } else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
+ taskService.deleteCandidateGroup(task.getId(), identityLink.getGroupId());
+ }
+ }
+ // 鍐嶆柊澧炲鐞嗕汉
+ switch (form.getPeopleType()) {
+ case FIX_USER:
+ // 鎸囧畾鐢ㄦ埛鐨勮瘽锛屽彧鑳介�変竴涓敤鎴�
+ taskService.delegateTask(task.getId(), form.getTargetId());
+ break;
+ case USER:
+ // 鐢ㄦ埛缁勭殑璇濓紝鍙互閫夊涓敤鎴凤紝涓ユ牸鏉ヨ杩欓噷鐨勭敤鎴风粍骞朵笉鏄痜lowable涓殑缁勭殑姒傚康锛屽彧鏄紑婧愭鏋舵湁杩欎釜瀹氫箟
+ break;
+ case DEPT:
+ taskService.addCandidateGroup(task.getId(), form.getTargetId());
+ break;
+ default:
+ break;
+ }
+
+ return Result.ok("杞姙鎴愬姛");
}
/**
@@ -401,16 +433,11 @@
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) {
@@ -485,6 +512,12 @@
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();
@@ -496,12 +529,16 @@
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);
@@ -542,28 +579,77 @@
} 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;
}).collect(Collectors.toList());
result.data(vos);
+ return vos;
+ }
+
+ /**
+ * 鏌ヨ宸插畬鎴愮殑娴佺▼鐨勪换鍔′俊鎭�
+ *
+ * @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;
}
@@ -596,6 +682,12 @@
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();
@@ -607,12 +699,14 @@
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)) {
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
@@ -674,18 +768,24 @@
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)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛屽彧鏌ヨ鏈紑濮嬬殑
- 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)) {
num++;
}
}
@@ -695,22 +795,13 @@
/**
- * 璁剧疆浠诲姟鐨勫彂璧蜂汉&澶勭悊浜�
+ * 璁剧疆浠诲姟鐨勫彂璧蜂汉&澶勭悊浜� 鍙湁寰呭姙浠诲姟鍜屽凡瀹屾垚浠诲姟鎵嶄細鎺夎繖涓柟娉�
*
* @param taskVO
* @param identityLinkInfos 濡傛灉鏄凡瀹屾垚鐨勪换鍔★紝鐢ㄨ繖涓幓鍙栧叧鑱旂殑鐢ㄦ埛/鐢ㄦ埛缁�
*/
private void setPromoterAndHandler(CustomerTaskVO taskVO, List<? extends IdentityLinkInfo> identityLinkInfos) {
- // TODO 鍙戣捣浜烘槸鍚﹀簲涓轰笂涓�鑺傜偣鐨勫鐞嗕汉
- // 娴佺▼鍙戣捣浜轰俊鎭�
- 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());
@@ -798,6 +889,41 @@
}
/**
+ * 璁剧疆浠诲姟鍙戣捣浜�
+ *
+ * @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("銆�")));
+ }
+ }
+
+ /**
* 鑾峰彇鏌愪釜娴佺▼鐨勬墍鏈変换鍔¤妭鐐�
*
* @param processDefinitionId
--
Gitblit v1.8.0