ESS开班列表串联反馈单

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -6140,7 +6140,7 @@
             讲师上级ID
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackIdbig">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackId">
             <summary>
             上级反馈单ID
             </summary>
@@ -24797,7 +24797,7 @@
             讲师上级ID
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackIdbig">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackId">
             <summary>
             上级反馈单ID
             </summary>

Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs

@@ -326,7 +326,7 @@ public class Ghre_OpenClassBase
     /// <summary>
     /// 上级反馈单ID
     /// </summary>
-    public int? ParentFeedbackIdbig { get; set; }
+    public long? ParentFeedbackId { get; set; }
 
 
 

Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs

@@ -327,5 +327,5 @@ public class Ghre_OpenClass : BasePoco
     /// <summary>
     /// 上级反馈单ID
     /// </summary>
-    public int? ParentFeedbackIdbig { get; set; }
+    public long? ParentFeedbackId  { get; set; }
 }

Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs

@@ -1135,7 +1135,8 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
        'ExamDate' ExamDateType,
        A.ExamId,
        E.Status ExamStatus,
-       A.Status OpenClassStatus,  A.CreateTime PublishTime, ISNULL (F.StudyProgress, 0) StudyProgress, A.IsRequireStudy
+       A.Status OpenClassStatus,  A.CreateTime PublishTime, ISNULL (F.StudyProgress, 0) StudyProgress, A.IsRequireStudy, 
+       A.FeedbackId FeedbackOrderId
 FROM Ghre_OpenClass A
      JOIN Ghre_StaffGroup B ON A.StaffGroupId = B.Id
      LEFT JOIN Ghre_Course C ON A.LinkId = C.Id
@@ -1306,10 +1307,15 @@ WHERE A.Status !='Temporary' AND   (   EXISTS
             if (!x.ExamId.IsNull() && x.ExamBeginDate != null && x.ExamEndDate != null && x.ExamBeginDate <= dt && x.ExamEndDate >= dt)
                 x.DisableExamBtn = false;
 
-            if ((x.StudyProgress < 100 || x.ExamId.IsNull()) && x.IsRequireStudy != false)
-                x.DisableExamBtn = true;
+            if (x.StudyProgress >= 100 && x.ExamId.IsNotEmptyOrNull() && x.IsRequireStudy != false)
+                x.DisableExamBtn = false;
+
             if (x.FeedbackOrderId.IsNull())
+            {
                 x.ShowFeedbackBtn = false;
+                x.DisableFeedbackBtn = false;
+
+            }
 
             #region 处理学习进度
 

Tiobon.Core/Tiobon.Core.Model.xml

@@ -6140,7 +6140,7 @@
             讲师上级ID
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackIdbig">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackId">
             <summary>
             上级反馈单ID
             </summary>
@@ -9190,6 +9190,11 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_SurveyRecordBase.OpenClassId">
+            <summary>
+            开班ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_SurveyRecordDetailBase">
             <summary>
             Ghre_SurveyRecordDetail (Dto.Base)
@@ -24792,7 +24797,7 @@
             讲师上级ID
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackIdbig">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackId">
             <summary>
             上级反馈单ID
             </summary>
@@ -27752,6 +27757,11 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_SurveyRecord.OpenClassId">
+            <summary>
+            开班ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_SurveyRecordDetail">
             <summary>
             Ghre_SurveyRecordDetail (Model)

Tiobon.Core/Tiobon.Core.xml

@@ -1521,6 +1521,14 @@
             <param name="id"></param> 
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryESSDataFromOpenCLass(System.Int64,System.Int64)">
+            <summary>
+            查询
+            </summary> 
+            <param name="id"></param> 
+            <param name="openClassId">开班ID</param> 
+            <returns></returns>
+        </member>
         <member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.SubmitESSData(System.Int64,Tiobon.Core.Model.ViewModels.Extend.Ghre_SurveyExtend)">
             <summary>
             提交