页面修改

Edu.Common/Enum/EduTask/EduTaskRrocessStatus.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.EduTask
+{
+    /// <summary>
+    /// 教务单据审核流程
+    /// </summary>
+    public enum EduTaskRrocessStatus
+    {
+        /// <summary>
+        /// 未审核
+        /// </summary>
+        [EnumField("未审核")]
+        NotAudit = 0,
+        /// <summary>
+        /// 审核中
+        /// </summary>
+        [EnumField("审核中")]
+        AuditIng = 1,
+        /// <summary>
+        /// 通过
+        /// </summary>
+        [EnumField("审核通过")]
+        AuditThrough = 2,
+        /// <summary>
+        /// 不通过
+        /// </summary>
+        [EnumField("审核不通过")]
+        AuditNotThrough = 3,
+        /// <summary>
+        /// 驳回 
+        /// </summary>
+        [EnumField("驳回")]
+        Rejected = 4,
+        /// <summary>
+        /// 他人已审核（仅限审核记录表） 
+        /// </summary>
+        [EnumField("他人已审核")]
+        OtherHaveAudit = 5,
+
+        /// <summary>
+        /// 作废【HK2021-07-13新增】 
+        /// </summary>
+        [EnumField("作废")]
+        Invalid = 6,
+    }
+}

Edu.Model/Entity/EduTask/RB_Education_Receipt.cs

@@ -79,6 +79,6 @@ namespace Edu.Model.Entity.EduTask
 		/// <summary>
 		/// 审核状态(见枚举)
 		/// </summary>
-		public Edu.Common.Enum.User.WFRrocessStatus VerifyStatus { get; set; }	        
+		public Edu.Common.Enum.EduTask.EduTaskRrocessStatus VerifyStatus { get; set; }	        
 	}
 }

Edu.Model/Entity/EduTask/RB_Education_Record.cs

-using Edu.Common.Enum.User;
+using Edu.Common.Enum.EduTask;
+using Edu.Common.Enum.User;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -32,7 +33,7 @@ namespace Edu.Model.Entity.EduTask
 		/// <summary>
 		/// 1未审核  2审核通过  3 不通过  4 驳回 5他人已审核
 		/// </summary>
-		public WFRrocessStatus AuditStatus { get; set; }
+		public EduTaskRrocessStatus AuditStatus { get; set; }
 
 		/// <summary>
 		/// 描述

Edu.Model/Entity/EduTask/RB_Education_Relevance.cs

-using Edu.Common.Enum.User;
+using Edu.Common.Enum.EduTask;
+using Edu.Common.Enum.User;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -61,7 +62,7 @@ namespace Edu.Model.Entity.EduTask
 		/// <summary>
 		/// 1未审核  2审核通过  3 不通过  4 驳回
 		/// </summary>
-		public WFRrocessStatus Stauts { get; set; }
+		public EduTaskRrocessStatus Stauts { get; set; }
 
 		/// <summary>
 		/// 待审核人  1,2,3 以逗号分隔

Edu.Module.Course/OrderModule2.cs

@@ -145,7 +145,7 @@ namespace Edu.Module.Course
                     UpdateBy=userinfo.Id,
                     UpdateTime=DateTime.Now,
                     RecipientIds="",
-                    VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
+                    VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
                 }, out message);
                 if (flag)
                 {

Edu.Module.EduTask/ChangeClassPlanModule.cs

@@ -82,7 +82,7 @@ namespace Edu.Module.EduTask
                          CreateTime=extModel.CreateTime,
                          UpdateBy=extModel.UpdateBy,
                          UpdateTime=extModel.UpdateTime,
-                         VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
+                         VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
                     };
                     flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt,out string message);
                 }

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -245,7 +245,7 @@ WHERE 1=1
                         ToAuditId = AuditedId.TrimEnd(','),
                         Sort = item.SortNum,
                         SpecialNode = item.FlowAduitList[0].IsSpecNode,
-                        Stauts = Common.Enum.User.WFRrocessStatus.NotAudit,
+                        Stauts = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
                     };
                     //指定人员审核
                     if (levance.AuditType == Common.Enum.User.WFTAuditTypeEnum.SpecifiedMember)
@@ -282,7 +282,7 @@ WHERE 1=1
                             var recordModel = new RB_Education_Record_ViewModel()
                             {
                                 ConditionId = model.Id,
-                                AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit,
+                                AuditStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
                                 AuditId = levance.Id,
                                 CreateBy = model.CreateBy,
                                 CreateTime = DateTime.Now,

Edu.Repository/EduTask/RB_Education_RecordRepository.cs

@@ -31,6 +31,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.ConditionId), query.ConditionId);
                 }
+                if (query.AuditId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.AuditId), query.AuditId);
+                }
                 if (!string.IsNullOrEmpty(query.QConditionIds))
                 {
                     builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Education_Record_ViewModel.ConditionId), query.QConditionIds);