增加分支节点

WorkFlowApi/WorkFlowApi.Business/Scheme/WFProcessBusiness.cs

@@ -39,7 +39,7 @@ namespace WorkFlowApi.Business.Scheme
         /// <param name="level">流程等级</param>
         /// <param name="auditors">下一节点审核人</param>
         /// <param name="userInfo">当前操作人信息</param>
-        public void CreateFlow(string schemeCode, string processId, string title, int level, string auditors, T_Sys_UserAccount userInfo, out List<T_WF_TaskView>   t_WF_TaskViews)
+        public void CreateFlow(string schemeCode, string processId, string title, int level,string branchnodeCode, T_Sys_UserAccount userInfo, out List<T_WF_TaskView>   t_WF_TaskViews, List<WFAuditor> auditors = null )
         {
 
             // 初始化流程引擎
@@ -50,11 +50,11 @@ namespace WorkFlowApi.Business.Scheme
             WFNodeInfo nodeInfo = nWFIEngine.GetStartNode();
             // 获取下一节点信息
             List<WFLineInfo> lineList = new List<WFLineInfo>();
-            List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, "agree", false, lineList);
+            List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, "agree", false, lineList, branchnodeCode);
 
-           
+            string codelist = nWFIEngine.GetButonList(list.FirstOrDefault().id, lineList);
             // 创建任务
-            List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig);
+            List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig, codelist);
             List<T_WF_Task> taskListEntity =  taskList.MapToList<T_WF_Task>();
             t_WF_TaskViews = taskList;
             // nextTaskinfos = taskList.MapToList<NextTaskinfo>();
@@ -106,6 +106,14 @@ namespace WorkFlowApi.Business.Scheme
             };
             nWFTaskLogEntity.Create();
             // 保存信息
+            save(nWFProcessEntity, taskList, nWFTaskLogEntity);
+         
+
+
+        }
+
+        private void save(T_WF_Process nWFProcessEntity, List<T_WF_TaskView> taskList, T_WF_TaskLog nWFTaskLogEntity)
+        {
             var wFProcessEntityTmp = GetEntity(nWFProcessEntity.F_Id);
             if (wFProcessEntityTmp == null)
             {
@@ -118,28 +126,30 @@ namespace WorkFlowApi.Business.Scheme
 
             foreach (var task in taskList)
             {
-                task.F_ModifyDate = DateTime.Now;
-                wFTaskBusiness.InsertExe(task);
-                int num = 1;
-                if (task.nWFUserInfoList != null)
+                if (task.nWFUserInfoList != null && task.nWFUserInfoList.Count > 0 && task.F_Type != null)
                 {
-                    foreach (var taskUser in task.nWFUserInfoList)
+                    task.F_ModifyDate = DateTime.Now;
+                    wFTaskBusiness.InsertExe(task);
+                    int num = 1;
+                    if (task.nWFUserInfoList != null)
                     {
-                        T_WF_TaskRelation nWFTaskRelationEntity = new T_WF_TaskRelation();
-                        nWFTaskRelationEntity.Create();
-                        nWFTaskRelationEntity.F_TaskId = task.F_Id;
-                        nWFTaskRelationEntity.F_UserId = taskUser.Id;
-                        nWFTaskRelationEntity.F_Mark = taskUser.Mark;
-                        nWFTaskRelationEntity.F_Result = 0;
-                        nWFTaskRelationEntity.F_Sort = num;
-                        wFTaskTaskRelationBusiness.InsertExe(nWFTaskRelationEntity);
-                        num++;
+                        foreach (var taskUser in task.nWFUserInfoList)
+                        {
+                            T_WF_TaskRelation nWFTaskRelationEntity = new T_WF_TaskRelation();
+                            nWFTaskRelationEntity.Create();
+                            nWFTaskRelationEntity.F_TaskId = task.F_Id;
+                            nWFTaskRelationEntity.F_UserId = taskUser.Id;
+                            nWFTaskRelationEntity.F_Mark = taskUser.Mark;
+                            nWFTaskRelationEntity.F_Result = 0;
+                            nWFTaskRelationEntity.F_Sort = num;
+                            wFTaskTaskRelationBusiness.InsertExe(nWFTaskRelationEntity);
+                            num++;
+                        }
                     }
                 }
+
             }
             logBusiness.InsertExe(nWFTaskLogEntity);
-
-
         }
 
         /// <summary>
@@ -148,7 +158,7 @@ namespace WorkFlowApi.Business.Scheme
         /// <param name="processId"></param>
         /// <param name="userInfo"></param>
         /// <param name=""></param>
-        public void AgainCreateFlow(string processId, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews)
+        public void AgainCreateFlow(string processId, string branchnodeCode, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews)
         {
 
             // 初始化流程引擎
@@ -211,9 +221,9 @@ namespace WorkFlowApi.Business.Scheme
             // 获取下一节点信息
             List<WFLineInfo> lineList = new List<WFLineInfo>();
             List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, "agree", false, lineList);
-
+            string codelist = nWFIEngine.GetButonList(nodeInfo.id, lineList);
             // 创建任务
-            List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig);
+            List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig,codelist);
             List<T_WF_Task> taskListEntity = taskList.MapToList<T_WF_Task>();
             t_WF_TaskViews = taskList;
 
