讲师维护

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

@@ -33,7 +33,7 @@ public class Ghre_RequestController : BaseController<IGhre_RequestServices, Ghre
     }
     #endregion
 
-    #region 更新 
+    #region 状态修改 
     [HttpPost("UpdateStatus/{status}")]
     public async Task<ServiceResult> UpdateStatus(string status, [FromBody] InsertGhre_RequestInput input)
     {

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

@@ -19,4 +19,39 @@ public class Ghre_TeacherController : BaseController<IGhre_TeacherServices, Ghre
         return await _service.QueryFilterPage(body, null, false);
     }
     #endregion
+
+    #region 查询
+    /// <summary>
+    /// 根据条件查询数据
+    /// </summary>
+    /// <param name="body">条件</param>
+    /// <param name="status">status</param>
+    /// <returns></returns>
+    [HttpPost, Route("QueryList/{status}")]
+    public async Task<ServicePageResult<Ghre_TeacherDto>> QueryByStatus([FromBody] QueryBody body, string status)
+    {
+        if (status == "Active")
+            return await _service.QueryFilterPage(body, $"(Status ='{status}' OR (WorkID IS NOT NULL AND WorkState IN (0,1)))");
+        else if (status == "Disable")
+            return await _service.QueryFilterPage(body, null, false);
+        else
+            return await _service.QueryFilterPage(body, $"Status ='{status}' AND WorkID IS NULL");
+    }
+    #endregion
+
+    #region 状态修改 
+    [HttpPost("UpdateStatus/{status}")]
+    public async Task<ServiceResult> UpdateStatus(string status, [FromBody] InsertGhre_TeacherInput input)
+    {
+        return await _service.UpdateStatus(input, status);
+    }
+    #endregion 
+
+    #region 新增 
+    [HttpPost("Insert/{status}")]
+    public async Task<ServiceResult<long>> InsertByStatus([FromBody] InsertGhre_TeacherInput insertModel, string status)
+    {
+        return await _service.InsertByStatus(insertModel, status);
+    }
+    #endregion 
 }

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

@@ -5262,7 +5262,7 @@
         </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherBase">
             <summary>
-            Ghre_Teacher (Dto.Base)
+            培训讲师 (Dto.Base)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SchoolId">
@@ -5340,6 +5340,86 @@
             默认标志
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkID">
+            <summary>
+            WorkID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkNo">
+            <summary>
+            WorkNo
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ToDoType">
+            <summary>
+            ToDoType
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.BatchSID">
+            <summary>
+            BatchSID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkState">
+            <summary>
+            WorkState
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ShiftID">
+            <summary>
+            ShiftID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ConfirmUserID">
+            <summary>
+            ConfirmUserID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ConfirmTime">
+            <summary>
+            ConfirmTime
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ConfirmComment">
+            <summary>
+            ConfirmComment
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.AgreeUserId">
+            <summary>
+            同意人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.AgreeTime">
+            <summary>
+            同意时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.AgreeReason">
+            <summary>
+            同意理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.RefuseUserId">
+            <summary>
+            拒绝人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.RefuseTime">
+            <summary>
+            拒绝时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.RefuseReason">
+            <summary>
+            拒绝理由
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Reverse1">
             <summary>
             预留字段1
@@ -12498,7 +12578,7 @@
         </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_Teacher">
             <summary>
-            Ghre_Teacher (Model)
+            培训讲师 (Model)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SchoolId">
@@ -12576,6 +12656,86 @@
             默认标志
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkID">
+            <summary>
+            WorkID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkNo">
+            <summary>
+            WorkNo
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ToDoType">
+            <summary>
+            ToDoType
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.BatchSID">
+            <summary>
+            BatchSID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkState">
+            <summary>
+            WorkState
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ShiftID">
+            <summary>
+            ShiftID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ConfirmUserID">
+            <summary>
+            ConfirmUserID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ConfirmTime">
+            <summary>
+            ConfirmTime
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ConfirmComment">
+            <summary>
+            ConfirmComment
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.AgreeUserId">
+            <summary>
+            同意人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.AgreeTime">
+            <summary>
+            同意时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.AgreeReason">
+            <summary>
+            同意理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.RefuseUserId">
+            <summary>
+            拒绝人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.RefuseTime">
+            <summary>
+            拒绝时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.RefuseReason">
+            <summary>
+            拒绝理由
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Reverse1">
             <summary>
             预留字段1

Tiobon.Core.Api/Tiobon.Core.xml

@@ -1110,6 +1110,14 @@
             Ghre_Teacher(Controller)
             </summary>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_TeacherController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+            <summary>
+            根据条件查询数据
+            </summary>
+            <param name="body">条件</param>
+            <param name="status">status</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghro_DeptController">
             <summary>
             Ghro_Dept(Controller)

