From be31757973ce82a01bc626b70f4473a62e08ff51 Mon Sep 17 00:00:00 2001
From: tanglong <842690096@qq.com>
Date: Mon, 26 Jan 2026 16:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/HomeWork/S_HomeWorkService.cs    | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
index 75e3773..83b87ee 100644
--- a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
+++ b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
@@ -66,32 +66,35 @@ namespace VOL.Business.Services.Norm
                 schoolCode = UserContext.Current.TenantId;
             }
 
-            var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode.Contains(schoolCode))
-                        select new HomeWorkListModel()
-                        {
-                            WorkId = s.Id,
-                            TeacherId = s.TeacherId,
-                            StudentScope = s.StudentScope,
-                            WorkStatus =
-                                currentTime < s.StartTime
-                                    ? HomeWorkStatus.NotStarted
-                                    : currentTime > s.EndTime
-                                        ? HomeWorkStatus.Ended
-                                        : HomeWorkStatus.Afoot,
+            var query =
+                from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode.Contains(schoolCode))
+                    let workStatus =
+                        currentTime < s.StartTime
+                            ? HomeWorkStatus.NotStarted
+                            : currentTime > s.EndTime
+                                ? HomeWorkStatus.Ended
+                                : HomeWorkStatus.Afoot
+                    select new HomeWorkListModel
+                    {
+                        WorkId = s.Id,
+                        TeacherId = s.TeacherId,
+                        StudentScope = s.StudentScope,
 
-                            TeacherName = s.TeacherName,
-                            WorkName = s.WorkName,
-                            WorkText = s.WorkText,
-                            WorkType = s.WorkType,
-                            WorkModeType = s.WorkModeType,
-                            WorkModeTypeName = s.WorkModeType.GetDescription(),
-                            StartTime = s.StartTime,
-                            EndTime = s.EndTime,
-                            StudentScopeStr = s.StudentScope.GetDescription(),
-                            WorkStatusStr = s.WorkStatus.GetDescription(),
-                            WorkTypeName = s.WorkTypeName,
-                            GradeAndClassName = $"{s.GradeName}-{s.ClassName}"
-                        };
+                        WorkStatus = workStatus,
+                        WorkStatusStr = workStatus.GetDescription(),
+
+                        TeacherName = s.TeacherName,
+                        WorkName = s.WorkName,
+                        WorkText = s.WorkText,
+                        WorkType = s.WorkType,
+                        WorkModeType = s.WorkModeType,
+                        WorkModeTypeName = s.WorkModeType.GetDescription(),
+                        StartTime = s.StartTime,
+                        EndTime = s.EndTime,
+                        StudentScopeStr = s.StudentScope.GetDescription(),
+                        WorkTypeName = s.WorkTypeName,
+                        GradeAndClassName = $"{s.GradeName}-{s.ClassName}"
+                    };
 
             if (paramDto.WorkType > 0)
             {