@@ -249,24 +259,28 @@ namespace WorkFlowApi.Business.Scheme
 
             foreach (var task in taskList)
             {
-                task.F_ModifyDate = DateTime.Now;
-                wFTaskBusiness.InsertExe(task);
-                int num = 1;
-                if (task.nWFUserInfoList != null)
+                if (task.nWFUserInfoList != null && task.nWFUserInfoList.Count > 0 && task.F_Type != null)
                 {
-                    foreach (var taskUser in task.nWFUserInfoList)
+                    task.F_ModifyDate = DateTime.Now;
+                    wFTaskBusiness.InsertExe(task);
+                    int num = 1;
+                    if (task.nWFUserInfoList != null)
                     {
-                        T_WF_TaskRelation _WF_TaskRelation = new T_WF_TaskRelation();
-                        _WF_TaskRelation.Create();
-                        _WF_TaskRelation.F_TaskId = task.F_Id;
-                        _WF_TaskRelation.F_UserId = taskUser.Id;
-                        _WF_TaskRelation.F_Mark = taskUser.Mark;
-                        _WF_TaskRelation.F_Result = 0;
-                        _WF_TaskRelation.F_Sort = num;
-                        wFTaskTaskRelationBusiness.InsertExe(_WF_TaskRelation);
-                        num++;
+                        foreach (var taskUser in task.nWFUserInfoList)
+                        {
+                            T_WF_TaskRelation _WF_TaskRelation = new T_WF_TaskRelation();
+                            _WF_TaskRelation.Create();
+                            _WF_TaskRelation.F_TaskId = task.F_Id;
+                            _WF_TaskRelation.F_UserId = taskUser.Id;
+                            _WF_TaskRelation.F_Mark = taskUser.Mark;
+                            _WF_TaskRelation.F_Result = 0;
+                            _WF_TaskRelation.F_Sort = num;
+                            wFTaskTaskRelationBusiness.InsertExe(_WF_TaskRelation);
+                            num++;
+                        }
                     }
                 }
+                  
             }
 
 
@@ -283,7 +297,7 @@ namespace WorkFlowApi.Business.Scheme
         /// <param name="stamp"></param>
         /// <param name="signUrl"></param>
         /// <param name="userInfo"></param>
-        public void AuditFlow(string operationCode, string operationName, string processId, string taskId, string des, string auditors, string stamp, string signUrl, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews)
+        public void AuditFlow(string operationCode, string operationName, string processId, string taskId, string des , string stamp, string signUrl, string branchnodeCode, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews, List<WFAuditor> auditors = null)
         {
             // 初始化流程引擎
             WFIEngine nWFIEngine = _Bootstraper("", processId, taskId, userInfo);
@@ -356,7 +370,7 @@ namespace WorkFlowApi.Business.Scheme
                 {
                     nWFTaskRelationEntity.F_Result = 1;
                 }
-                else if (operationCode == "disagree")
+                else if (operationCode == "refuse")
                 {
                     nWFTaskRelationEntity.F_Result = 2;
                 }
@@ -368,13 +382,17 @@ namespace WorkFlowApi.Business.Scheme
 
             // 获取下一节点信息
             List<WFLineInfo> lineList = new List<WFLineInfo>();
-            List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, operationCode, false, lineList);
-
-            List<T_WF_Task> closeTaskList = new List<T_WF_Task>();
+            List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, operationCode, false, lineList, branchnodeCode);
+            var codelist = string.Empty;
+            if (list != null && list.Count() > 0)
+            {
+               codelist = nWFIEngine.GetButonList(list.FirstOrDefault().id, lineList);
+            }
           
 
+
             // 创建任务
