页面修改

Edu.Model/ViewModel/EduTask/EducationReceiptQuery.cs

@@ -67,8 +67,14 @@ namespace Edu.Model.ViewModel.EduTask
 		public string QEffectiveDate { get; set; }
 
 		/// <summary>
-		/// 关联单号
+		/// 关联表编号
 		/// </summary>
 		public int RelationId { get; set; }
+
+		/// <summary>
+		/// 关联表编号【逗号分割】
+		/// </summary>
+		public string QRelationIds { get; set; }
+ 
 	}
 }

Edu.Module.Exam/PaperModule.cs

@@ -14,6 +14,8 @@ using System.Text.RegularExpressions;
 using Edu.Model.CacheModel;
 using Edu.Common.Enum;
 using Edu.Common.Enum.EduTask;
+using Edu.Model.ViewModel.EduTask;
+using Edu.Common.Enum.Finance;
 
 namespace Edu.Module.Exam
 {
@@ -1088,15 +1090,21 @@ namespace Edu.Module.Exam
         {
             bool flag = false;
             var model = GetExaminationPublishModule(Id);
+            Dictionary<string, object> fileds = new Dictionary<string, object>();
+            //当前试卷考试试卷已超过当前试卷更新为作废状态
+            if (model.ExamEndTime < DateTime.Now)
+            {
+                fileds.Add(nameof(RB_Examination_Publish_ViewModel.ExamineStatus), (int)EduTaskRrocessStatus.Invalid);
+                fileds.Add(nameof(RB_Examination_Publish_ViewModel.PublishRemark), "考试时间一超过当前时间，更新为作废");
+                flag = examination_PublishRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Publish_ViewModel.Id), model.Id));
+                return flag;
+            }
             var obj = GetExaminationConfigureModel(new RB_Examination_Configure_ViewModel()
             {
                 Group_Id = model.Group_Id,
             });
-            Dictionary<string, object> fileds = new Dictionary<string, object>()
-            {
-                {nameof(RB_Examination_Publish_ViewModel.PublishRemark),"" }
-            };
 
+            fileds.Add(nameof(RB_Examination_Publish_ViewModel.PublishRemark), "");
             if (obj.IsOpenExamApply == 0)
             {
                 fileds.Add(nameof(RB_Examination_Publish_ViewModel.Reviewer), 0);
@@ -1311,6 +1319,31 @@ namespace Edu.Module.Exam
             });
             if (list != null && list.Count > 0)
             {
+                string ids = string.Join(",", list.Select(qitem => qitem.Id));
+                List<RB_Education_Receipt_ViewModel> receiptList = new List<RB_Education_Receipt_ViewModel>();
+                if (!string.IsNullOrEmpty(ids))
+                {
+                    //查询待审核的考试审批信息
+                    receiptList= education_ReceiptRepository.GetEducationReceiptListRepository(new EducationReceiptQuery()
+                    {
+                        ReceiptType=(int) ReceiptTypeEnum.ExamApply,
+                        QRelationIds=ids,
+                        VerifyStatus=1
+                    });
+                }
+                if (receiptList != null && receiptList.Count > 0)
+                {
+                    //修改过期的考试申请单据为作废
+                    foreach (var item in receiptList)
+                    {
+                        Dictionary<string, object> fileds = new Dictionary<string, object>()
+                        {
+                            {nameof(RB_Education_Receipt_ViewModel.VerifyStatus), (int) EduTaskRrocessStatus.Invalid }
+                        };
+                        education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), item.Id));
+                    }
+                }
+                //修改过期的考试申请未作废
                 foreach (var item in list)
                 {
                     Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -1322,4 +1355,4 @@ namespace Edu.Module.Exam
             }
         }
     }
-}
+}
\ No newline at end of file

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -178,6 +178,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Education_Receipt_ViewModel.RelationId), query.RelationId);
                 }
+                if (!string.IsNullOrEmpty(query.QRelationIds))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Education_Receipt_ViewModel.RelationId), query.QRelationIds);
+                }
                 if (!string.IsNullOrEmpty(query.Title))
                 {
                     builder.AppendFormat(@" AND A.{0} LIKE @Title ", nameof(RB_Education_Receipt_ViewModel.Title));