Merge remote-tracking branch 'origin/master'

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/ExtAutoTaskService.java

@@ -225,7 +225,7 @@ public interface ExtAutoTaskService extends ExtAutoTaskServiceFeign {
 
     /**
      * 设置评审通知流程团队变量
-     * @param id
+     * @param noticeVO
      */
     void setDesignNoticeTeamRole(ExtDesignReviewNoticeVO noticeVO);
 }

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/impl/ExtAutoTaskServiceImpl.java

@@ -57,6 +57,7 @@ import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import com.yonde.dex.user.feign.*;
 import com.yonde.dex.utils.common.utils.DxFileUtils;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
+import com.yonde.dex.wfc.common.enums.ProcessStateEnum;
 import com.yonde.dex.wfc.common.enums.TaskStateEnum;
 import com.yonde.dex.wfc.common.vo.*;
 import com.yonde.dex.wfc.feign.api.WfcActivityFeign;
@@ -213,11 +214,21 @@ public class ExtAutoTaskServiceImpl implements ExtAutoTaskService {
                 }
             }
         }
-        //流程 消息发送设置变量
-        String teamRole = "messageDesign";
-//        varMap.put("wf_act_TeamRole_Responsible_userList", userList);
-//        wfcProcessFeign.setProcessVariables(processInstanceId, varMap);
-
+        if (!StrUtil.isEmpty(userList)){
+            //流程 消息发送设置变量
+            String teamRole = "messageDesign";
+            // 设计评审通知流程模板   key
+            String PROCESS_KEY= "ExtDesignReviewNoticeWF";
+            //"wf_act_TeamRole_Responsible_userList"
+            String varUser = "wf_act_TeamRole_" + teamRole + "_userList";
+            Map<String, Object> inspectors = new HashMap<>();
+            inspectors.put(varUser, userList);
+            DxWfProcessSearchVO searchVO = DxWfProcessSearchVO.builder().processDefKey(PROCESS_KEY).pboClass(noticeVO.getDxClassname()).pboId(noticeVO.getId()).state(String.valueOf(ProcessStateEnum.RUNNING)).build();
+            List<DxWfProcessVO> content = wfcProcessFeign.getProcessList(searchVO, 1, 10).getContent();
+            if (CollectionUtils.isNotEmpty(content)) {
+                wfcProcessFeign.setProcessVariables(content.get(0).getId(), inspectors);
+            }
+        }
     }
 
     @SneakyThrows