Merge branch 'master' of http://git.tiobon.com/Simon/Tiobon.Web.Core

Tiobon.Core.Api/Controllers/Ghrp/Ghrp_PerformancePeriodTypeController.cs

@@ -11,4 +11,13 @@ public class Ghrp_PerformancePeriodTypeController : BaseController<IGhrp_Perform
     public Ghrp_PerformancePeriodTypeController(IGhrp_PerformancePeriodTypeServices service) : base(service)
     {
     }
+    #region 成绩
+    /// <summary>
+    /// 根据阶段数 获取对应阶段名称
+    /// </summary>
+    /// <param name="Stage">阶段</param>
+    /// <returns></returns>
+    [HttpPost, Route("GetStageItems/{Stage}")]
+    public async Task<ServiceResult<List<string>>> GetStageItems(string Stage) => await _service.GetStageItems(Stage);
+    #endregion
 }

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

@@ -14745,6 +14745,11 @@
             内置
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodTypeBase.StageItems_List">
+            <summary>
+            考核阶段名称
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrs_AttachmentBase">
             <summary>
             Ghrs_Attachment (Dto.Base)
@@ -37243,6 +37248,11 @@
             修改信息
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodTypeDto.StageItems_List">
+            <summary>
+            考核阶段名称
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghrs_AttachmentDto">
             <summary>
             Ghrs_Attachment(Dto.View)

Tiobon.Core.Api/Tiobon.Core.xml

@@ -2185,6 +2185,13 @@
             考核周期类别(Controller)
             </summary>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrp_PerformancePeriodTypeController.GetStageItems(System.String)">
+            <summary>
+            根据阶段数 获取对应阶段名称
+            </summary>
+            <param name="Stage">阶段</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghrs_AttachmentController">
             <summary>
             Ghrs_Attachment(Controller)

Tiobon.Core.Extensions/ServiceExtensions/SwaggerSetup.cs

@@ -215,6 +215,16 @@ public static class SwaggerSetup
                 Description = "培训模块..."
             }
         }, new SwaggerApiInfo
+        {
+            UrlPrefix = Grouping.GroupName_Ghrp,
+            Name = "绩效模块",
+            OpenApiInfo = new OpenApiInfo
+            {
+                Version = version,
+                Title = "绩效模块",
+                Description = "绩效模块..."
+            }
+        }, new SwaggerApiInfo
         {
             UrlPrefix = Grouping.GroupName_Ghrh,
             Name = "招聘模块",
@@ -296,7 +306,7 @@ public static class SwaggerSetup
         /// </summary>
         public const string GroupName_Ghre = " ghre";
         /// <summary>
-        /// 培训模块
+        /// 绩效模块
         /// </summary>
         public const string GroupName_Ghrp = "ghrp";
 

Tiobon.Core.IServices/Ghrp/IGhrp_PerformancePeriodTypeServices.cs

@@ -1,4 +1,5 @@
 using Tiobon.Core.IServices.BASE;
+using Tiobon.Core.Model;
 using Tiobon.Core.Model.Models;
 
 namespace Tiobon.Core.IServices
@@ -8,5 +9,6 @@ namespace Tiobon.Core.IServices
 	/// </summary>	
     public interface IGhrp_PerformancePeriodTypeServices :IBaseServices<Ghrp_PerformancePeriodType, Ghrp_PerformancePeriodTypeDto, InsertGhrp_PerformancePeriodTypeInput, EditGhrp_PerformancePeriodTypeInput>
 	{
+        Task<ServiceResult<List<string>>> GetStageItems(string Stage);
     }
 }

Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformancePeriodType.Dto.Base.cs

@@ -13,7 +13,7 @@
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
-*/ 
+*/
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -151,5 +151,10 @@ namespace Tiobon.Core.Model.Models
         /// 内置
         /// </summary>
         public int? BuiltIn { get; set; }
+         
+        /// <summary>
+        /// 考核阶段名称
+        /// </summary>
+        public List<string> StageItems_List { get; set; }
     }
 }

Tiobon.Core.Model/View/Ghrp/Ghrp_PerformancePeriodType.Dto.View.cs

@@ -13,22 +13,28 @@
 *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
 *│　作者：SimonHsiao                                                  │
 *└──────────────────────────────────┘
-*/ 
+*/
 
 namespace Tiobon.Core.Model.Models;
 
+
 /// <summary>
 /// 考核周期类别(Dto.View1)
 /// </summary>
 public class Ghrp_PerformancePeriodTypeDto : Ghrp_PerformancePeriodType
 {
-/// <summary>
-/// 创建信息
-/// </summary>
-public string CreateDataInfo { get; set; }
+    /// <summary>
+    /// 创建信息
+    /// </summary>
+    public string CreateDataInfo { get; set; }
 
-/// <summary>
-/// 修改信息
-/// </summary>
-public string UpdateDataInfo { get; set; }
+    /// <summary>
+    /// 修改信息
+    /// </summary>
+    public string UpdateDataInfo { get; set; }
+
+    /// <summary>
+    /// 考核阶段名称
+    /// </summary>
+    public List<string> StageItems_List { get; set; }
 }

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -1,4 +1,6 @@
-namespace Tiobon.Core.Services.BASE;
+using System.Data;
+
+namespace Tiobon.Core.Services.BASE;
 
 /// <summary>
 /// 增删改查基础服务
