From db13cc9c96850fdd02f73b787fbaaadb73c03dc7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 15 一月 2025 17:29:41 +0800
Subject: [PATCH] 启动项目时,根据项目创建人(暂时这样)设置流程变量,动态替换任务处理人

---
 flowable/src/main/java/com/ycl/service/common/TaskCommonService.java |   41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 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..e5abf8c 100644
--- a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
+++ b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
@@ -43,9 +43,9 @@
     /**
      * 閫氳繃褰撳墠鑺傜偣瀹氫箟key锛岃幏鍙栧叾涓婁竴涓妭鐐圭殑淇℃伅锛屽鏋滃墠闈㈡槸骞惰鐨勪細杩斿洖澶氫釜(鍖呭惈褰撳墠鑺傜偣)
      *
-     * @param processDefId 娴佺▼瀹氫箟id
-     * @param currentNodeDefId 褰撳墠鑺傜偣瀹氫箟id
-     * @param sysFormService 琛ㄥ崟鏈嶅姟灞�
+     * @param processDefId        娴佺▼瀹氫箟id
+     * @param currentNodeDefId    褰撳墠鑺傜偣瀹氫箟id
+     * @param sysFormService      琛ㄥ崟鏈嶅姟灞�
      * @param needInitCurrentForm 鏄惁闇�瑕佸垵濮嬪寲褰撳墠鑺傜偣鐨勮〃鍗曟暟鎹紝涓�鑸煡璇㈠凡瀹屾垚鐨勪换鍔¤鎯呴渶瑕�
      * @return
      */
@@ -82,11 +82,11 @@
 
         // 鑾峰彇褰撳墠鑺傜偣鐨勮緭鍏�
         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 +95,10 @@
                 }
                 Map<String, Object> data = new HashMap<>(1);
                 data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
-
                 formDetailVO.setFormJsonObj(data);
             }
-
-            defKeys.add(formDetailVO);
         }
+        defKeys.add(formDetailVO);
         this.beforeNodeInfo(currentElement, defKeys);
 
         return defKeys;
@@ -161,22 +159,21 @@
     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());
                         defKeys.add(formDetailVO);
                     } 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();
@@ -195,7 +192,7 @@
     /**
      * 鑾峰彇褰撳墠鑺傜偣鐨勪笂涓�鑺傜偣id锛屼笉鍙嶆倲褰撳墠鑺傜偣淇℃伅锛屽鏋滃墠闈㈡槸骞惰锛岄偅涔堜細杩斿洖澶氫釜
      *
-     * @param processDefId 娴佺▼瀹氫箟id
+     * @param processDefId     娴佺▼瀹氫箟id
      * @param currentNodeDefId 褰撳墠鑺傜偣瀹氫箟id
      * @return
      */
@@ -254,7 +251,7 @@
             } 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()))
+                        && extensionElement.getAttributes().get("value").stream().anyMatch(attribute -> ProcessConstants.EXTENSION_PROPERTY_NEED_AUDITING_VALUE.equals(attribute.getValue()))
                 ) {
                     return Boolean.TRUE;
                 } else {
@@ -270,10 +267,10 @@
      * 椹冲洖浠诲姟
      *
      * @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                瀹℃牳鎰忚
      */
     public void reject(String rejectedTaskDefKey, String rejectTaskDefKey, String processInsId, String taskId, String msg) {
         // 椹冲洖鐨勬牳蹇僡pi锛歳untimeService.createChangeActivityStateBuilder().moveXXX 鐨刟pi锛屽彲浠ヨ缃粠褰撳墠鑺傜偣绉诲姩鍒扮洰鏍囪妭鐐�
@@ -290,13 +287,11 @@
         // 璁剧疆涓ゆ潯璇勮
         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();
     }
-
-
 
 
 }

--
Gitblit v1.8.0