页面修改

Edu.Common/Enum/User/UserWFAuditStatus.cs

@@ -64,8 +64,13 @@ namespace Edu.Common.Enum.User
         /// 他人已审核（仅限审核记录表） 
         /// </summary>
         [EnumField("他人已审核")]
-        OtherHaveAudit = 5
+        OtherHaveAudit = 5,
 
+        /// <summary>
+        /// 作废【HK2021-07-13新增】 
+        /// </summary>
+        [EnumField("作废")]
+        Invalid =6,
     }
 
     /// <summary>

Edu.Model/Entity/EduTask/RB_Education_Receipt.cs

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

Edu.Module.Course/OrderModule2.cs

@@ -145,7 +145,7 @@ namespace Edu.Module.Course
                     UpdateBy=userinfo.Id,
                     UpdateTime=DateTime.Now,
                     RecipientIds="",
-                    VerifyStatus= Common.Enum.Finance.WFRrocessStatus.NotAudit
+                    VerifyStatus= Common.Enum.User.WFRrocessStatus.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.Finance.WFRrocessStatus.NotAudit
+                         VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
                     };
                     flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt,out string message);
                 }

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -139,7 +139,7 @@ namespace Edu.Module.EduTask
                         ReceiptTypeName = item.ReceiptType.ToName(),
                         CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName,
                         CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
-                        AuditStatusName = item.VerifyStatus == Common.Enum.Finance.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
+                        AuditStatusName = item.VerifyStatus == Common.Enum.User.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
                     };
                     result.Add(obj);
                 }
@@ -178,6 +178,20 @@ namespace Edu.Module.EduTask
             return list;
         }
 
+        /// <summary>
+        /// 作废教务单据
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool InvalidReceiptModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)Edu.Common.Enum.User.WFRrocessStatus.Invalid}
+            };
+            return education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), Id));
+        }
+
         /// <summary>
         /// 修改审核人员
         /// </summary>

Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs

@@ -70,6 +70,17 @@ namespace Edu.WebApi.Controllers.EduTask
             return ApiResult.Success(data: Info);
         }
 
+        /// <summary>
+        /// 教务单据作废
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult InvalidReceipt()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var flag = educationReceiptModule.InvalidReceiptModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
 
         /// <summary>
         /// 修改教务单据当前审核人
@@ -100,8 +111,6 @@ namespace Edu.WebApi.Controllers.EduTask
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
-
         /// <summary>
         /// 获取教务单据类型
         /// </summary>