-            List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig);
+            List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig, codelist);
             List<T_WF_Task> taskListEntity = taskList.MapToList<T_WF_Task>();
             t_WF_TaskViews = taskList;
 
@@ -429,24 +447,28 @@ namespace WorkFlowApi.Business.Scheme
 
             foreach (var task in taskList)
             {
-                task.F_ModifyDate = DateTime.Now;
-                wFTaskBusiness.InsertExe(task);
-                int num = 1;
-                if (task.nWFUserInfoList != null)
+                if(task.nWFUserInfoList!= null&& task.nWFUserInfoList.Count>0&& task.F_Type!=null)
                 {
-                    foreach (var taskUser in task.nWFUserInfoList)
+                    task.F_ModifyDate = DateTime.Now;
+                    wFTaskBusiness.InsertExe(task);
+                    int num = 1;
+                    if (task.nWFUserInfoList != null)
                     {
-                        T_WF_TaskRelation  _WF_TaskRelation = new T_WF_TaskRelation();
-                        _WF_TaskRelation.Create();
-                        _WF_TaskRelation.F_TaskId = task.F_Id;
-                        _WF_TaskRelation.F_UserId = taskUser.Id;
-                        _WF_TaskRelation.F_Mark = taskUser.Mark;
-                        _WF_TaskRelation.F_Result = 0;
-                        _WF_TaskRelation.F_Sort = num;
-                        wFTaskTaskRelationBusiness.InsertExe(_WF_TaskRelation);
-                        num++;
+                        foreach (var taskUser in task.nWFUserInfoList)
+                        {
+                            T_WF_TaskRelation _WF_TaskRelation = new T_WF_TaskRelation();
+                            _WF_TaskRelation.Create();
+                            _WF_TaskRelation.F_TaskId = task.F_Id;
+                            _WF_TaskRelation.F_UserId = taskUser.Id;
+                            _WF_TaskRelation.F_Mark = taskUser.Mark;
+                            _WF_TaskRelation.F_Result = 0;
+                            _WF_TaskRelation.F_Sort = num;
+                            wFTaskTaskRelationBusiness.InsertExe(_WF_TaskRelation);
+                            num++;
+                        }
                     }
                 }
+               
             }
          
 
@@ -590,7 +612,7 @@ namespace WorkFlowApi.Business.Scheme
         /// <param name="nodeList">节点信息</param>
         /// <param name="paramConfig">流程配置信息</param>
         /// <returns></returns>
-        private List<T_WF_TaskView> _CreateTask(List<WFNodeInfo> nodeList, WFNodeInfo currentNodeInfo, WFEngineParamConfig paramConfig)
+        private List<T_WF_TaskView> _CreateTask(List<WFNodeInfo> nodeList, WFNodeInfo currentNodeInfo, WFEngineParamConfig paramConfig,string codelist)
         {
             List<T_WF_TaskView> list = new List<T_WF_TaskView>();
             foreach (var node in nodeList)
@@ -623,7 +645,13 @@ namespace WorkFlowApi.Business.Scheme
                     nWFTaskEntity.F_TimeoutStrategy = node.timeoutStrategy;
                 }
                 nWFTaskEntity.nWFUserInfoList = _GetNodeAuditors(node.auditors, node, paramConfig);
-                nWFTaskEntity.auditors = node.auditors;
+                nWFTaskEntity.auditors = _GetNodeAuditors3(node.auditors, node, paramConfig);
+                nWFTaskEntity.btnList = codelist;
+
+
+
+
+                nWFTaskEntity.nodeType = node.type;
 
                 switch (node.type)
                 {
@@ -645,10 +673,11 @@ namespace WorkFlowApi.Business.Scheme
                      
                         break;
                 }
