配合前端对接开班接口

Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs

@@ -26,4 +26,13 @@ public class Ghre_OpenClassController : BaseController<IGhre_OpenClassServices,
     }
     #endregion
 
+    #region 学员
+    /// <summary>
+    /// 根据条件查询数据
+    /// </summary>
+    /// <param name="Id">开班ID</param>
+    /// <returns></returns>
+    [HttpPost, Route("QueryStaff/{Id}")]
+    public async Task<List<Ghre_OpenClassStaffDto>> QueryStaff(long Id) => await _service.QueryStaff(Id);
+    #endregion
 }

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

@@ -5000,6 +5000,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
+            <summary>
+            课程ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseSceneId">
+            <summary>
+            课程场景ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendBase">
             <summary>
             开班打卡 (Dto.Base)
@@ -29832,6 +29842,16 @@
             讲师
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.CourseId">
+            <summary>
+            课程ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.CourseSceneId">
+            <summary>
+            课程场景ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendDto">
             <summary>
             开班打卡(Dto.View1)

Tiobon.Core.Api/Tiobon.Core.xml

@@ -1153,6 +1153,13 @@
             <param name="status">status</param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.QueryStaff(System.Int64)">
+            <summary>
+            根据条件查询数据
+            </summary>
+            <param name="Id">开班ID</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_OpenClassFeeController">
             <summary>
             开班费用(Controller)

Tiobon.Core.Common/Attribute/QueryFilter.cs

@@ -19,7 +19,7 @@ public class QueryBody
     /// 每页数量(e.g. 10)
     /// </summary>
     [Required]
-    public int pageSize { get; set; }
+    public int pageSize { get; set; } = 100000;
     private JObject _jsonParam;
     /// <summary>
     /// 查询条件( 例如:id = 1 and name = 小明)

Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs

@@ -5,4 +5,5 @@
 /// </summary>	
 public interface IGhre_OpenClassServices : IBaseServices<Ghre_OpenClass, Ghre_OpenClassDto, InsertGhre_OpenClassInput, EditGhre_OpenClassInput>
 {
+    Task<List<Ghre_OpenClassStaffDto>> QueryStaff(long Id);
 }

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

@@ -249,4 +249,14 @@ public class Ghre_OpenClassBase
     /// 预留字段12
     /// </summary>
     public int? ReverseI2 { get; set; }
+
+    /// <summary>
+    /// 课程ID
+    /// </summary>
+    public long? CourseId { get; set; }
+
+    /// <summary>
+    /// 课程场景ID
+    /// </summary>
+    public long? CourseSceneId { get; set; }
 }

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

@@ -62,5 +62,15 @@ public class Ghre_OpenClassDto : Ghre_OpenClass
     /// 讲师
     /// </summary>
     public string TeacherName { get; set; }
+
+    /// <summary>
+    /// 课程ID
+    /// </summary>
+    public long? CourseId { get; set; }
+
+    /// <summary>
+    /// 课程场景ID
+    /// </summary>
+    public long? CourseSceneId { get; set; }
 }
 

Tiobon.Core.Services/CommonServices.cs

@@ -1959,6 +1959,18 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 });
                 result.JM_TableColumnT1.TableColumn = result.JM_TableColumnT1.TableColumn.OrderBy(x => x.SortNo).ToList();
 
+                break;
+            case "F_OpenCLassTemporary":
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD1YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD2YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD3YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD4YN";
+
+                 
                 break;
         }
 

Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs

@@ -12,4 +12,21 @@ public class Ghre_OpenClassFeeServices : BaseServices<Ghre_OpenClassFee, Ghre_Op
         base.BaseDal = dal;
         base._caching = caching;
     }
+
+    public override async Task<ServicePageResult<Ghre_OpenClassFeeDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
+    {
+
+
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
+
+        for (int i = 0; i < result.result.DT_TableDataT1.Count; i++)
+        {
+            var DT_TableDataT1 = result.result.DT_TableDataT1[i];
+
+            //DT_TableDataT1.Source = DT_TableDataT1.Source == "Backend" ? "后台新增" : "报名";
+
+            result.result.DT_TableDataT1[i] = DT_TableDataT1;
+        }
+        return result;
+    }
 }

Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs

