diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 86ec962a..079e4cde 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -49411,7 +49411,7 @@ Ghra_staff_InsureBase Ghre_OpenClassFee 1738915608 Administrator -1738976945 +1739251430 Administrator 开班费用 @@ -49573,14 +49573,15 @@ Ghra_staff_InsureBase C55369A6-3ABE-435C-B237-0CC46CDE71DD -费用项目ID -ItemId +费用项目 +ItemCode 1738915608 Administrator -1738976907 +1739251983 Administrator -费用项目ID -bigint +费用项目 +nvarchar(32) +32 B0A3FDFA-12BF-431A-8138-6842C69328BA diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs index a285ce0d..68861557 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs @@ -35,4 +35,22 @@ public class Ghre_OpenClassController : BaseController> QueryStaff(long Id) => await _service.QueryStaff(Id); #endregion + + #region 费用 + /// + /// 查询团体费用 + /// + /// 开班ID + /// + [HttpPost, Route("QueryGroupFee/{Id}")] + public async Task> QueryGroupFee(long Id) => await _service.QueryGroupFee(Id); + + /// + /// 查询个人费用 + /// + /// 开班ID + /// + [HttpPost, Route("QueryPersonalFee/{Id}")] + public async Task> QueryPersonalFee(long Id) => await _service.QueryPersonalFee(Id); + #endregion } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs index 5f23916a..e470dd40 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs @@ -6,4 +6,8 @@ public interface IGhre_OpenClassServices : IBaseServices { Task> QueryStaff(long Id); + + Task> QueryGroupFee(long Id); + + Task> QueryPersonalFee(long Id); } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs index 140d62af..e4ebd9c9 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs @@ -24,6 +24,7 @@ public class Ghre_OpenClassFeeServices : BaseServices> QueryFee(long Id) + #region 费用 + public async Task> QueryGroupFee(long Id) + { + var result = await _ghre_OpenClassFeeServices.QueryFilterPage(new QueryBody(), $"OpenClassId='{Id}' AND StaffId IS NULL"); + return result.result.DT_TableDataT1; + } + public async Task> QueryPersonalFee(long Id) { - var result = await _ghre_OpenClassFeeServices.QueryFilterPage(new QueryBody(), $"OpenClassId='{Id}'"); + var result = await _ghre_OpenClassFeeServices.QueryFilterPage(new QueryBody(), $"OpenClassId='{Id}' AND StaffId IS NOT NULL"); return result.result.DT_TableDataT1; } #endregion