-                if (nWFTaskEntity.nWFUserInfoList.Count > 0 && nWFTaskEntity.F_Type != null)
-                {
-                    list.Add(nWFTaskEntity);
-                }
+                list.Add(nWFTaskEntity);
+                //if (nWFTaskEntity.nWFUserInfoList.Count > 0 && nWFTaskEntity.F_Type != null)
+                //{
+                //    list.Add(nWFTaskEntity);
+                //}
             }
             return list;
         }
@@ -681,44 +710,7 @@ namespace WorkFlowApi.Business.Scheme
                     }
 
                     List<T_WF_TaskRelation> taskUserList = wFTaskTaskRelationBusiness.GetList($"F_TaskId='{taskEntiy.F_Id}'", "");
-
-                    if (nodeInfo.type == "stepnode" && nodeInfo.isAllAuditor == "2")
-                    {
-                        List<T_WF_TaskRelation> taskUserList2;
-                        // 如果普通节点设置了所有人都需要审核的情况
-                        if (nodeInfo.auditorAgainType == "1")
-                        {
-                            //审核通过的人不需要再审核:获取未审核通过的人。但是在大家都通过的情况下就获取所有人
-                            taskUserList2 = taskUserList.FindAll(t => t.F_Result != 1);
-                            if (taskUserList2.Count == 0)
-                            {
-                                taskUserList2 = taskUserList;
-                            }
-                        }
-                        else
-                        {
-                            taskUserList2 = taskUserList;
-                        }
-                        if (taskUserList2.Count > 0)
-                        {
-                            foreach (var item in taskUserList2)
-                            {
-                                var taskUserEntity = user.GetEntity(item.F_UserId);
-                                if (taskUserEntity != null)
-                                {
-                                    list.Add(new WFUserInfo()
-                                    {
-                                        Id = taskUserEntity.F_UserId.ToString(),
-                                        Account = taskUserEntity.F_UserCode,
-                                        Name = taskUserEntity.F_UserName
-                                    });
-                                }
-                            }
-                            return list;
-                        }
-                    }
-                    else
-                    {
+     
                         T_WF_TaskRelation taskUser = taskUserList.Find(t => t.F_Result != 0 && t.F_Result != 3);
                         if (taskUser != null)
                         {
@@ -737,54 +729,55 @@ namespace WorkFlowApi.Business.Scheme
                                 if (list2.Find(t => t.Id == _userId) == null)
                                 {
                                     if (list2.Count == 0)
-                                    {// 未找到审核人，默认成系统管理员
-                                        if (nodeInfo.noPeopleGz == 3)
-                                        {
+                                    {
+                                    // 找不到审核人无法提交
+                                       // if (nodeInfo.noPeopleGz == 3)
+                                       // {
                                             throw (new Exception("下一节点没有审核人,无法提交！"));
-                                        }
+                                       // }
                                         // 如果找不到审核人就默认超级管理员才能审核
-                                        var adminEntityList = user.GetList("F_RoleId=4", "");
-                                        foreach (var item in adminEntityList)
-                                        {
-                                            list2.Add(new WFUserInfo()
-                                            {
-                                                Id = item.F_UserId.ToString(),
-                                                Account = item.F_UserCode,
-                                                Name = item.F_UserName,
-                                                noPeople = true
-                                            });
-                                        }
+                                        //var adminEntityList = user.GetList("F_RoleId=4", "");
+                                        //foreach (var item in adminEntityList)
+                                        //{
+                                        //    list2.Add(new WFUserInfo()
+                                        //    {
+                                        //        Id = item.F_UserId.ToString(),
+                                        //        Account = item.F_UserCode,
+                                        //        Name = item.F_UserName,
+                                        //        noPeople = true
+                                        //    });
+                                        //}
                                     }
                                     return list2;
                                 }
                                 return list;
                             }
                         }
-                    }
+                    
                 }
             }
 
             list.AddRange(list2);
 
