From 3a3ab7e50002d269b65473f8cb139fb7f908f292 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 12 十二月 2024 17:25:03 +0800
Subject: [PATCH] 调整
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 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 984dd4e..71e3bcc 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -277,16 +277,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) {
@@ -401,16 +396,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) {
@@ -502,6 +492,8 @@
.includeIdentityLinks()
.singleResult();
if (Objects.isNull(historicTask)) {
+ vo.setPromoterName("鏆傛棤");
+ vo.setPromoterUnitName("鏆傛棤");
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
@@ -552,6 +544,7 @@
vo.setHandlerId(handlerUserId);
vo.setHandlerName(handlerUser.getNickName());
}
+ vo.setTaskDefinitionKey(historicTask.getTaskDefinitionKey());
this.setPromoterAndHandler(vo, historicTask.getIdentityLinks());
}
} else {
@@ -559,6 +552,8 @@
vo.setTaskId(task.getId());
vo.setExecutionId(task.getExecutionId());
vo.setCreateTime(task.getCreateTime());
+ vo.setTaskDefinitionKey(task.getTaskDefinitionKey());
+
this.setPromoterAndHandler(vo, null);
}
return vo;
@@ -695,22 +690,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 +784,36 @@
}
/**
+ * 璁剧疆浠诲姟鍙戣捣浜�
+ *
+ * @param taskVO
+ */
+ private void setPromoterInfo(CustomerTaskVO taskVO) {
+ // 鍙戣捣浜哄簲涓轰笂涓�鑺傜偣鐨勫鐞嗕汉
+ List<String> beforeNodeKey = taskCommonService.getBeforeNodeInfo(taskVO.getProcessDefId(), taskVO.getTaskDefinitionKey());
+ List<SysUser> userList = beforeNodeKey.stream().map(key -> {
+ HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().taskDefinitionKey(key).singleResult();
+ if (Objects.nonNull(historicTaskInstance)) {
+ // 瀹為檯棰嗗彇杩欎釜浠诲姟鐨勪汉锛屼篃灏辨槸澶勭悊浜�
+ String assignee = historicTaskInstance.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