年度人力配置 新增数据重复验证

master
xiaochanghai 6 months ago
parent 7c0a3155ea
commit 03ec46c24f
  1. 23
      Tiobon.Core.Services/CommonServices.cs
  2. 1
      Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs
  3. 5
      Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs

@ -3503,6 +3503,29 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
string json = param.jsonParam.ToString(); string json = param.jsonParam.ToString();
var dict = JsonHelper.JsonToObj<InsertGhrh_YearHumanApplyOrderInput>(json); var dict = JsonHelper.JsonToObj<InsertGhrh_YearHumanApplyOrderInput>(json);
var dict1 = JsonHelper.JsonToObj<Ghrh_YearHumanApplyOrder>(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.ApplicantId = GetStaffId();
dict1.ApplicantTime = DateTime.Now; dict1.ApplicantTime = DateTime.Now;
id = await Db.Insertable(dict1).ExecuteReturnSnowflakeIdAsync(); id = await Db.Insertable(dict1).ExecuteReturnSnowflakeIdAsync();

@ -23,4 +23,5 @@ public class Ghrh_YearHumanApplyOrderServices : BaseServices<Ghrh_YearHumanApply
return ServiceResult<Ghrh_YearHumanApplyOrderDto>.OprateSuccess("查询成功!", entity); return ServiceResult<Ghrh_YearHumanApplyOrderDto>.OprateSuccess("查询成功!", entity);
} }
} }

@ -26,6 +26,9 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
{ {
entity.WorkState = 1; 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); var result = await base.Add(entity);
return result; return result;
@ -559,7 +562,7 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
NPOIHelper.ExportExcel(dt, body.exportSet.TitleName, "年度人力配置", physicsPath + path); NPOIHelper.ExportExcel(dt, body.exportSet.TitleName, "年度人力配置", physicsPath + path);
var result = new ExcelData(); var result = new ExcelData();
result.filePath = "/Advanced"+ path; result.filePath = "/Advanced" + path;
result.fileName = body.exportSet.TitleName + ".xlsx"; result.fileName = body.exportSet.TitleName + ".xlsx";
return ServiceResult<ExcelData>.OprateSuccess("导出成功", result); return ServiceResult<ExcelData>.OprateSuccess("导出成功", result);
} }

Loading…
Cancel
Save