-            if (list.Count == 0)
-            {// 未找到审核人，默认成系统管理员
-                if (nodeInfo.noPeopleGz == 3)
-                {
-                    throw (new Exception("下一节点没有审核人,无法提交！"));
-                }
-                // 如果找不到审核人就默认超级管理员才能审核
-                var adminEntityList = user.GetList("F_RoleId=4", "");
-                foreach (var item in adminEntityList)
-                {
-                    list.Add(new WFUserInfo()
-                    {
-                        Id = item.F_UserId.ToString(),
-                        Account = item.F_UserCode,
-                        Name = item.F_UserName,
-                        noPeople = true
-                    });
-                }
-            }
+            //if (list.Count == 0)
+            //{// 未找到审核人，默认成系统管理员
+            //    if (nodeInfo.noPeopleGz == 3)
+            //    {
+            //        throw (new Exception("下一节点没有审核人,无法提交！"));
+            //    }
+            //    // 如果找不到审核人就默认超级管理员才能审核
+            //    var adminEntityList = user.GetList("F_RoleId=4", "");
+            //    foreach (var item in adminEntityList)
+            //    {
+            //        list.Add(new WFUserInfo()
+            //        {
+            //            Id = item.F_UserId.ToString(),
+            //            Account = item.F_UserCode,
+            //            Name = item.F_UserName,
+            //            noPeople = true
+            //        });
+            //    }
+            //}
 
             return list;
         }
@@ -806,22 +799,22 @@ namespace WorkFlowApi.Business.Scheme
                 return list;
             }
 
-            if (nodeAuditorList.Count == 0)
-            {
-                // 如果找不到审核人就默认超级管理员才能审核           
-                var adminEntityList = user.GetList("F_RoleId=4", "");
-                foreach (var item in adminEntityList)
-                {
-                    list.Add(new WFUserInfo()
-                    {
-                        Id = item.F_UserId.ToString(),
-                        Account = item.F_UserCode,
-                        Name = item.F_UserName
-                    });
-                }
-            }
-            else
-            {
+            //if (nodeAuditorList.Count == 0)
+            //{
+            //    // 如果找不到审核人就默认超级管理员才能审核           
+            //    var adminEntityList = user.GetList("F_RoleId=4", "");
+            //    foreach (var item in adminEntityList)
+            //    {
+            //        list.Add(new WFUserInfo()
+            //        {
+            //            Id = item.F_UserId.ToString(),
+            //            Account = item.F_UserCode,
+            //            Name = item.F_UserName
+            //        });
+            //    }
+            //}
+           // else
+            //{
                 foreach (var item in nodeAuditorList)
                 {
                     switch (item.type)//1.部门2.角色3.用户
@@ -890,11 +883,61 @@ namespace WorkFlowApi.Business.Scheme
                                         Name = userEntity6.F_UserName
                                     });
                                 }
+                               
+                            }
+                            break;
+                    }
+                }
+           // }
+            return list;
+        }
+
+        private List<WFAuditor> _GetNodeAuditors3(List<WFAuditor> nodeAuditorList, WFNodeInfo nodeInfo, WFEngineParamConfig paramConfig)
+        {
+            List<WFAuditor> list = new List<WFAuditor>();
+            if (nodeAuditorList != null)
+            {
+                foreach (var item in nodeAuditorList)
+                {
+                    switch (item.type)//1.部门2.角色3.用户
+                    {
+                        case 1:// 部门
+
+                            list.Add(item);
+                            break;
+                        case 2:// 角色
+                               //var userRelationList2 = userRelation.GetList($"where F_ObjectId='{item.auditorId}'", "");
+                            list.Add(item);
+                            break;
+                        case 3:// 用户
+                            list.Add(item);
+
+                            break;
+                        case 4:// 某一个节点执行人
+                            var task = logBusiness.GetList($"F_NodeId='{item.auditorId}' and F_ProcessId='{paramConfig.ProcessId}' and F_TaskType<>3 and F_TaskType<>6", "").FirstOrDefault();
+                            if (task != null && !string.IsNullOrEmpty(task.F_CreateUserId))
+                            {
+                                var userEntity6 = user.GetEntity(task.F_CreateUserId);
+                                if (userEntity6 != null)
+                                {
+                                    list.Add(new WFAuditor()
+                                    {
+                                        id = userEntity6.F_UserId.ToString(),
+                                        auditorId = userEntity6.F_UserId.ToString(),
+                                        auditorAccount = userEntity6.F_UserCode,
+                                        auditorName = userEntity6.F_UserName,
+                                        type = 2
+
+                                    });
+                                }
+
                             }
                             break;
                     }
                 }
             }
+               
+            
             return list;
         }
 

