From ddb766143ae7d04eb193d6f93719582e9f72296c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 22:23:01 +0800
Subject: [PATCH] 获取前置节点，执行id相同时只取最近一个
---
flowable/src/main/java/com/ycl/service/common/TaskCommonService.java | 121 +++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 32 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
index daeef92..ed65499 100644
--- a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
+++ b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
@@ -2,13 +2,18 @@
import com.alibaba.fastjson2.JSONObject;
import com.ycl.common.constant.ProcessConstants;
+import com.ycl.common.core.domain.entity.SysDictData;
import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.FlowComment;
import com.ycl.common.enums.business.TaskStatusEnum;
+import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.vo.FormDetailVO;
import com.ycl.flow.FindNextNodeUtil;
import com.ycl.service.ISysFormService;
+import com.ycl.system.service.ISysDictDataService;
+import com.ycl.system.service.ISysDictTypeService;
+import com.ycl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
@@ -18,6 +23,8 @@
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.identitylink.api.IdentityLink;
+import org.flowable.identitylink.api.IdentityLinkType;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.stereotype.Service;
@@ -39,13 +46,15 @@
private final RepositoryService repositoryService;
private final TaskService taskService;
private final HistoryService historyService;
+ private final ISysUserService sysUserService;
+ private final ISysDictTypeService sysDictDService;
/**
* 閫氳繃褰撳墠鑺傜偣瀹氫箟key锛岃幏鍙栧叾涓婁竴涓妭鐐圭殑淇℃伅锛屽鏋滃墠闈㈡槸骞惰鐨勪細杩斿洖澶氫釜(鍖呭惈褰撳墠鑺傜偣)
*
- * @param processDefId 娴佺▼瀹氫箟id
- * @param currentNodeDefId 褰撳墠鑺傜偣瀹氫箟id
- * @param sysFormService 琛ㄥ崟鏈嶅姟灞�
+ * @param processDefId 娴佺▼瀹氫箟id
+ * @param currentNodeDefId 褰撳墠鑺傜偣瀹氫箟id
+ * @param sysFormService 琛ㄥ崟鏈嶅姟灞�
* @param needInitCurrentForm 鏄惁闇�瑕佸垵濮嬪寲褰撳墠鑺傜偣鐨勮〃鍗曟暟鎹紝涓�鑸煡璇㈠凡瀹屾垚鐨勪换鍔¤鎯呴渶瑕�
* @return
*/
@@ -80,13 +89,13 @@
throw new RuntimeException("鏈壘鍒拌浠诲姟鐨勬祦绋嬪畾涔夎妭鐐�");
}
- // 鑾峰彇褰撳墠鑺傜偣鐨勮緭鍏�
+ // 鑾峰彇褰撳墠鑺傜偣鐨勪俊鎭�
List<FormDetailVO> defKeys = new ArrayList<>(2);
+ FormDetailVO formDetailVO = new FormDetailVO();
+ formDetailVO.setCurrent(Boolean.TRUE);
+ formDetailVO.setBeforeNodeDefId(currentElement.getId());
+ formDetailVO.setBeforeNodeName(currentElement.getName());
if (StringUtils.hasText(currentElement.getFormKey())) {
- FormDetailVO formDetailVO = new FormDetailVO();
- formDetailVO.setBeforeNodeDefId(currentElement.getId());
- formDetailVO.setBeforeNodeName(currentElement.getName());
- formDetailVO.setCurrent(Boolean.TRUE);
if (needInitCurrentForm) {
SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(currentElement.getFormKey()));
@@ -95,12 +104,14 @@
}
Map<String, Object> data = new HashMap<>(1);
data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
-
formDetailVO.setFormJsonObj(data);
}
-
- defKeys.add(formDetailVO);
}
+ formDetailVO.setCanJump(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_JUMP_TEXT));
+ formDetailVO.setCanWait(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_WAIT_TEXT));
+ formDetailVO.setCanHangup(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_HANGUP_TEXT));
+ formDetailVO.setUserTask(currentElement);
+ defKeys.add(formDetailVO);
this.beforeNodeInfo(currentElement, defKeys);
return defKeys;
@@ -161,28 +172,35 @@
private void beforeNodeInfo(FlowElement currentElement, List<FormDetailVO> defKeys) {
if (currentElement instanceof UserTask) {
UserTask userTask = (UserTask) currentElement;
- if (! CollectionUtils.isEmpty(userTask.getIncomingFlows())) {
+ if (!CollectionUtils.isEmpty(userTask.getIncomingFlows())) {
for (SequenceFlow incomingFlow : userTask.getIncomingFlows()) {
if (incomingFlow.getSourceFlowElement() instanceof UserTask) {
FormDetailVO formDetailVO = new FormDetailVO();
formDetailVO.setBeforeNodeDefId(incomingFlow.getSourceFlowElement().getId());
formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
- formDetailVO.setBeforeNodeName(((UserTask) incomingFlow.getSourceFlowElement()).getOwner());
+ formDetailVO.setCanJump(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_JUMP_TEXT));
+ formDetailVO.setCanWait(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_WAIT_TEXT));
+ formDetailVO.setUserTask((UserTask) incomingFlow.getSourceFlowElement());
defKeys.add(formDetailVO);
+ continue;
} else {
beforeNodeInfo(incomingFlow.getSourceFlowElement(), defKeys);
}
}
}
- } else if (currentElement instanceof Gateway ){
+ } else if (currentElement instanceof Gateway) {
Gateway gateway = (Gateway) currentElement;
- if (! CollectionUtils.isEmpty(gateway.getIncomingFlows())) {
+ if (!CollectionUtils.isEmpty(gateway.getIncomingFlows())) {
for (SequenceFlow incomingFlow : gateway.getIncomingFlows()) {
if (incomingFlow.getSourceFlowElement() instanceof UserTask) {
FormDetailVO formDetailVO = new FormDetailVO();
formDetailVO.setBeforeNodeDefId(incomingFlow.getSourceFlowElement().getId());
formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
+ formDetailVO.setCanJump(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_JUMP_TEXT));
+ formDetailVO.setCanWait(this.checkHasExeProperty(currentElement.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_CAN_WAIT_TEXT));
+ formDetailVO.setUserTask((UserTask) incomingFlow.getSourceFlowElement());
defKeys.add(formDetailVO);
+ continue;
} else {
beforeNodeInfo(incomingFlow.getSourceFlowElement(), defKeys);
}
@@ -193,9 +211,9 @@
/**
- * 鑾峰彇褰撳墠鑺傜偣鐨勪笂涓�鑺傜偣id锛屼笉鍙嶆倲褰撳墠鑺傜偣淇℃伅锛屽鏋滃墠闈㈡槸骞惰锛岄偅涔堜細杩斿洖澶氫釜
+ * 鑾峰彇褰撳墠鑺傜偣鐨勪笂涓�鑺傜偣id锛屼笉杩斿洖褰撳墠鑺傜偣淇℃伅锛屽鏋滃墠闈㈡槸骞惰锛岄偅涔堜細杩斿洖澶氫釜
*
- * @param processDefId 娴佺▼瀹氫箟id
+ * @param processDefId 娴佺▼瀹氫箟id
* @param currentNodeDefId 褰撳墠鑺傜偣瀹氫箟id
* @return
*/
@@ -239,30 +257,29 @@
/**
- * 妫�鏌ヤ换鍔¤妭鐐规槸鍚﹂厤缃簡锛氶渶瑕佸鏍� 鐨勬墿灞曞睘鎬�
+ * 妫�鏌ヤ换鍔¤妭鐐规槸鍚﹂厤缃簡鏌愪釜鐨勬墿灞曞睘鎬�
*
* @param extensionElements 鎵╁睍鍒楄〃
* @return
*/
- public Boolean checkTaskNeedAuditing(List<ExtensionElement> extensionElements) {
+ public Boolean checkHasExeProperty(List<ExtensionElement> extensionElements, String exePropertyName) {
if (CollectionUtils.isEmpty(extensionElements)) {
return Boolean.FALSE;
}
- for (ExtensionElement extensionElement : extensionElements) {
+ return extensionElements.stream().anyMatch(extensionElement -> {
if (CollectionUtils.isEmpty(extensionElement.getAttributes())) { // 濡傛灉鏈韩娌℃湁灞炴�э紝鍒欓�掑綊child
- return checkTaskNeedAuditing(extensionElement.getChildElements().get("property"));
+ return checkHasExeProperty(extensionElement.getChildElements().get("property"), exePropertyName);
} else {
- // 鍚﹀垯鍏堟煡鏈韩鐨勫睘鎬ф湁涓嶆湁锛氶渶瑕佸鏍� 鐨勫睘鎬э紝娌℃湁涔熸槸閫掑綊child
- if (extensionElement.getAttributes().get("name").stream().anyMatch(attribute -> ProcessConstants.EXTENSION_PROPERTY_NEED_AUDITING_TEXT.equals(attribute.getValue()))
- && extensionElement.getAttributes().get("value").stream().anyMatch(attribute -> ProcessConstants.EXTENSION_PROPERTY_NEED_AUDITING_VALUE.equals(attribute.getValue()))
+ // 鍚﹀垯鍏堟煡鏈韩鐨勫睘鎬ф湁涓嶆湁锛屾病鏈変篃鏄�掑綊child
+ if (extensionElement.getAttributes().get("name").stream().anyMatch(attribute -> exePropertyName.equals(attribute.getValue()))
+ && extensionElement.getAttributes().get("value").stream().anyMatch(attribute -> ProcessConstants.EXTENSION_PROPERTY_VALUE.equals(attribute.getValue()))
) {
return Boolean.TRUE;
} else {
- return checkTaskNeedAuditing(extensionElement.getChildElements().get("property"));
+ return checkHasExeProperty(extensionElement.getChildElements().get("property"), exePropertyName);
}
}
- }
- return Boolean.FALSE;
+ });
}
@@ -270,11 +287,12 @@
* 椹冲洖浠诲姟
*
* @param rejectedTaskDefKey 琚┏鍥炵殑浠诲姟key
- * @param rejectTaskDefKey 鎵ц椹冲洖鎿嶄綔鎵�鍦ㄧ殑浠诲姟key
- * @param processInsId 娴佺▼瀹炰緥id
- * @param taskId 褰撳墠浠诲姟id
- * @param msg 瀹℃牳鎰忚
+ * @param rejectTaskDefKey 鎵ц椹冲洖鎿嶄綔鎵�鍦ㄧ殑浠诲姟key
+ * @param processInsId 娴佺▼瀹炰緥id
+ * @param taskId 褰撳墠浠诲姟id
+ * @param msg 瀹℃牳鎰忚
*/
+ @Deprecated
public void reject(String rejectedTaskDefKey, String rejectTaskDefKey, String processInsId, String taskId, String msg) {
// 椹冲洖鐨勬牳蹇僡pi锛歳untimeService.createChangeActivityStateBuilder().moveXXX 鐨刟pi锛屽彲浠ヨ缃粠褰撳墠鑺傜偣绉诲姩鍒扮洰鏍囪妭鐐�
// 椹冲洖鐨勬牳蹇冿細闇�瑕佹壘鍒板綋鍓嶈妭鐐广�佷互鍙婅娴佽浆鍒扮殑鐩爣鑺傜偣銆傚叾涓瘮杈冮夯鐑︾殑鏄鐞嗗苟琛岀瓑姣旇緝澶嶆潅鐨勬儏鍐�
@@ -290,13 +308,52 @@
// 璁剧疆涓ゆ潯璇勮
List<HistoricTaskInstance> rejectedTaskList = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInsId).taskDefinitionKey(rejectedTaskDefKey).orderByHistoricTaskInstanceStartTime().desc().list();
String msg1 = "椹冲洖浜嗭細銆�" + rejectedTaskList.get(0).getName() + "銆戯紝椹冲洖鍘熷洜锛�";
- taskService.addComment(taskId, processInsId, FlowComment.REJECT.getType(), msg1 + msg);
+ taskService.addComment(taskId, processInsId, FlowComment.REJECT.getType(), msg1 + msg);
// TODO 鐩存帴浣跨敤杩欎釜api濂藉儚鏈夐棶棰�
runtimeService.createChangeActivityStateBuilder().processInstanceId(processInsId).moveActivityIdTo(rejectTaskDefKey, rejectedTaskDefKey).changeState();
runtimeService.createChangeActivityStateBuilder().processInstanceId(processInsId).moveExecutionToActivityId(rejectTaskDefKey, rejectedTaskDefKey).changeState();
}
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鐨勭粍
+ *
+ * @return
+ */
+ public List<String> getCurrentUserGroups() {
+ String deptId = "dept:" + SecurityUtils.getLoginUser().getDeptId();
+ List<String> roleIds;
+ if (CollectionUtils.isEmpty(SecurityUtils.getLoginUser().getUser().getRoles())) {
+ roleIds = new ArrayList<>(1);
+ } else {
+ roleIds = SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId() + "").collect(Collectors.toList());
+ }
+ roleIds.add(deptId);
+ return roleIds;
+ }
+ /**
+ * 澶勭悊娴佺▼涓殑鍙橀噺
+ *
+ * @param variables
+ * @param taskDefKey
+ * @return
+ */
+ public Map<String, Object> handleVar(Map<String, Object> variables, String taskDefKey) {
+ Map<String, Object> processVariables = new HashMap<>();
+ //鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = sysDictDService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ Map<String, Object> newV = new HashMap<>(2);
+ if (!org.springframework.util.CollectionUtils.isEmpty(variables)) {
+ for (String key : variables.keySet()) {
+ newV.put(taskDefKey + "&" + key, variables.get(key));
+ //瀛楀吀閲屾湁灏辨斁鍏ユ祦绋嬪彉閲忎腑
+ if (!org.apache.commons.collections4.CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
+ processVariables.put(key,variables.get(key));
+ }
+ }
+ }
+ return processVariables;
+ }
}
--
Gitblit v1.8.0