@@ -1337,7 +1339,7 @@ WHERE     ParaMasterId IN (SELECT ParaMasterId
                                                    'GHRPara',
                                                    'Train',
                                                    'Resume',
-                                                   'GHRAttend'))
+                                                   'GHRAttend','Performance'))
       AND IsEnable = 1
 ORDER BY SortNo ASC";
             list = DbAccess.QueryList<Ghrs_ParaDetail>(sql);
@@ -1377,6 +1379,25 @@ ORDER BY SortNo ASC";
         return list;
     }
 
+    public async Task<string> GetParaLabelListString(string ParaTypeNo, string ParaMasterNo, string value)
+    {
+        string label = value;
+
+        if (value.IsNullOrEmpty())
+            return null;
+
+        string sql = $@"SELECT [dbo].[FLangKeyToValue](mkey,1,ParaDetailName) ParaDetailName
+FROM Ghrs_ParaDetail
+where IsEnable=1
+  and ParaTypeNo = '{ParaTypeNo}'
+  and ParaMasterNo = '{ParaMasterNo}'
+  and ParaDetailNo in (select value from Openjson('{value}'))
+ORDER BY SortNo ASC";
+         var list =  DbAccess.QueryList<Ghrs_ParaDetail>(sql);
+         
+        label = string.Join(",", list.Select(o => o.ParaDetailName));
+        return label;
+    }
 
     public async Task<string> GetParaLabel(int? id)
     {

Tiobon.Core.Services/Ghrp/Ghrp_PerformancePeriodTypeServices.cs

@@ -4,12 +4,13 @@ using Tiobon.Core.Model.Models;
 using Tiobon.Core.Services.BASE;
 using Tiobon.Core.IRepository.Base;
 using Tiobon.Core.Common.Caches;
+using Tiobon.Core.Common.DB.Dapper.Extensions;
 
 namespace Tiobon.Core.Services
 {
-	/// <summary>
-	/// 考核周期类别 (服务)
-	/// </summary>
+    /// <summary>
+    /// 考核周期类别 (服务)
+    /// </summary>
     public class Ghrp_PerformancePeriodTypeServices : BaseServices<Ghrp_PerformancePeriodType, Ghrp_PerformancePeriodTypeDto, InsertGhrp_PerformancePeriodTypeInput, EditGhrp_PerformancePeriodTypeInput>, IGhrp_PerformancePeriodTypeServices
     {
         private readonly IBaseRepository<Ghrp_PerformancePeriodType> _dal;
@@ -19,5 +20,56 @@ namespace Tiobon.Core.Services
             base.BaseDal = dal;
             base._caching = caching;
         }
+        public override async Task<ServicePageResult<Ghrp_PerformancePeriodTypeDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
+        {
+
+            var result = await base.QueryFilterPage(filter, condition, IsEnable);
+
+            result.result.DT_TableDataT1.ForEach(async x =>
+            {
+                x.Stage = await GetParaLabel("PerformanceStage", x.Stage);
+                x.StageItems = await GetParaLabelListString("Performance", "PerformanceStageItem", x.StageItems);
+            });
+            
+            return result;
+        }
+
+        public override async Task<long> Add(InsertGhrp_PerformancePeriodTypeInput entity)
+        {
+            if (entity.StageItems_List != null)
+                entity.StageItems = JsonHelper.ObjToJson(entity.StageItems_List);
+            var result = await base.Add(entity);
+
+            return result;
+        }
+
+        public override async Task<bool> Update(long Id, EditGhrp_PerformancePeriodTypeInput editModel)
+        {
+            if (editModel.StageItems_List != null)
+                editModel.StageItems = JsonHelper.ObjToJson(editModel.StageItems_List);
+            var result = await base.Update(Id, editModel, null, ["Status"]);
+            return result;
+        }
+
+        public override async Task<ServiceFormResult<Ghrp_PerformancePeriodTypeDto>> QueryForm(QueryForm body)
+        {
+            var result = await base.QueryForm(body);
+
+            var StageItems = result.result.DT_TableDataT1[0].StageItems;
+            if (!string.IsNullOrWhiteSpace(StageItems))
+                result.result.DT_TableDataT1[0].StageItems_List = JsonConvert.DeserializeObject<List<string>>(StageItems);
+
+            return result;
+        }
+
+        public  async Task<ServiceResult<List<string>>> GetStageItems(string Stage)
+        {
+            List<string> StageItmes = [];
+            if (Stage == "1Q1C") StageItmes = new List<string> { "C" };
+            if (Stage == "1Q2C") StageItmes = new List<string> { "A","C" };  
+            if (Stage == "1Q3C") StageItmes = new List<string> { "A", "B","C" };
+
+            return ServiceResult<List<string>>.OprateSuccess("查询成功！", StageItmes);
+        }
     }
 }