WorkFlowApi/WorkFlowApi.Entity/SchemeView/T_WF_TaskView.cs

@@ -14,6 +14,9 @@ namespace WorkFlowApi.Entity.SchemeView
 
         public List<WFUserInfo> nWFUserInfoList { get; set; }
         public List<WFAuditor> auditors { get; set; }
+        public string nodeType { get; set; }
+
+        public string btnList { get; set; }
 
     }
 }

WorkFlowApi/WorkFlowApi.IBusiness/Scheme/IWFProcessBusiness.cs

@@ -6,14 +6,15 @@ using System.Threading.Tasks;
 using WorkFlowApi.Entity;
 using WorkFlowApi.Entity.SchemeEntity;
 using WorkFlowApi.Entity.SchemeView;
+using WorkFlowApi.Utility.WorkFlowEngine.Scheme.Node;
 using WorkFlowApi.ViewModels.View;
 
 namespace WorkFlowApi.IBusiness.Scheme
 {
     public interface IWFProcessBusiness : IBaseBusiness<T_WF_Process>
     {
-        void CreateFlow(string schemeCode, string processId, string title, int level, string auditors, T_Sys_UserAccount userInfo, out List<T_WF_TaskView>  t_WF_TaskViews);
-        void AgainCreateFlow(string processId, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews);
-        void AuditFlow(string operationCode, string operationName, string processId, string taskId, string des, string auditors, string stamp, string signUrl, T_Sys_UserAccount userInfo, out List<T_WF_TaskView>  t_WF_TaskViews);
+       void CreateFlow(string schemeCode, string processId, string title, int level,string branchnodeCode, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews, List<WFAuditor> auditors = null);
+        void AgainCreateFlow(string processId, string branchnodeCode, T_Sys_UserAccount userInfo, out List<T_WF_TaskView> t_WF_TaskViews);
+        void AuditFlow(string operationCode, string operationName, string processId, string taskId, string des, string stamp, string signUrl, string branchnodeCode, T_Sys_UserAccount userInfo, out List<T_WF_TaskView>  t_WF_TaskViews, List<WFAuditor> auditors=null);
     }
 }

WorkFlowApi/WorkFlowApi.Models/Input/AuditFlowReq.cs

@@ -13,6 +13,8 @@ namespace WorkFlowApi.ViewModels.Input
         public string OperationName { get; set; }
         public string ProcessId { get; set; }
         public string TaskId { get; set; }
+
+        public string BranchnodeCode { get; set; }
         public string Des { get; set; }
         public List<WFAuditor> auditors { get; set; }
 

WorkFlowApi/WorkFlowApi.Models/Input/CreateFlowReq.cs

@@ -17,6 +17,8 @@ namespace WorkFlowApi.ViewModels.Input
         /// </summary>
         public string ProcessId { get; set; }
 
+        public string BranchnodeCode { get; set; }
+
         public bool IsNew { get; set; }
 
 

WorkFlowApi/WorkFlowApi.Models/View/NextTaskinfo.cs

@@ -41,7 +41,9 @@ namespace WorkFlowApi.ViewModels.View
         /// </summary> 
         /// <returns></returns> 
         public int? IsFinished { get; set; }
-        public List<WFUserInfo> nWFUserInfoList { get; set; }
         public List<WFAuditor> auditors { get; set; }
+
+        public string nodeType { get; set; }
+        public string btnList { get; set; }
     }
 }

