代码优化

Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplateController.cs

@@ -90,4 +90,15 @@ public class Ghrh_ResumeTemplateController : BaseController<IGhrh_ResumeTemplate
     public async Task<ServiceResult<Ghrh_ResumeInfoColumnDto>> QueryTemplateColumnSingle([FromBody] QueryForm filter) => await _service.QueryTemplateColumnSingle(filter);
 
     #endregion
+
+    #region 查询模板栏位
+    /// <summary>
+    /// 查询模板栏位
+    /// </summary>
+    /// <param name="filter"></param>
+    /// <returns></returns>
+    [HttpPost("PT_GHR30_StaffTemplate_IUD")]
+    public async Task<ServiceResult> PT_GHR30_StaffTemplate_IUD([FromBody] QueryForm1 filter) => await _service.PT_GHR30_StaffTemplate_IUD(filter);
+
+    #endregion
 }

Tiobon.Core.Api/Tiobon.Core.xml

@@ -1198,7 +1198,14 @@
         </member>
         <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryTemplateColumnSingle(Tiobon.Core.Common.QueryForm)">
             <summary>
-            获取分组数据
+            查询模板栏位
+            </summary>
+            <param name="filter"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.PT_GHR30_StaffTemplate_IUD(Tiobon.Core.Common.QueryForm1)">
+            <summary>
+            查询模板栏位
             </summary>
             <param name="filter"></param>
             <returns></returns>

Tiobon.Core.Common/Attribute/QueryFilter.cs

@@ -139,6 +139,21 @@ public class QueryForm
 
 }
 
+public class QueryForm1
+{
+    public string doType { get; set; }
+    public long? id { get; set; }
+    public int langId { get; set; }
+    public string menuName { get; set; }
+    public string token { get; set; }
+    public string procName { get; set; }
+    public string timestamp { get; set; }
+    public string userId { get; set; } 
+    public object jsonParam { get; set; }
+     
+
+}
+
 public class QueryExportField
 {
     public List<string> ExFields { get; set; }

Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs

@@ -24,5 +24,7 @@ namespace Tiobon.Core.IServices
 		Task<ServiceResult> ExceteTemplateColumnChange(QueryForm filter);
 
 		Task<ServiceResult<Ghrh_ResumeInfoColumnDto>> QueryTemplateColumnSingle(QueryForm filter);
+
+		Task<ServiceResult> PT_GHR30_StaffTemplate_IUD(QueryForm1 filter);
     }
 }

Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs

@@ -15,6 +15,8 @@
 *└──────────────────────────────────┘
 */
 
+using Tiobon.Core.Model.ViewModels.Extend;
+
 namespace Tiobon.Core.Model.Models;
 
 /// <summary>
@@ -31,7 +33,9 @@ public class Ghrh_ResumeInfoGroupDto : Ghrh_ResumeInfoGroup
     /// 修改信息
     /// </summary>
     public string UpdateDataInfo { get; set; }
+     
     public long ResumeInfoGroupID { get; set; }
+    public long ResumeTemplateInfoGroupID { get; set; }
     public string ResumeInfoGroupName { get; set; }
     public int editable { get; set; }
     public int removable { get; set; }
@@ -40,5 +44,5 @@ public class Ghrh_ResumeInfoGroupDto : Ghrh_ResumeInfoGroup
     public int configurable { get; set; }
     public int isDisplay { get; set; }
     public string GroupColumn1 { get; set; }
-    public List<Dictionary<string, object>> GroupColumn { get; set; }
+    public List<ResumeTemplateGroupColumn1> GroupColumn { get; set; }
 }

Tiobon.Core.Model/ViewModels/Extend/ResumeTemplateColumnMove.cs

@@ -2,7 +2,11 @@
 
 public class ResumeTemplateColumnMove
 {
-    public int DisplayType { get; set; }
+    public long ResumeInfoColumnID { get; set; }
+    public string ResumeInfoColumnName { get; set; }
     public int SortNo { get; set; }
-    public long StaffInfoColumnID { get; set; }
+    public int IsBuildIn { get; set; }
+    public int IsRequired { get; set; }
+    public int Removable { get; set; }
+    public int DisplayType { get; set; }
 }

Tiobon.Core.Model/ViewModels/Extend/ResumeTemplateGroupColumn.cs

@@ -10,3 +10,17 @@ public class ResumeTemplateGroupColumn
     public int Removable { get; set; }
     public int DisplayType { get; set; }
 }
+
+public class ResumeTemplateGroupColumn1
+{
+    public int CanModifyBySelf { get; set; }
+    public string ColumnType { get; set; }
+    public int SortNo { get; set; }
+    public string ResumeInfoColumnName { get; set; }
+    public string DataType { get; set; }
+    public int IsSingleColumn { get; set; }
+    public string Placeholder { get; set; }
+    public long ResumeInfoColumnId { get; set; }
+}
+
+

Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs

@@ -4,6 +4,7 @@ using Tiobon.Core.Model.Models;
 using Tiobon.Core.Services.BASE;
 using Tiobon.Core.IRepository.Base;
 using Tiobon.Core.Common.Caches;
+using Tiobon.Core.Common.Helper;
 
 namespace Tiobon.Core.Services
 {
@@ -19,5 +20,13 @@ namespace Tiobon.Core.Services
             base.BaseDal = dal;
             base._caching = caching;
         }
+
+        public override async Task<long> Add(InsertGhrh_ResumeInfoGroupInput entity)
+        {
+            entity.GroupType = entity.GroupType ?? "Other";
+            var SortNo = await Db.Queryable<Ghrh_ResumeInfoGroup>().MaxAsync(it => it.SortNo);
+            entity.SortNo = SortNo + 1;
+            return await base.Add(entity);
+        }
     }
 }

Tiobon.Core.Tasks/QuartzNet/Jobs/Job_StaffIn_Quartz.cs

@@ -21,7 +21,7 @@ public class Job_StaffIn_Quartz : JobBase, IJob
     }
     public async Task Run(IJobExecutionContext context)
     {
-        Console.WriteLine($"Job_StaffIn_Quartz 执行 {DateTime.Now.ToShortTimeString()}");
+        //Console.WriteLine($"Job_StaffIn_Quartz 执行 {DateTime.Now.ToShortTimeString()}");
         await _ghre_StudyRuleServices.StaffIn();
         // 也可以通过数据库配置，获取传递过来的参数
         JobDataMap data = context.JobDetail.JobDataMap;

Tiobon.Core/Tiobon.Core.xml

@@ -1198,7 +1198,14 @@
         </member>
         <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.QueryTemplateColumnSingle(Tiobon.Core.Common.QueryForm)">
             <summary>
-            获取分组数据
+            查询模板栏位
+            </summary>
+            <param name="filter"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrh_ResumeTemplateController.PT_GHR30_StaffTemplate_IUD(Tiobon.Core.Common.QueryForm1)">
+            <summary>
+            查询模板栏位
             </summary>
             <param name="filter"></param>
             <returns></returns>