From 04ed1718ff731dbaa06444ccdb066fb6ed9e7e2c Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 6 May 2025 13:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87=E5=BC=80?=
 =?UTF-8?q?=E7=8F=AD=E6=9F=A5=E8=AF=A2=E9=97=AE=E5=8D=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Ghre/Ghre_SurveyController.cs            | 9 +++++++++
 Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs       | 2 +-
 .../Base/Ghre/Ghre_SurveyRecord.Dto.Base.cs              | 7 ++++++-
 Tiobon.Core.Model/Models/Ghre/Ghre_SurveyRecord.cs       | 7 ++++++-
 Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs         | 2 +-
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs
index 107c4d24..6b34c613 100644
--- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs
@@ -77,6 +77,15 @@ public class Ghre_SurveyController : BaseController<IGhre_SurveyServices, Ghre_S
     [HttpPost("QueryESSData/{id}")]
     public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id) => await _service.QueryESSData(id);
 
+    /// <summary>
+    /// 查询
+    /// </summary> 
+    /// <param name="id"></param> 
+    /// <param name="openClassId">开班ID</param> 
+    /// <returns></returns>
+    [HttpPost("QueryESSData/{id}/{openClassId}")]
+    public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSDataFromOpenCLass(long id, long openClassId) => await _service.QueryESSData(id, openClassId);
+
     #endregion
 
     #region 提交 
diff --git a/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs
index ecaed2ef..b6bda78a 100644
--- a/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs
+++ b/Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs
@@ -16,7 +16,7 @@ public interface IGhre_SurveyServices : IBaseServices<Ghre_Survey, Ghre_SurveyDt
 
     Task<ServiceResult<InsertGhre_SurveyExtend>> QueryData(long id);
 
-    Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id);
+    Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id, long? openClassId = null);
 
     Task<ServiceResult> SubmitESSData(long id, Ghre_SurveyExtend input);
 
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_SurveyRecord.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_SurveyRecord.Dto.Base.cs
index 8c447642..08e7c791 100644
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_SurveyRecord.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_SurveyRecord.Dto.Base.cs
@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/4/2 10:23:05  SimonHsiao   初版
+*V0.01  2025/5/6 13:17:08  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -160,4 +160,9 @@ public class Ghre_SurveyRecordBase
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 开班ID
+    /// </summary>
+    public long? OpenClassId { get; set; }
 }
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_SurveyRecord.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_SurveyRecord.cs
index 8578bc78..aaa4636a 100644
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_SurveyRecord.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_SurveyRecord.cs
@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/4/2 10:23:05  SimonHsiao   初版
+*V0.01  2025/5/6 13:17:08  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -161,4 +161,9 @@ public class Ghre_SurveyRecord : BasePoco
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 开班ID
+    /// </summary>
+    public long? OpenClassId { get; set; }
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
index 39f05f1d..1f2df8ae 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
@@ -196,7 +196,7 @@ public class Ghre_SurveyServices : BaseServices<Ghre_Survey, Ghre_SurveyDto, Ins
     }
 
 
-    public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id)
+    public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id, long? openClassId = null)
     {
         var entity = await base.QueryById(id);
         var data = Mapper.Map(entity).ToANew<Ghre_SurveyExtend>();