WorkFlowApi/WorkFlowApi.Utility/WorkFlowEngine/Scheme/Config/WFEngineConfig.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WorkFlowApi.Utility.WorkFlowEngine.Scheme.Node;
 
 namespace WorkFlowApi.Utility.WorkFlowEngine.Scheme.Config
 {
@@ -72,7 +73,7 @@ namespace WorkFlowApi.Utility.WorkFlowEngine.Scheme.Config
         /// <summary>
         /// 审核人信息
         /// </summary>
-        public string Auditers { get; set; }
+        public List<WFAuditor> Auditers { get; set; }
         /// <summary>
         /// 创建用户
         /// </summary>

WorkFlowApi/WorkFlowApi.Utility/WorkFlowEngine/WFEngine.cs

@@ -204,6 +204,26 @@ namespace WorkFlowApi.Utility.WorkFlowEngine
             }
             return nextNodes;
         }
+
+        public string GetButonList(string nodeId, List<WFLineInfo> lineList)
+        {
+            string codelist = string.Empty;
+            // 找到与当前节点相连的线条
+            foreach (var line in wfScheme.lines)
+            {
+                if (line.from == nodeId)
+                {
+                    if (!line.agreeList.IsNullOrEmpty())
+                    {
+                        codelist = codelist + ',' + line.agreeList;
+                    }
+                   
+                                     
+                }
+            }
+
+            return codelist.TrimStart(',');
+        }
         /// <summary>
         /// 获取上一节点列表
         /// </summary>
@@ -278,41 +298,38 @@ namespace WorkFlowApi.Utility.WorkFlowEngine
         /// <param name="isGetAuditors">是否获取下一节点审核人</param>
         /// <param name="lineList">经过的线段需要执行操作的</param>
         /// <returns></returns>
-        public List<WFNodeInfo> GetNextTaskNode(WFNodeInfo beginNode, string code, bool isGetAuditors, List<WFLineInfo> lineList)
+        public List<WFNodeInfo> GetNextTaskNode(WFNodeInfo beginNode, string code, bool isGetAuditors, List<WFLineInfo> lineList,string branchnodeCode="")
         {
             List<WFNodeInfo> list = new List<WFNodeInfo>();
             List<WFNodeInfo> nextNodeList = GetNextNodes(beginNode.id, code, lineList);
 
-            Dictionary<string, string> auditers = null;
-            if (!string.IsNullOrEmpty(config.ParamConfig.Auditers))
-            {
-                auditers = config.ParamConfig.Auditers.ToObject<Dictionary<string, string>>();
-            }
-
+            //Dictionary<string, string> auditers = null;
+            //if (!string.IsNullOrEmpty(config.ParamConfig.Auditers))
+            //{
+            //    auditers = config.ParamConfig.Auditers.ToObject<Dictionary<string, string>>();
+            //}
+            var auditers = config.ParamConfig.Auditers;
 
             foreach (var node in nextNodeList)
             {
-                if (auditers != null && auditers.ContainsKey(node.id))
+                if (auditers != null && auditers.Count>0)
                 {
-                    node.auditors = new List<WFAuditor>();
-                    node.auditors.Add(new WFAuditor()
-                    {
-                        type = 3,
-                        auditorId = auditers[node.id]
-                    });
+
+                    node.auditors = auditers;
                 }
 
                 switch (node.type)
                 {
                    
-                    case "auditornode":// 传阅节点
-                        list.Add(node);
+                    case "branchnode":// 分支节点
+                        list.AddRange(GetNextTaskNode(node, branchnodeCode, isGetAuditors, lineList));
                         break;                  
                     case "startround":// 开始节点 需要重新审核
                         list.Add(node);
                         config.ParamConfig.State = 1;
                         break;
                     case "endround":// 结束节点
+                        list.Add(node);
                         config.ParamConfig.State = 2;
                         break;
                     default:         // 默认普通节点

WorkFlowApi/WorkFlowApi.Utility/WorkFlowEngine/WFIEngine.cs

@@ -54,6 +54,7 @@ namespace WorkFlowApi.Utility.WorkFlowEngine
         /// <param name="lineList"></param>
         /// <returns>节点信息列表</returns>
         List<WFNodeInfo> GetNextNodes(string nodeId, string code, List<WFLineInfo> lineList);
+        string GetButonList(string nodeId, List<WFLineInfo> lineList);
         /// <summary>
         /// 获取上一节点列表
         /// </summary>
@@ -83,7 +84,7 @@ namespace WorkFlowApi.Utility.WorkFlowEngine
         /// <param name="isGetAuditors">是否获取下一节点审核人</param>
         /// <param name="lineList">经过的线段需要执行操作的</param>
         /// <returns></returns>
-        List<WFNodeInfo> GetNextTaskNode(WFNodeInfo beginNode, string code, bool isGetAuditors, List<WFLineInfo> lineList);
+        List<WFNodeInfo> GetNextTaskNode(WFNodeInfo beginNode, string code, bool isGetAuditors, List<WFLineInfo> lineList,string branchnodeCode = "");
         #endregion
     }
 }

WorkFlowApi/WorkFlowApi/Controllers/UserAccountController.cs

@@ -29,6 +29,30 @@ namespace WorkFlowApi.Controllers
         }
 
         /// <summary>
