From 5cd0e50ccbc6e10dd4e488d8b4106e82fb676521 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 14:22:36 +0800
Subject: [PATCH] 查询任务是否需要审核接口完善
---
flowable/src/main/java/com/ycl/service/common/TaskCommonService.java | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 79 insertions(+), 20 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 5335db3..c02b5f4 100644
--- a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
+++ b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
@@ -36,7 +36,7 @@
* @param currentNodeDefId
* @return
*/
- public List<FormDetailVO> getBeforeNodeDefId(String processDefId, String currentNodeDefId, ISysFormService sysFormService) {
+ public List<FormDetailVO> getBeforeNodeDefId(String processDefId, String currentNodeDefId, ISysFormService sysFormService, Boolean needInitCurrentForm) {
// 鑾峰彇娴佺▼瀹氫箟
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
.processDefinitionId(processDefId)
@@ -75,14 +75,17 @@
formDetailVO.setBeforeNodeName(currentElement.getName());
formDetailVO.setCurrent(Boolean.TRUE);
- SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(currentElement.getFormKey()));
- if (Objects.isNull(sysForm)) {
- throw new RuntimeException("璇ユ祦绋嬬粦瀹氱殑琛ㄥ崟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
- }
- Map<String, Object> data = new HashMap<>(1);
- data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
+ if (needInitCurrentForm) {
+ SysForm sysForm = sysFormService.selectSysFormById(Long.parseLong(currentElement.getFormKey()));
+ if (Objects.isNull(sysForm)) {
+ throw new RuntimeException("璇ユ祦绋嬬粦瀹氱殑琛ㄥ崟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
+ }
+ Map<String, Object> data = new HashMap<>(1);
+ data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
- formDetailVO.setFormJsonObj(data);
+ formDetailVO.setFormJsonObj(data);
+ }
+
defKeys.add(formDetailVO);
}
this.before(currentElement, defKeys);
@@ -96,22 +99,78 @@
* @param currentElement
* @param defKeys
*/
- private void before(UserTask currentElement, List<FormDetailVO> defKeys) {
- if (! CollectionUtils.isEmpty(currentElement.getIncomingFlows())) {
- for (SequenceFlow incomingFlow : currentElement.getIncomingFlows()) {
- if (! (incomingFlow.getSourceFlowElement() instanceof UserTask)) {
- // 涓嶅寘鍚紑濮嬭妭鐐�
- if (! (incomingFlow.getSourceFlowElement() instanceof StartEvent)) {
- before((UserTask) (incomingFlow.getSourceFlowElement()), defKeys);
+ private void before(FlowElement currentElement, List<FormDetailVO> defKeys) {
+ if (currentElement instanceof UserTask) {
+ UserTask userTask = (UserTask) currentElement;
+ 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());
+ defKeys.add(formDetailVO);
+ } else {
+ before(incomingFlow.getSourceFlowElement(), defKeys);
}
- } else {
- FormDetailVO formDetailVO = new FormDetailVO();
- formDetailVO.setBeforeNodeDefId(incomingFlow.getSourceFlowElement().getId());
- formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
- defKeys.add(formDetailVO);
+ }
+ }
+ } else if (currentElement instanceof Gateway ){
+ Gateway gateway = (Gateway) currentElement;
+ 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());
+ defKeys.add(formDetailVO);
+ } else {
+ before(incomingFlow.getSourceFlowElement(), defKeys);
+ }
}
}
}
+// if (! CollectionUtils.isEmpty(currentElement.getIncomingFlows())) {
+// for (SequenceFlow incomingFlow : currentElement.getIncomingFlows()) {
+// if (! (incomingFlow.getSourceFlowElement() instanceof UserTask)) {
+// // 涓嶅寘鍚紑濮嬭妭鐐广�佸苟琛岀綉鍏炽�佷簰鏂ョ綉鍏筹紝// TODO 杩橀渶瑕佹帓闄ゅ叾瀹冪壒娈婄被鍨�
+// if (! (incomingFlow.getSourceFlowElement() instanceof StartEvent) && ! (incomingFlow.getSourceFlowElement() instanceof ParallelGateway) && ! (incomingFlow.getSourceFlowElement() instanceof ExclusiveGateway)) {
+// before((UserTask) (incomingFlow.getSourceFlowElement()), defKeys);
+// }
+// } else {
+// FormDetailVO formDetailVO = new FormDetailVO();
+// formDetailVO.setBeforeNodeDefId(incomingFlow.getSourceFlowElement().getId());
+// formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
+// defKeys.add(formDetailVO);
+// }
+// }
+// }
+ }
+
+ /**
+ * 妫�鏌ヤ换鍔¤妭鐐规槸鍚﹂厤缃簡锛氶渶瑕佸鏍� 鐨勬墿灞曞睘鎬�
+ *
+ * @param extensionElements 鎵╁睍鍒楄〃
+ * @return
+ */
+ public Boolean checkTaskNeedAuditing(List<ExtensionElement> extensionElements) {
+ if (CollectionUtils.isEmpty(extensionElements)) {
+ return Boolean.FALSE;
+ }
+ for (ExtensionElement extensionElement : extensionElements) {
+ if (CollectionUtils.isEmpty(extensionElement.getAttributes())) { // 濡傛灉鏈韩娌℃湁灞炴�э紝鍒欓�掑綊child
+ return checkTaskNeedAuditing(extensionElement.getChildElements().get("property"));
+ } 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()))
+ ) {
+ return Boolean.TRUE;
+ } else {
+ return checkTaskNeedAuditing(extensionElement.getChildElements().get("property"));
+ }
+ }
+ }
+ return Boolean.FALSE;
}
}
--
Gitblit v1.8.0