From 55e525c4aca0242602a5e5d91b24464a258a205c Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 19 May 2025 14:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AD=A6=E4=B9=A0=E5=BC=80?=
 =?UTF-8?q?=E7=8F=AD=E5=88=97=E8=A1=A8=20=E6=96=B0=E5=A2=9E=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E5=8D=95=E5=AD=A6=E4=B9=A0=E8=BF=9B=E5=BA=A6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Extend/Ghre_StudyRecordESS.cs  |  2 +-
 .../Ghre/Ghre_StudyRecordServices.cs          | 20 ++++++++++++++++---
 .../Ghre/Ghre_SurveyServices.cs               |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
index e8c45839..f5cd4c0f 100644
--- a/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
+++ b/Tiobon.Core.Model/ViewModels/Extend/Ghre_StudyRecordESS.cs
@@ -119,5 +119,5 @@ public class Ghre_StudyRecordESS
 
     public bool? IsRequireStudy { get; set; } = true;
     public string StudyFinishedRule { get; set; }
-
+    public string OpenClassFeedbackStatus { get; set; }
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index bf8ac7c6..8e40c7f8 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -1076,6 +1076,11 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                 if (x.FeedbackOrderId.IsNull())
                     x.ShowFeedbackBtn = false;
 
+                if (x.ShowFeedbackBtn == true && x.StudyProgress < 100)
+                {
+                    x.DisableFeedbackBtn = true;
+                }
+
                 #region 处理学习进度
 
                 if (x.ExamId.IsNull())
@@ -1158,13 +1163,14 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
        A.Status OpenClassStatus,  
        A.CreateTime PublishTime, ISNULL (F.StudyProgress, 0) StudyProgress, 
        A.IsRequireStudy, 
-       A.FeedbackId FeedbackOrderId,ISNULL( F.CompleteStatus , 'NoFinish') CompleteStatus
+       A.FeedbackId FeedbackOrderId,ISNULL( F.CompleteStatus , 'NoFinish') CompleteStatus, G.Status OpenClassFeedbackStatus
 FROM Ghre_OpenClass A
      LEFT JOIN Ghre_StaffGroup B ON A.StaffGroupId = B.Id
      LEFT JOIN Ghre_Course C ON A.LinkId = C.Id
      LEFT JOIN Ghre_CourseScene D ON A.LinkId = D.Id
      LEFT JOIN Ghre_ExamRecord E ON A.Id = E.OpenClassId AND E.StaffId = '{staffId}'
      LEFT JOIN Ghre_StudyRecord F ON A.Id = F.OpenClassId And F.IsEnable=1
+     LEFT JOIN Ghre_OpenClassFeedback G ON A.Id = G.OpenClassId AND G.Source = 'Trainee' AND G.StaffId = '9'
 WHERE A.Status !='Temporary' AND A.IsEnable=1 AND   (   EXISTS
              (SELECT 1
               FROM Ghre_OpenClassStaff C
@@ -1315,8 +1321,6 @@ WHERE A.Status !='Temporary' AND A.IsEnable=1 AND   (   EXISTS
             if (x.IsRequireStudy == false)
                 x.ShowStudyBtn = false;
 
-
-
             if (dt >= x.CourseBeginDate && dt <= x.CourseEndDate)
                 x.DisableStudyBtn = false;
             else
@@ -1341,6 +1345,11 @@ WHERE A.Status !='Temporary' AND A.IsEnable=1 AND   (   EXISTS
             if (x.FeedbackOrderId.IsNotEmptyOrNull())
                 x.DisableFeedbackBtn = false;
 
+            if (x.ShowFeedbackBtn == true && x.StudyProgress < 100)
+            {
+                x.DisableFeedbackBtn = true;
+            }
+
             #region 处理学习进度
 
             if (x.ExamId.IsNull())
@@ -1365,6 +1374,11 @@ WHERE A.Status !='Temporary' AND A.IsEnable=1 AND   (   EXISTS
                 else if (x.ExamStatus == DIC_EXAM_RECORD_STATUS.EXAM_END)
                     x.StudyProgress = 60;
             }
+
+            if (x.OpenClassFeedbackStatus.IsNotEmptyOrNull())
+                if (x.OpenClassFeedbackStatus == "N")
+                    x.StudyProgress = 83;
+                else x.StudyProgress = 100;
             #endregion
         });
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
index 154caaa9..d86a55ef 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
@@ -501,7 +501,7 @@ public class Ghre_SurveyServices : BaseServices<Ghre_Survey, Ghre_SurveyDto, Ins
         #region 修正反馈单
         if (feedbackId != null)
             await Db.Updateable<Ghre_OpenClassFeedback>()
-                .SetColumns(it => new Ghre_OpenClassFeedback() { Score = totalScore, UpdateTime = DateTime.Now })
+                .SetColumns(it => new Ghre_OpenClassFeedback() { Score = totalScore, Status = "Y", UpdateTime = DateTime.Now })
                 .Where(it => it.Id == feedbackId)
                 .ExecuteCommandAsync();
         #endregion