@@ -5,12 +5,19 @@
 /// </summary>
 public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClassDto, InsertGhre_OpenClassInput, EditGhre_OpenClassInput>, IGhre_OpenClassServices
 {
+    private readonly IGhre_OpenClassStaffServices _ghre_OpenClassStaffServices;
+    private readonly IGhre_OpenClassFeeServices _ghre_OpenClassFeeServices;
     private readonly IBaseRepository<Ghre_OpenClass> _dal;
-    public Ghre_OpenClassServices(ICaching caching, IBaseRepository<Ghre_OpenClass> dal)
+    public Ghre_OpenClassServices(ICaching caching,
+        IBaseRepository<Ghre_OpenClass> dal,
+        IGhre_OpenClassStaffServices ghre_OpenClassStaffServices,
+        IGhre_OpenClassFeeServices ghre_OpenClassFeeServices)
     {
         this._dal = dal;
         base.BaseDal = dal;
         base._caching = caching;
+        _ghre_OpenClassStaffServices = ghre_OpenClassStaffServices;
+        _ghre_OpenClassFeeServices = ghre_OpenClassFeeServices;
     }
 
     public override async Task<ServicePageResult<Ghre_OpenClassDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
@@ -33,7 +40,7 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
                         condition += $" OR (EndTime>='{ids1[0]} 00:00:00' AND EndTime<='{ids1[1]} 23:59:59'))";
                     }
                 }
-                 
+
             }
 
         var result = await base.QueryFilterPage(filter, condition, IsEnable);
@@ -74,6 +81,7 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
 
     public override async Task<long> Add(InsertGhre_OpenClassInput entity)
     {
+        entity.LinkId = entity.LinkType == "Course" ? entity.CourseId : entity.CourseSceneId;
         var result = await base.Add(entity);
         entity.Status = "Temporary";
         return result;
@@ -82,9 +90,40 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
     public override async Task<bool> Update(long Id, EditGhre_OpenClassInput editModel)
     {
 
+        editModel.LinkId = editModel.LinkType == "Course" ? editModel.CourseId : editModel.CourseSceneId;
         var result = await base.Update(Id, editModel, null, ["Status"]);
 
+        return result;
+    }
+
 
+    public override async Task<ServiceFormResult<Ghre_OpenClassDto>> QueryForm(QueryForm body)
+    {
+        var result = await base.QueryForm(body);
+        if (result.result.DT_TableDataT1.Any())
+        {
+            if (result.result.DT_TableDataT1[0].LinkType == "Course")
+                result.result.DT_TableDataT1[0].CourseId = result.result.DT_TableDataT1[0].LinkId;
+            else
+                result.result.DT_TableDataT1[0].CourseSceneId = result.result.DT_TableDataT1[0].LinkId;
+        }
         return result;
+
+    }
+
+    #region 学员
+    public async Task<List<Ghre_OpenClassStaffDto>> QueryStaff(long Id)
+    {
+        var result = await _ghre_OpenClassStaffServices.QueryFilterPage(new QueryBody(), $"OpenClassId='{Id}'");
+        return result.result.DT_TableDataT1;
+    }
+    #endregion
+
+    #region 学员
+    public async Task<List<Ghre_OpenClassFeeDto>> QueryFee(long Id)
+    {
+        var result = await _ghre_OpenClassFeeServices.QueryFilterPage(new QueryBody(), $"OpenClassId='{Id}'");
+        return result.result.DT_TableDataT1;
     }
+    #endregion
 }

Tiobon.Core.Services/Ghre/Ghre_OpenClassStaffServices.cs

@@ -12,4 +12,22 @@ public class Ghre_OpenClassStaffServices : BaseServices<Ghre_OpenClassStaff, Ghr
         base.BaseDal = dal;
         base._caching = caching;
     }
+
+
+    public override async Task<ServicePageResult<Ghre_OpenClassStaffDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
+    {
+
+
+        var result = await base.QueryFilterPage(filter, condition, IsEnable);
+
+        for (int i = 0; i < result.result.DT_TableDataT1.Count; i++)
+        {
+            var DT_TableDataT1 = result.result.DT_TableDataT1[i];
+
+            DT_TableDataT1.Source = DT_TableDataT1.Source == "Backend" ? "后台新增" : "报名";
+
+            result.result.DT_TableDataT1[i] = DT_TableDataT1;
+        }
+        return result;
+    }
 }

Tiobon.Core/Tiobon.Core.Model.xml

@@ -5000,6 +5000,16 @@
             预留字段12
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
+            <summary>
+            课程ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseSceneId">
+            <summary>
+            课程场景ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendBase">
             <summary>
             开班打卡 (Dto.Base)
@@ -29832,6 +29842,16 @@
             讲师
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.CourseId">
+            <summary>
+            课程ID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassDto.CourseSceneId">
+            <summary>
+            课程场景ID
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttendDto">
             <summary>
             开班打卡(Dto.View1)

Tiobon.Core/Tiobon.Core.xml

@@ -1153,6 +1153,13 @@
             <param name="status">status</param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.QueryStaff(System.Int64)">
+            <summary>
+            根据条件查询数据
+            </summary>
+            <param name="Id">开班ID</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_OpenClassFeeController">
             <summary>
             开班费用(Controller)