From 9d1b93a60bfd9c078dc49d91ee83dd5f93cf3f4c Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 4 Mar 2025 15:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=20=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C=E5=85=B3=E8=81=94=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E8=AF=BE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_ExamServices.cs                 | 31 +++++++++++++++++++
 .../Ghre/Ghre_StudyRecordServices.cs          |  5 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index 6131ba22..315212f1 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -1225,6 +1225,22 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
 
             if (entity.Status == DIC_EXAM_STATUS.DISABLED && status == DIC_EXAM_STATUS.RELEASED)
             {
+
+                #region 判断相关联课件是否存在
+                var sql = $@"SELECT count(0)
+                            FROM Ghre_CourseWare A
+                            WHERE A.Id IN
+                                     (SELECT CourseWareId
+                                      FROM Ghre_Course
+                                      WHERE    (Id = '{entity.CourseId}'  OR CourseSceneId = '{entity.CourseSceneId}' OR CourseSceneIds like '%{entity.CourseSceneId}%') AND IsEnable = 1)";
+                var count = await Db.Ado.GetIntAsync(sql);
+                if (count == 0)
+                {
+                    if (entity.LinkType == "CourseId")
+                        return ServiceResult.OprateFailed("该考试关联的课程未维护课件，暂不可取消归档！");
+                }
+                #endregion
+
                 if (entity.LinkType == "CourseId")
                 {
                     var course = await _ghre_CourseServices.QueryById(entity.CourseId);
@@ -1244,6 +1260,21 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
 
             if (status == DIC_EXAM_STATUS.RELEASED && entity.Status == DIC_EXAM_STATUS.DRAFT)
             {
+
+                #region 判断相关联课件是否存在
+                var sql = $@"SELECT count(0)
+                            FROM Ghre_CourseWare A
+                            WHERE A.Id IN
+                                     (SELECT CourseWareId
+                                      FROM Ghre_Course
+                                      WHERE    (Id = '{entity.CourseId}'  OR CourseSceneId = '{entity.CourseSceneId}' OR CourseSceneIds like '%{entity.CourseSceneId}%') AND IsEnable = 1)";
+                var count = await Db.Ado.GetIntAsync(sql);
+                if (count == 0)
+                {
+                    if (entity.LinkType == "CourseId")
+                        return ServiceResult.OprateFailed("该考试关联的课程未维护课件，暂不可发布！");
+                }
+                #endregion
                 var ids1 = ids.Where(x => id != x).ToList();
                 if (entity.LinkType == DIC_EXAM_LINK_TYPE_COURSE)
                 {
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 023e63b9..2af5c6b7 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -911,7 +911,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                                A.ExamDateType,
                                A.AfterHowLong,
                                A.StudyProgress,
-                               A.ExamId,A.ExamStatus,A.CoursePublishTime
+                               A.ExamId,A.ExamStatus,A.CoursePublishTime,A.IsRequireStudy
                         FROM Ghre_StudyRecord_V A";
 
             string conditions = $" WHERE UserId={App.User.ID} ";
@@ -1077,6 +1077,9 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                         x.StudyProgress = 60;
                 }
                 #endregion
+
+                if (x.IsRequireStudy == false)
+                    x.ShowStudyBtn = false;
             });
 
             return new ServicePageResult<Ghre_StudyRecordESS>(filter.pageNum, total, filter.pageSize, entitys);