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

Edu.Model/ViewModel/EduTask/RB_Education_Record_ViewModel.cs

@@ -21,6 +21,11 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public string AuditNode { get; set; }
 
+        /// <summary>
+        /// 审核人姓名
+        /// </summary>
+        public string AuditManName { get; set; }
+        
         /// <summary>
         /// 新审核人员编号
         /// </summary>

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -84,9 +84,10 @@ namespace Edu.Module.EduTask
                 List<RB_Class_Room_ViewModel> roomList = new List<RB_Class_Room_ViewModel>();
                 var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType });
                 string Ids = string.Join(",", list.Select(qitem => qitem.Id));
-                var relevanceList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
+                var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
                 {
-                    QConditionIds = Ids
+                    QConditionIds = Ids,
+                    AuditStatus = WFRrocessStatus.NotAudit
                 });
                 foreach (var subItem in groupList)
                 {
@@ -181,6 +182,7 @@ namespace Edu.Module.EduTask
                         }
                     }
                 }
+              
                 foreach (var item in list)
                 {
                     object DataObj = new object();
@@ -216,6 +218,23 @@ namespace Edu.Module.EduTask
                         }
                         DataObj = tempModel;
                     }
+                    object AuditObj =new object();
+                    if (item.VerifyStatus == WFRrocessStatus.NotAudit)
+                    {
+                        var tempRecordList = recordList?.Where(qitem => qitem.ConditionId == item.Id)?.ToList();
+                        if (tempRecordList != null && tempRecordList.Count > 0)
+                        {
+                            foreach (var rItem in tempRecordList)
+                            {
+                                rItem.AuditManName = UserReidsCache.GetUserLoginInfo(rItem.AuditEmId)?.AccountName ?? "";
+                            }
+                            AuditObj = new
+                            {
+                                tempRecordList[0].AuditNode,
+                                AuditManList = tempRecordList.Select(qitem => new { qitem.AuditEmId, qitem.AuditManName })
+                            };
+                        }
+                    }
                     var obj = new
                     {
                         item.Id,
@@ -234,6 +253,7 @@ namespace Edu.Module.EduTask
                         item.TeacherName,
                         item.SchoolName,
                         item.CourseName,
+                        AuditObj,
                         AuditStatusName = item.VerifyStatus == Common.Enum.User.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
                     };
                     result.Add(obj);

Edu.Repository/EduTask/RB_Education_RecordRepository.cs

@@ -37,7 +37,7 @@ WHERE 1=1
                 }
                 if (query.AuditStatus > 0)
                 {
-                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.AuditStatus), query.AuditStatus);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.AuditStatus), (int)query.AuditStatus);
                 }
             }
             return Get<RB_Education_Record_ViewModel>(builder.ToString()).ToList();