+        /// 获取所有用户
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IHttpActionResult GetList(string deptid)
+        {
+            
+            if (!string.IsNullOrEmpty(deptid))
+            {
+                var _dt = _userBus.GetList($"F_DeptId='{deptid}'", "");
+                return Success("成功", _dt.MapToList<UserAccountListView>());
+            }
+            else
+            {
+                var _dt = _userBus.GetAllList();
+                return Success("成功", _dt.MapToList<UserAccountListView>());
+            }
+
+           
+
+           
+        }
+
+        /// <summary>
         /// 分页获取列表
         /// </summary>
         /// <param name="input"></param>

WorkFlowApi/WorkFlowApi/Controllers/WorkFlow/WFProcessController.cs

@@ -14,7 +14,6 @@ namespace WorkFlowApi.Controllers.WorkFlow
 {
     /// <summary>
     /// 工作流
-    /// </summary>
     public class WFProcessController : BaseController
     {
         private readonly IWFProcessBusiness _wFProcess;
@@ -40,11 +39,11 @@ namespace WorkFlowApi.Controllers.WorkFlow
                 List<T_WF_TaskView>   t_WF_TaskViews = new List<T_WF_TaskView>();
                 if (createFlowReq.IsNew)
                 {
-                    _wFProcess.CreateFlow(createFlowReq.Code, createFlowReq.ProcessId, "", 0, "", CurrentUser, out t_WF_TaskViews);
+                    _wFProcess.CreateFlow(createFlowReq.Code, createFlowReq.ProcessId, "", 0,createFlowReq.BranchnodeCode, CurrentUser, out t_WF_TaskViews);
                 }
                 else
                 {
-                    _wFProcess.AgainCreateFlow(createFlowReq.ProcessId, CurrentUser, out t_WF_TaskViews);
+                    _wFProcess.AgainCreateFlow(createFlowReq.ProcessId, createFlowReq.BranchnodeCode,CurrentUser, out t_WF_TaskViews);
                 }
                 
                 return Success("创建成功", t_WF_TaskViews.MapToList<NextTaskinfo>());
@@ -69,7 +68,14 @@ namespace WorkFlowApi.Controllers.WorkFlow
             {
                 LogHelper.Info("AuditFlow-请求开始:" + auditFlowReq.ToJson() + "\n");
                 List<T_WF_TaskView> t_WF_TaskViews = new List<T_WF_TaskView>();
-                _wFProcess.AuditFlow(auditFlowReq.OperationCode, auditFlowReq.OperationName, auditFlowReq.ProcessId, auditFlowReq.TaskId, auditFlowReq.Des, "","","", CurrentUser,out t_WF_TaskViews);
+                if (auditFlowReq.OperationCode == "send"  )
+                {
+                    if (auditFlowReq.auditors == null || auditFlowReq.auditors.Count==0)
+                    {
+                        return Error("派单未指定审核人");
+                    }
+                }
+                _wFProcess.AuditFlow(auditFlowReq.OperationCode, auditFlowReq.OperationName, auditFlowReq.ProcessId, auditFlowReq.TaskId, auditFlowReq.Des, "","", auditFlowReq.BranchnodeCode, CurrentUser,out t_WF_TaskViews, auditFlowReq.auditors);
                 return Success("流程审批成功", t_WF_TaskViews.MapToList<NextTaskinfo>());
             }
             catch (Exception ex)