diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs index 6b34c613..80d8ad25 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs @@ -83,7 +83,7 @@ public class Ghre_SurveyController : BaseController /// 开班ID /// - [HttpPost("QueryESSData/{id}/{openClassId}")] + [HttpPost("QueryESSData/{openClassId}/{id}")] public async Task> QueryESSDataFromOpenCLass(long id, long openClassId) => await _service.QueryESSData(id, openClassId); #endregion @@ -98,6 +98,16 @@ public class Ghre_SurveyController : BaseController SubmitESSData(long id, [FromBody] Ghre_SurveyExtend input) => await _service.SubmitESSData(id, input); + + /// + /// 提交 + /// + /// + /// + /// + [HttpPost("SubmitESSData/{openClassId}/{id}")] + public async Task SubmitESSDataFromOpenCLass(long id, [FromBody] Ghre_SurveyExtend input, long openClassId) => await _service.SubmitESSData(id, input); + #endregion #region 发布 diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index e6d68c8d..65f836ea 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1537,6 +1537,14 @@ + + + 提交 + + + + + 发布 diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index d52ec200..b8dbcae0 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -1310,13 +1310,9 @@ WHERE A.Status !='Temporary' AND ( EXISTS if (x.StudyProgress >= 100 && x.ExamId.IsNotEmptyOrNull() && x.IsRequireStudy != false) x.DisableExamBtn = false; - if (x.FeedbackOrderId.IsNull()) - { - x.ShowFeedbackBtn = false; + if (x.FeedbackOrderId.IsNotEmptyOrNull()) x.DisableFeedbackBtn = false; - } - #region 处理学习进度 if (x.ExamId.IsNull()) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 90ecfb15..65f836ea 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -688,7 +688,7 @@ 人员群组(Controller) - + 获取配置 @@ -1537,6 +1537,14 @@ + + + 提交 + + + + + 发布