From 03ec46c24f5f56ab98450d4f60175f218ebc4c96 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 17 Dec 2024 15:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E4=BA=BA=E5=8A=9B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/CommonServices.cs        | 23 +++++++++++++++++++
 .../Ghrh/Ghrh_YearHumanApplyOrderServices.cs  |  1 +
 .../Ghrh/Ghrh_YearHumanSettingsServices.cs    |  5 +++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 9c25d0a6..54bdf24e 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -3503,6 +3503,29 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                         string json = param.jsonParam.ToString();
                         var dict = JsonHelper.JsonToObj<InsertGhrh_YearHumanApplyOrderInput>(json);
                         var dict1 = JsonHelper.JsonToObj<Ghrh_YearHumanApplyOrder>(json);
+
+                        #region 校验数据是否重复
+                        dict.Items.ForEach(x =>
+                        {
+                            x.Year = dict1.Year;
+                        });
+                        for (int i = 0; i < dict.Items.Count; i++)
+                        {
+                            var item = dict.Items[i];
+                            if (item.TitleId.IsNullOrEmpty())
+                                return ServiceResult.OprateFailed($"第{i + 1}行，岗位不可为空");
+                            if (item.JobId.IsNullOrEmpty())
+                                return ServiceResult.OprateFailed($"第{i + 1}行，职称不可为空");
+                            if (item.GradeId.IsNullOrEmpty())
+                                return ServiceResult.OprateFailed($"第{i + 1}行，职等不可为空");
+
+                            if (await Db.Queryable<Ghrh_YearHumanSettings>().AnyAsync(x => x.Year == item.Year && x.JobId == item.JobId && x.GradeId == item.GradeId && x.JobId == item.GradeId))
+                                return ServiceResult.OprateFailed($" {item.Year}年度，已存在相同岗位、职等、职称数据！");
+                        }
+                        #endregion
+
+
+
                         dict1.ApplicantId = GetStaffId();
                         dict1.ApplicantTime = DateTime.Now;
                         id = await Db.Insertable(dict1).ExecuteReturnSnowflakeIdAsync();
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs
index deb036e1..e7cffb7a 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs
@@ -23,4 +23,5 @@ public class Ghrh_YearHumanApplyOrderServices : BaseServices<Ghrh_YearHumanApply
         return ServiceResult<Ghrh_YearHumanApplyOrderDto>.OprateSuccess("查询成功！", entity);
 
     }
+
 }
\ No newline at end of file
diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs
index 38f3f05b..78bc4b76 100644
--- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs
+++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs
@@ -26,6 +26,9 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
     {
         entity.WorkState = 1;
 
+        if (await Db.Queryable<Ghrh_YearHumanSettings>().AnyAsync(x => x.Year == entity.Year && x.JobId == entity.JobId && x.GradeId == entity.GradeId && x.JobId == entity.GradeId))
+            throw new Exception($" {entity.Year}年度，已存在相同岗位、职等、职称数据！");
+
         var result = await base.Add(entity);
 
         return result;
@@ -559,7 +562,7 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
         NPOIHelper.ExportExcel(dt, body.exportSet.TitleName, "年度人力配置", physicsPath + path);
 
         var result = new ExcelData();
-        result.filePath = "/Advanced"+ path;
+        result.filePath = "/Advanced" + path;
         result.fileName = body.exportSet.TitleName + ".xlsx";
         return ServiceResult<ExcelData>.OprateSuccess("导出成功", result);
     }