From 850a4ea27a45ff2b96ca9b99e2ab159aafddb766 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Fri, 18 Apr 2025 18:27:31 +0800
Subject: [PATCH] 1

---
 .../Ghre/Ghre_DaySalaryEntry_BoltoneController.cs      |  5 ++++-
 .../Ghrh/Ghrh_OfferApplyOrderServices.cs               |  2 +-
 Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs       |  2 +-
 Tiobon.Core/Tiobon.Core.Model.xml                      | 10 ++++++++++
 Tiobon.Core/Tiobon.Core.xml                            |  7 +++++++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_DaySalaryEntry_BoltoneController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_DaySalaryEntry_BoltoneController.cs
index c112fc56..0aa02ad8 100644
--- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_DaySalaryEntry_BoltoneController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_DaySalaryEntry_BoltoneController.cs
@@ -21,8 +21,11 @@ public class Ghre_DaySalaryEntry_BoltoneController : BaseController<IGhre_DaySal
     public override async Task<ServiceResult<string>> Insert([FromBody] InsertGhre_DaySalaryEntry_BoltoneInput insertModel)
     {
         insertModel.SubmitDate = DateTime.Now;
+
+        if (await _service.AnyAsync(x => x.IDNo == insertModel.IDNo && x.SubmitDate.Value.Date == DateTime.Now.Date))
+            return Success<string>(null, "提交成功");
         var id = await _service.Add(insertModel);
-        var data = Success<string>(null, "新增成功");
+        var data = Success<string>(null, "提交成功");
         data.Success = id > 0;
         if (data.Success)
             data.Data = id.ObjToString();
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
index b16f24a2..91051214 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
@@ -149,7 +149,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices<Ghrh_OfferApplyOrder, G
 
                 SET @ErrorMsg = NULL;
 
-                EXEC  @return_value = GHR30.dbo.[PT_GHR30_FlowApply] 
+                EXEC  @return_value = dbo.[PT_GHR30_FlowApply] 
                     @ID = {id},
                     @FlowID = {@FlowID},
                     @UserID = {App.User.ID},
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
index 1bbef845..1a8e43d6 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
@@ -5093,7 +5093,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
 
                     sql = @$"DECLARE @return_value int;
 
-                        EXEC  @return_value = GHR30.dbo.[PA_NewStaff] 
+                        EXEC  @return_value = dbo.[PA_NewStaff] 
                             @StaffID = {staffId};
 
                         SELECT @return_value as N'@Return Value';";
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 986e38d3..d8c9ee9e 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -14670,6 +14670,11 @@
             考核期间 (Dto.Base)
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodBase.YYYY">
+            <summary>
+            年度
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodBase.PeriodNo">
             <summary>
             期间编号
@@ -32577,6 +32582,11 @@
             考核期间 (Model)
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghrp_PerformancePeriod.YYYY">
+            <summary>
+            年度
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.Models.Ghrp_PerformancePeriod.PeriodNo">
             <summary>
             期间编号
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index 70c3d1a8..dcf7e246 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -2197,6 +2197,13 @@
             考核期间(Controller)
             </summary>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghrp_PerformancePeriodController.BatchCreatePeriod(Newtonsoft.Json.Linq.JObject)">
+            <summary>
+            批量展开
+            </summary>
+            <param name="Stage">阶段</param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghrp_PerformancePeriodTypeController">
             <summary>
             考核周期类别(Controller)