学习记录查询 新增返回查看考试记录

必选修规则产生学习记录新增过滤集团数据归属

Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs

@@ -127,6 +127,28 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                 else entity.ResultValidPeriod = "长期";
             entity.DataBelongName = await GetDataBelongName(entity.DataBelongID);
 
+
+            if (entity.ExamRecordId != null)
+            {
+                var Groups = await Db.Queryable<Ghre_ExamRecordGroup>()
+                   .OrderByDescending(x => x.ExamTime)
+                   .Where(x => x.ExamRecordId == entity.ExamRecordId)
+                   .Select(x => new
+                   {
+                       GroupId = x.Id,
+                       x.ExamRecordId,
+                       x.ExamTime,
+                       x.Score
+                   }).ToListAsync();
+                entity.Groups = Groups
+                    .Select(x => new ExamGroup()
+                    {
+                        GroupId = x.GroupId,
+                        ExamRecordId = x.ExamRecordId,
+                        ExamTime = x.ExamTime.ObjToString() + (x.Score != null ? $"得分：{x.Score}" : ""),
+                    }).ToList();
+            }
+
             entitys[i] = entity;
         }
 
@@ -222,7 +244,6 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
 
             if (entity.ExamRecordId != null)
             { 
-
                 var Groups = await Db.Queryable<Ghre_ExamRecordGroup>()
                    .OrderByDescending(x => x.ExamTime)
                    .Where(x => x.ExamRecordId == entity.ExamRecordId)

Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs

@@ -408,6 +408,7 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
                 .WhereIF(GradeIds.Any(), x => GradeIds.Contains(x.GradeID))
                 .WhereIF(JobIds.Any(), x => JobIds.Contains(x.JobID))
                 .WhereIF(!ruleStaffIds.IsNull() && ruleStaffIds.Any(), x => ruleStaffIds.Contains(x.StaffID))
+                .WhereIF(rule.DataBelongID.IsNotEmptyOrNull(), x => x.DataBelongID == rule.DataBelongID)
                 .ToListAsync();
 
             if (staffs.Any())

Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs

@@ -869,6 +869,8 @@ WHERE A.IsEnable = 1 AND A.Status ! = 'Temporary'
                 x.BeginEndTime = $"{DateTimeHelper.ConvertToMiniuteString(x.BeginTime)}~{DateTimeHelper.ConvertToMiniuteString(x.EndTime)}";
             else
                 x.BeginEndTime = "长期";
+
+            x.SurveyStatus = x.SurveyStatus == "Publish" ? "进行中" : "已结束";
         });
 
         return new ServicePageResult<Ghre_ESSSurvey>(filter.pageNum, total, filter.pageSize, entitys);