Tiobon.Core.IServices/Ghre/IGhre_TeacherServices.cs

@@ -1,4 +1,5 @@
 using Tiobon.Core.IServices.BASE;
+using Tiobon.Core.Model;
 using Tiobon.Core.Model.Models;
 
 namespace Tiobon.Core.IServices
@@ -8,6 +9,8 @@ namespace Tiobon.Core.IServices
     /// </summary>	
     public interface IGhre_TeacherServices :IBaseServices<Ghre_Teacher, Ghre_TeacherDto, InsertGhre_TeacherInput, EditGhre_TeacherInput>
 	{
-		 
+        Task<ServiceResult> UpdateStatus(InsertGhre_TeacherInput input, string status);
+
+        Task<ServiceResult<long>> InsertByStatus(InsertGhre_TeacherInput insertModel, string status);
     }
 }

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

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/6/27 14:05:58  SimonHsiao   初版
+*V0.01  2024/9/24 10:53:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -22,7 +22,7 @@ namespace Tiobon.Core.Model.Models
 {
 
     /// <summary>
-    /// Ghre_Teacher (Dto.Base)
+    /// 培训讲师 (Dto.Base)
     /// </summary>
     public class Ghre_TeacherBase
     {
@@ -113,6 +113,93 @@ namespace Tiobon.Core.Model.Models
         /// </summary>
         public int? IsDefault { get; set; }
 
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// WorkID
+        /// </summary>
+        public int? WorkID { get; set; }
+
+        /// <summary>
+        /// WorkNo
+        /// </summary>
+        [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")]
+        public string WorkNo { get; set; }
+
+        /// <summary>
+        /// ToDoType
+        /// </summary>
+        [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")]
+        public string ToDoType { get; set; }
+
+        /// <summary>
+        /// BatchSID
+        /// </summary>
+        [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")]
+        public string BatchSID { get; set; }
+
+        /// <summary>
+        /// WorkState
+        /// </summary>
+        public int? WorkState { get; set; }
+
+        /// <summary>
+        /// ShiftID
+        /// </summary>
+        public int? ShiftID { get; set; }
+
+        /// <summary>
+        /// ConfirmUserID
+        /// </summary>
+        public int? ConfirmUserID { get; set; }
+
+        /// <summary>
+        /// ConfirmTime
+        /// </summary>
+        public DateTime? ConfirmTime { get; set; }
+
+        /// <summary>
+        /// ConfirmComment
+        /// </summary>
+        [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")]
+        public string ConfirmComment { get; set; }
+
+        /// <summary>
+        /// 同意人
+        /// </summary>
+        public long? AgreeUserId { get; set; }
+
+        /// <summary>
+        /// 同意时间
+        /// </summary>
+        public DateTime? AgreeTime { get; set; }
+
+        /// <summary>
+        /// 同意理由
+        /// </summary>
+        [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")]
+        public string AgreeReason { get; set; }
+
+        /// <summary>
+        /// 拒绝人
+        /// </summary>
+        public long? RefuseUserId { get; set; }
+
+        /// <summary>
+        /// 拒绝时间
+        /// </summary>
+        public DateTime? RefuseTime { get; set; }
+
+        /// <summary>
+        /// 拒绝理由
+        /// </summary>
+        [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")]
+        public string RefuseReason { get; set; }
+
         /// <summary>
         /// 预留字段1
         /// </summary>

Tiobon.Core.Model/Insert/Ghre/Ghre_Teacher.Dto.InsertInput.cs

@@ -28,5 +28,11 @@ namespace Tiobon.Core.Model.Models
 
         [NotMapped]
         public List<InsertGhre_TeacherAttachmentInput> TeacherAttachments { get; set; }
+
+        public List<long> Ids { get; set; }
+
+        public string Reason { get; set; }
+
+
     }
 }

Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/6/27 14:05:58  SimonHsiao   初版
+*V0.01  2024/9/24 10:53:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -23,9 +23,9 @@ namespace Tiobon.Core.Model.Models
 {
 
     /// <summary>
-    /// Ghre_Teacher (Model)
+    /// 培训讲师 (Model)
     /// </summary>
-    [SugarTable("Ghre_Teacher", "Ghre_Teacher"), Entity(TableCnName = "Ghre_Teacher", TableName = "Ghre_Teacher")]
+    [SugarTable("Ghre_Teacher", "Ghre_Teacher"), Entity(TableCnName = "培训讲师", TableName = "Ghre_Teacher")]
     public class Ghre_Teacher : BasePoco
     {
 
@@ -115,6 +115,93 @@ namespace Tiobon.Core.Model.Models
         /// </summary>
         public int? IsDefault { get; set; }
 
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// WorkID
+        /// </summary>
+        public int? WorkID { get; set; }
+
+        /// <summary>
+        /// WorkNo
+        /// </summary>
+        [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")]
+        public string WorkNo { get; set; }
+
+        /// <summary>
+        /// ToDoType
+        /// </summary>
+        [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")]
+        public string ToDoType { get; set; }
+
+        /// <summary>
+        /// BatchSID
+        /// </summary>
+        [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")]
+        public string BatchSID { get; set; }
+
+        /// <summary>
+        /// WorkState
+        /// </summary>
+        public int? WorkState { get; set; }
+
+        /// <summary>
+        /// ShiftID
+        /// </summary>
+        public int? ShiftID { get; set; }
+
+        /// <summary>
+        /// ConfirmUserID
+        /// </summary>
+        public int? ConfirmUserID { get; set; }
+
+        /// <summary>
+        /// ConfirmTime
+        /// </summary>
+        public DateTime? ConfirmTime { get; set; }
+
+        /// <summary>
+        /// ConfirmComment
+        /// </summary>
+        [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")]
+        public string ConfirmComment { get; set; }
+
+        /// <summary>
+        /// 同意人
+        /// </summary>
+        public long? AgreeUserId { get; set; }
+
+        /// <summary>
+        /// 同意时间
+        /// </summary>
+        public DateTime? AgreeTime { get; set; }
+
+        /// <summary>
+        /// 同意理由
+        /// </summary>
+        [Display(Name = "AgreeReason"), Description("同意理由"), MaxLength(2000, ErrorMessage = "同意理由 不能超过 2000 个字符")]
+        public string AgreeReason { get; set; }
+
+        /// <summary>
+        /// 拒绝人
+        /// </summary>
+        public long? RefuseUserId { get; set; }
+
+        /// <summary>
+        /// 拒绝时间
+        /// </summary>
+        public DateTime? RefuseTime { get; set; }
+
+        /// <summary>
+        /// 拒绝理由
+        /// </summary>
+        [Display(Name = "RefuseReason"), Description("拒绝理由"), MaxLength(2000, ErrorMessage = "拒绝理由 不能超过 2000 个字符")]
+        public string RefuseReason { get; set; }
+
         /// <summary>
         /// 预留字段1
         /// </summary>

Tiobon.Core.Services/CommonServices.cs

@@ -1064,8 +1064,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 result.JM_PageControlT1.Toolbar.RemoveAt(index);
                 break;
             case "F_SchoolManage":
-            case "F_WorkLicenseManage":
+            case "F_WorkLicenseManage": 
-            case "F_TeacherManage":
                 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();
@@ -1130,6 +1129,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 break;
 
             case "F_Training_Demand_ToDo":
+            case "F_TeacherManageTemporary":
                 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();
@@ -1150,6 +1150,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 });
                 break;
             case "F_Training_Demand_ToConfirm":
+            case "F_TeacherManageWaitConfirm":
                 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();
@@ -1180,6 +1181,9 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
             case "F_Training_Demand_ToEnable":
             case "F_Training_Demand_Query":
             case "F_Training_Demand_VoidQuery":
+            case "F_TeacherManage":
+            case "F_TeacherManageActive":
+            case "F_TeacherDisabled":
                 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();
@@ -1188,7 +1192,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 if (toolbar != null) { toolbar.fnKey = "TBD3YN"; }
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
                 if (toolbar != null) toolbar.fnKey = "TBD4YN";
-                break;
+                break; 
         }
 
         #endregion

Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs

@@ -11,7 +11,6 @@ using Tiobon.Core.Common.Helper;
 using Tiobon.Core.Common;
 using static Tiobon.Core.Model.Consts;
 using Newtonsoft.Json.Linq;
-using NPOI.Util.Collections;
 
 namespace Tiobon.Core.Services;
 
@@ -28,7 +27,6 @@ public class Ghre_RequestServices : BaseServices<Ghre_Request, Ghre_RequestDto,
         base._caching = caching;
     }
 
-
     public override async Task<ServicePageResult<Ghre_RequestDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
     {
 

Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs

@@ -9,6 +9,9 @@ using Tiobon.Core.Model;
 using AgileObjects.AgileMapper;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
+using Microsoft.AspNetCore.Http;
+using static Tiobon.Core.Model.Consts;
+using Tiobon.Core.Common.UserManager;
 
 namespace Tiobon.Core.Services;
 
@@ -247,7 +250,7 @@ FROM (SELECT A.*,
             editModel.DeptID = null;
             editModel.StaffId = null;
         }
-        var result = await base.Update(Id, editModel);
+        var result = await base.Update(Id, editModel, null, ["Status"]);
         await _ghre_TeacherAttachmentServices.Delete(x => x.TeacherId == Id);
         if (editModel.TeacherAttachments != null && editModel.TeacherAttachments.Any())
         {
@@ -269,4 +272,59 @@ FROM (SELECT A.*,
 
         return result;
     }
+    public async Task<ServiceResult<long>> InsertByStatus(InsertGhre_TeacherInput insertModel, string status)
+    {
+        var data = ServiceResult<long>.OprateSuccess("新增成功", 0);
+        insertModel.Status = status;
+        var id = await Add(insertModel);
+
+        data.Success = id > 0;
+        if (data.Success)
+            data.Data = id;
+        else
+            return ServiceResult<long>.OprateFailed("发布成功！");
+
+        return data;
+    }
+
+    public async Task<ServiceResult> UpdateStatus(InsertGhre_TeacherInput input, string status)
+    {
+
+        HttpRequest request = UserContext.Context.Request;
+        var api = request.Path.ObjToString().TrimEnd('/').ToLower();
+        var ip = GetUserIp(UserContext.Context);
+
+        var entities = new List<Ghre_Teacher>();
+        foreach (var id in input.Ids)
+        {
+            if (!BaseDal.Any(id))
+                continue;
+
+            var entity = await BaseDal.QueryById(id);
+
+
+            switch (status)
+            {
+                case DIC_REQUEST_STATUS.Active:
+                    entity.AgreeReason = input.Reason;
+                    entity.AgreeTime = DateTime.Now;
+                    entity.AgreeUserId = App.User.ID;
+                    break;
+                case DIC_REQUEST_STATUS.Temporary:
+                    entity.RefuseReason = input.Reason;
+                    entity.RefuseTime = DateTime.Now;
+                    entity.RefuseUserId = App.User.ID;
+                    break;
+            }
+
+            entity.UpdateIP = ip;
+            entity.UpdateProg = api;
+            entity.Status = status;
+            entities.Add(entity);
+        }
+
+        var result = await BaseDal.Update(entities);
+        return ServiceResult.OprateSuccess("执行成功！"); 
+
+    }
 }

Tiobon.Core/Tiobon.Core.Model.xml

@@ -5262,7 +5262,7 @@
         </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherBase">
             <summary>
-            Ghre_Teacher (Dto.Base)
+            培训讲师 (Dto.Base)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SchoolId">
@@ -5340,6 +5340,86 @@
             默认标志
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkID">
+            <summary>
+            WorkID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkNo">
+            <summary>
+            WorkNo
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ToDoType">
+            <summary>
+            ToDoType
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.BatchSID">
+            <summary>
+            BatchSID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.WorkState">
+            <summary>
+            WorkState
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ShiftID">
+            <summary>
+            ShiftID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ConfirmUserID">
+            <summary>
+            ConfirmUserID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ConfirmTime">
+            <summary>
+            ConfirmTime
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.ConfirmComment">
+            <summary>
+            ConfirmComment
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.AgreeUserId">
+            <summary>
+            同意人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.AgreeTime">
+            <summary>
+            同意时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.AgreeReason">
+            <summary>
+            同意理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.RefuseUserId">
+            <summary>
+            拒绝人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.RefuseTime">
+            <summary>
+            拒绝时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.RefuseReason">
+            <summary>
+            拒绝理由
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Reverse1">
             <summary>
             预留字段1
@@ -12498,7 +12578,7 @@
         </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_Teacher">
             <summary>
-            Ghre_Teacher (Model)
+            培训讲师 (Model)
             </summary>
         </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SchoolId">
@@ -12576,6 +12656,86 @@
             默认标志
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkID">
+            <summary>
+            WorkID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkNo">
+            <summary>
+            WorkNo
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ToDoType">
+            <summary>
+            ToDoType
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.BatchSID">
+            <summary>
+            BatchSID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.WorkState">
+            <summary>
+            WorkState
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ShiftID">
+            <summary>
+            ShiftID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ConfirmUserID">
+            <summary>
+            ConfirmUserID
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ConfirmTime">
+            <summary>
+            ConfirmTime
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.ConfirmComment">
+            <summary>
+            ConfirmComment
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.AgreeUserId">
+            <summary>
+            同意人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.AgreeTime">
+            <summary>
+            同意时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.AgreeReason">
+            <summary>
+            同意理由
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.RefuseUserId">
+            <summary>
+            拒绝人
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.RefuseTime">
+            <summary>
+            拒绝时间
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.RefuseReason">
+            <summary>
+            拒绝理由
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Reverse1">
             <summary>
             预留字段1

Tiobon.Core/Tiobon.Core.xml

@@ -1110,6 +1110,14 @@
             Ghre_Teacher(Controller)
             </summary>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_TeacherController.QueryByStatus(Tiobon.Core.Common.QueryBody,System.String)">
+            <summary>
+            根据条件查询数据
+            </summary>
+            <param name="body">条件</param>
+            <param name="status">status</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghro_DeptController">
             <summary>
             Ghro_Dept(Controller)