配合前端对接开班员工、费用接口

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

@@ -72,5 +72,24 @@ public class Ghre_OpenClassController : BaseController<IGhre_OpenClassServices,
     /// <returns></returns>
     [HttpPost, Route("QueryPersonalFee/{Id}")]
     public async Task<ServiceResult<List<Ghre_OpenClassFeeDto>>> QueryPersonalFee(long Id) => await _service.QueryPersonalFee(Id);
+
+
+    /// <summary>
+    /// 学员费用
+    /// </summary>
+    /// <param name="Id">开班ID</param>
+    /// <param name="fee">费用信心</param>
+    /// <returns></returns>
+    [HttpPost, Route("InsertFee/{Id}")]
+    public async Task<ServiceResult> InsertFee(long Id, [FromBody] InsertGhre_OpenClassFeeInput fee) => await _service.InsertFee(Id, fee);
+
+
+    /// <summary>
+    /// 费用删除
+    /// </summary> 
+    /// <param name="ids">费用数据ID列表</param>
+    /// <returns></returns>
+    [HttpPost, Route("DeleteFee")]
+    public async Task<ServiceResult> DeleteFee([FromBody] List<long> ids) => await _service.DeleteFee(ids);
     #endregion
 }

Tiobon.Core.Api/Tiobon.Core.xml

@@ -1190,6 +1190,21 @@
             <param name="Id">开班ID</param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.InsertFee(System.Int64,Tiobon.Core.Model.Models.InsertGhre_OpenClassFeeInput)">
+            <summary>
+            学员费用
+            </summary>
+            <param name="Id">开班ID</param>
+            <param name="fee">费用信心</param>
+            <returns></returns>
+        </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.DeleteFee(System.Collections.Generic.List{System.Int64})">
+            <summary>
+            费用删除
+            </summary> 
+            <param name="ids">费用数据ID列表</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_OpenClassFeeController">
             <summary>
             开班费用(Controller)

Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs

@@ -15,4 +15,8 @@ public interface IGhre_OpenClassServices : IBaseServices<Ghre_OpenClass, Ghre_Op
     Task<ServiceResult<List<Ghre_OpenClassFeeDto>>> QueryGroupFee(long Id);
 
     Task<ServiceResult<List<Ghre_OpenClassFeeDto>>> QueryPersonalFee(long Id);
+
+    Task<ServiceResult> InsertFee(long Id, InsertGhre_OpenClassFeeInput fee);
+
+    Task<ServiceResult> DeleteFee(List<long> feeIds);
 }

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -1266,7 +1266,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
             int sequence;
 
             #region 查询
-            DbSelect dbSelect = new (tableCode + " A", "A", null);
+            DbSelect dbSelect = new(tableCode + " A", "A", null);
             dbSelect.IsInitDefaultValue = false;
 
             if (!string.IsNullOrEmpty(prefixTemp))
@@ -1668,7 +1668,8 @@ ORDER BY SortNo ASC";
                 if (dataRole.@DeptType == 6)
                 {
                     var dept = depts.Where(x => x.DeptID == @UserStaffID).FirstOrDefault();
-                    var depts1 = await GetDeptList(depts, dept.DeptID);
+                    if (dept != null)
+                        await GetDeptList(depts, dept.DeptID);
                 }
 
                 //5 部门助理(不含下阶)

Tiobon.Core.Services/CommonServices.cs

@@ -1961,6 +1961,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
 
                 break;
             case "F_OpenCLassTemporary":
+            case "F_OpenCLassPublish":
                 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();

Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs

@@ -132,11 +132,13 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
 
     public async Task<ServiceResult> InsertStaff(long Id, List<int> staffIds)
     {
-        var inserts = staffIds.Select(x => new InsertGhre_OpenClassStaffInput()
-        {
-            StaffId = x,
-            OpenClassId = Id
-        }).ToList();
+        var staffIds1 = await Db.Queryable<Ghre_OpenClassStaff>().Select(s => s.StaffId).ToListAsync();
+        var inserts = staffIds.Where(x => !staffIds1.Contains(x))
+            .Select(x => new InsertGhre_OpenClassStaffInput()
+            {
+                StaffId = x,
+                OpenClassId = Id
+            }).Distinct().ToList();
         await _ghre_OpenClassStaffServices.Add(inserts);
         return ServiceResult.OprateSuccess();
     }
@@ -162,5 +164,22 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
         var result = await _ghre_OpenClassFeeServices.QueryFilterPage(new QueryBody(), $"OpenClassId='{Id}' AND StaffId IS NOT NULL");
         return ServiceResult<List<Ghre_OpenClassFeeDto>>.OprateSuccess("查询成功！", result.result.DT_TableDataT1);
     }
+
+
+    public async Task<ServiceResult> InsertFee(long Id, InsertGhre_OpenClassFeeInput fee)
+    {
+        fee.OpenClassId = Id;
+        await _ghre_OpenClassFeeServices.Add(fee);
+        return ServiceResult.OprateSuccess();
+    }
+
+    public async Task<ServiceResult> DeleteFee(List<long> feeIds)
+    {
+        await Db.Updateable<Ghre_OpenClassFee>()
+                   .SetColumns(it => new Ghre_OpenClassFee() { IsEnable = 0 })
+                   .Where(it => feeIds.Contains(it.Id))
+                   .ExecuteCommandAsync();
+        return ServiceResult.OprateSuccess();
+    }
     #endregion
 }

Tiobon.Core/Tiobon.Core.xml

@@ -1190,6 +1190,21 @@
             <param name="Id">开班ID</param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.InsertFee(System.Int64,Tiobon.Core.Model.Models.InsertGhre_OpenClassFeeInput)">
+            <summary>
+            学员费用
+            </summary>
+            <param name="Id">开班ID</param>
+            <param name="fee">费用信心</param>
+            <returns></returns>
+        </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.DeleteFee(System.Collections.Generic.List{System.Int64})">
+            <summary>
+            费用删除
+            </summary> 
+            <param name="ids">费用数据ID列表</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_OpenClassFeeController">
             <summary>
             开班费用(Controller)