From 5231272ce9793f1aa5b20d82466ccf9bf4c7c1ff Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Thu, 15 May 2025 17:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=8F=8D=E9=A6=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_OpenClassFeedback.Dto.View.cs   |  4 ++
 .../Ghre/Ghre_OpenClassFeedbackServices.cs    | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs
index d2ed41df..50e591a9 100644
--- a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs
@@ -31,4 +31,8 @@ public class Ghre_OpenClassFeedbackDto : Ghre_OpenClassFeedback
     /// 修改信息
     /// </summary>
     public string UpdateDataInfo { get; set; }
+    public string StaffName { get; set; }
+    public string OpenClassName { get; set; }
+    public string CourseName { get; set; }
+    public string ExpiryTime1 { get; set; }
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs
index a7ac0d8e..196d6678 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs
@@ -12,4 +12,49 @@ public class Ghre_OpenClassFeedbackServices : BaseServices<Ghre_OpenClassFeedbac
         base.BaseDal = dal;
         base._caching = caching;
     }
+
+    public override async Task<ServicePageResult<Ghre_OpenClassFeedbackDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
+    {
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
+
+        var staffIds = result.result.DT_TableDataT1.Where(x => x.StaffId != null).Select(x => x.StaffId.Value).Distinct().ToList();
+        var openClassIds = result.result.DT_TableDataT1.Where(x => x.OpenClassId != null).Select(x => x.OpenClassId.Value).Distinct().ToList();
+        //var surveyIds = result.result.DT_TableDataT1.Where(x => x.SurveyId != null).Select(x => x.SurveyId.Value).Distinct().ToList();
+        var courseIds = result.result.DT_TableDataT1.Where(x => x.CourseId != null).Select(x => x.CourseId.Value).Distinct().ToList();
+
+
+        var staffs = await Db.Queryable<Ghra_Staff>()
+            .Where(x => staffIds.Contains(x.StaffID)).Select(x => new { x.StaffID, x.StaffNo, x.StaffName }).ToListAsync();
+
+        var openClasss = await Db.Queryable<Ghre_OpenClass>()
+            .Where(x => openClassIds.Contains(x.Id)).Select(x => new { x.Id, x.OpenClassName }).ToListAsync();
+
+        var courses = await Db.Queryable<Ghre_Course>()
+            .Where(x => courseIds.Contains(x.Id)).Select(x => new { x.Id, x.CourseName }).ToListAsync();
+
+
+        for (int i = 0; i < result.result.DT_TableDataT1.Count; i++)
+        {
+            var DT_TableDataT1 = result.result.DT_TableDataT1[i];
+            if (DT_TableDataT1.StaffId != null)
+                DT_TableDataT1.StaffName = staffs.Where(x => x.StaffID == DT_TableDataT1.StaffId).FirstOrDefault()?.StaffName;
+
+            if (DT_TableDataT1.OpenClassId != null)
+                DT_TableDataT1.OpenClassName = openClasss.Where(x => x.Id == DT_TableDataT1.OpenClassId).FirstOrDefault()?.OpenClassName;
+
+            if (DT_TableDataT1.CourseId != null)
+                DT_TableDataT1.CourseName = courses.Where(x => x.Id == DT_TableDataT1.CourseId).FirstOrDefault()?.CourseName;
+            if (DT_TableDataT1.ExpiryTime != null)
+            {
+                if (DateTimeHelper.ConvertToSecondString(DT_TableDataT1.ExpiryTime) == DateTimeHelper.ConvertToSecondString(DateTime.MaxValue))
+                    DT_TableDataT1.ExpiryTime1 = "长期";
+                else DT_TableDataT1.ExpiryTime1 = DateTimeHelper.ConvertToSecondString(DT_TableDataT1.ExpiryTime);
+            }
+            else
+                DT_TableDataT1.ExpiryTime1 = "长期";
+            result.result.DT_TableDataT1[i] = DT_TableDataT1;
+        }
+        return result;
+    }
+
 }
\ No newline at end of file