Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/Course/RB_Student_BackRelevance.cs

@@ -77,5 +77,15 @@ namespace Edu.Model.Entity.Course
 		/// 是否是特殊节点
 		/// </summary>
 		public int SpecialNode { get; set; }
+
+		/// <summary>
+		/// 多个定角色编号
+		/// </summary>
+		public string PostIds { get; set; }
+
+		/// <summary>
+		/// 指定的人员编号
+		/// </summary>
+		public string UserIds { get; set; }
 	}
 }
\ No newline at end of file

Edu.Module.Course/OrderModule2.cs

@@ -143,7 +143,6 @@ namespace Edu.Module.Course
 
                 if (item.FlowAduitList != null && item.FlowAduitList.Count > 0)
                 {
-                    string AuditDescription = "";//审核人名称
                     string AuditedId = "";//审核人
                     foreach (var subItem in item.FlowAduitList)
                     {
@@ -194,17 +193,20 @@ namespace Edu.Module.Course
                     var backLevance = new RB_Student_BackRelevance()
                     {
                         ConditionId = backClassModel.BackId,
-                        AuditDescription = AuditDescription,
+                        AuditDescription = item.NodeName,
                         AuditedId = "",
                         AuditWay = item.FlowAduitList[0].AuditWay,
                         AuditType = item.FlowAduitList[0].AuditType,
                         OriginalAuditId = 0,
                         RoleOrInitiator = 0,
+                        PostIds=string.Join(",",item.FlowAduitList.Where(qitem=>qitem.AuditType==Common.Enum.User.WFTAuditTypeEnum.Role).Select(qitem=>qitem.PostType)),
+                        UserIds = string.Join(",", item.FlowAduitList.Where(qitem => qitem.AuditType == Common.Enum.User.WFTAuditTypeEnum.SpecifiedMember).Select(qitem => qitem.PostType)),
                         ToAuditId = AuditedId.TrimEnd(','),
                         Sort = item.SortNum,
                         SpecialNode = item.FlowAduitList[0].IsSpecNode,
                         Stauts =  Common.Enum.User.WFRrocessStatus.NotAudit,
                         WorkFlowId = Common.Config.BackClassFlowId,
+                         
                     };
                     var backLevanceId = student_BackRelevanceRepository.Insert(backLevance);
                     backLevance.Id = backLevanceId;
@@ -217,7 +219,7 @@ namespace Edu.Module.Course
                             {
                                 ConditionId = backClassModel.BackId,
                                 AuditStatus =  Common.Enum.User.WFRrocessStatus.NotAudit,
-                                AuditId = subItem.UserId,
+                                AuditId = backLevance.Id,
                                 AuditEmId = subItem.UserId,
                                 CreateBy = userinfo.Id,
                                 CreateTime = DateTime.Now,

Edu.Repository/Course/RB_Student_BackClassRepository.cs

@@ -70,7 +70,7 @@ WHERE 1=1  ");
                             break;
                         //已审批的
                         case Common.Enum.Course.BackClassConditionEnum.Agree:
-                            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_student_backrecord WHERE ConditionId=A.BackId AND AuditStatus=2 AND AuditEmId={0}) ", query.CreateBy);
+                            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_student_backrecord WHERE ConditionId=A.BackId AND AuditStatus IN(2,5) AND AuditEmId={0}) ", query.CreateBy);
                             break;
                         //我发起的
                         case Common.Enum.Course.BackClassConditionEnum.Launch: