Simon
/
Tiobon.Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人证对照表新增Excel导入,新增手动录入

Browse Source
master
xiaochanghai 6 months ago
parent 22fee85c40
commit 093743bbac
6 changed files with 182 additions and 156 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. BIN
      Tiobon.Core.Api/wwwroot/files/import/1871744379090243584/Ghre_Certificate.xlsx
  3. 21
      Tiobon.Core.Model/Base/Ghre/Ghre_Certificate.Dto.Base.cs
  4. 15
      Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs
  5. 6
      Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs
  6. 18
      Tiobon.Core/Tiobon.Core.Model.xml

18
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -2202,7 +2202,12 @@
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_CertificateBase">
<summary>
培训记录 (Dto.Base)
培训证书 (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.CertificateRuleId">
<summary>
培训证书规则ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.StaffId">
@ -2247,7 +2252,7 @@
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.AwardSource">
<summary>
颁发来源
颁奖来源
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.RemarkSz">
@ -15718,7 +15723,12 @@
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_Certificate">
<summary>
培训记录 (Model)
培训证书 (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.CertificateRuleId">
<summary>
培训证书规则ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.StaffId">
@ -15763,7 +15773,7 @@
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.AwardSource">
<summary>
颁发来源
颁奖来源
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.RemarkSz">

BIN
Tiobon.Core.Api/wwwroot/files/import/1871744379090243584/Ghre_Certificate.xlsx
View File

Binary file not shown.

21
Tiobon.Core.Model/Base/Ghre/Ghre_Certificate.Dto.Base.cs
Unescape View File

@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
*V0.01 2024/7/16 16:52:58 SimonHsiao 初版
*V0.01 2024/12/25 10:29:10 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@ -14,17 +14,19 @@
*│　作者：SimonHsiao │
*└──────────────────────────────────┘
*/
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace Tiobon.Core.Model.Models;
namespace Tiobon.Core.Model.Models
/// <summary>
/// 培训证书 (Dto.Base)
/// </summary>
public class Ghre_CertificateBase
{
/// <summary>
/// 培训记录 (Dto.Base)
/// 培训证书规则ID
/// </summary>
public class Ghre_CertificateBase
{
public long? CertificateRuleId { get; set; }
/// <summary>
/// 员工ID
@ -70,9 +72,9 @@ namespace Tiobon.Core.Model.Models
public DateTime? ValidityPeriodTime { get; set; }
/// <summary>
/// 颁发来源
/// 颁奖来源
/// </summary>
[Display(Name = "AwardSource"), Description("颁发来源"), MaxLength(32, ErrorMessage = "颁发来源 不能超过 32 个字符")]
[Display(Name = "AwardSource"), Description("颁奖来源"), MaxLength(32, ErrorMessage = "颁奖来源 不能超过 32 个字符")]
public string AwardSource { get; set; }
/// <summary>
@ -155,5 +157,4 @@ namespace Tiobon.Core.Model.Models
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
}
}

15
Tiobon.Core.Model/Models/Ghre/Ghre_Certificate.cs
Unescape View File

@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
*V0.01 2024/7/16 16:52:58 SimonHsiao 初版
*V0.01 2024/12/25 10:29:10 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@ -18,12 +18,17 @@ namespace Tiobon.Core.Model.Models;
/// <summary>
/// 培训记录 (Model)
/// 培训证书 (Model)
/// </summary>
[SugarTable("Ghre_Certificate", "Ghre_Certificate"), Entity(TableCnName = "培训记录", TableName = "Ghre_Certificate")]
[SugarTable("Ghre_Certificate", "Ghre_Certificate"), Entity(TableCnName = "Ghre_Certificate", TableName = "Ghre_Certificate")]
public class Ghre_Certificate : BasePoco
{
/// <summary>
/// 培训证书规则ID
/// </summary>
public long? CertificateRuleId { get; set; }
/// <summary>
/// 员工ID
/// </summary>
@ -68,9 +73,9 @@ public class Ghre_Certificate : BasePoco
public DateTime? ValidityPeriodTime { get; set; }
/// <summary>
/// 颁发来源
/// 颁奖来源
/// </summary>
[Display(Name = "AwardSource"), Description("颁发来源"), MaxLength(32, ErrorMessage = "颁发来源 不能超过 32 个字符")]
[Display(Name = "AwardSource"), Description("颁奖来源"), MaxLength(32, ErrorMessage = "颁奖来源 不能超过 32 个字符")]
public string AwardSource { get; set; }
/// <summary>

6
Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs
Unescape View File

@ -171,7 +171,7 @@ public class Ghre_CertificateServices : BaseServices<Ghre_Certificate, Ghre_Cert
var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffNo == StaffNo && x.StaffName == StaffName).FirstAsync();
if (staff == null)
{
comments.Add($"未查询到搞员工，工号或姓名填写错误！");
comments.Add($"未查询到该员工，工号或姓名填写错误！");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
@ -195,9 +195,9 @@ public class Ghre_CertificateServices : BaseServices<Ghre_Certificate, Ghre_Cert
isExistError = true;
continue;
}
//if (await base.AnyAsync(x => x.CertificateRuleId == rule.Id && x.StaffId == ClassNo))
//if (await base.AnyAsync(x => x.CertificateRuleId == rule.Id && x.StaffId == staff.StaffID && x.CourseId == course.Id))
//{
// comments.Add($"系统已存在相同编号名称人证对照表数据！");
// comments.Add($"系统已存在相同证照数据！");
// data.ErrorCount++;
// dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
// isExistError = true;

18
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -2202,7 +2202,12 @@
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_CertificateBase">
<summary>
培训记录 (Dto.Base)
培训证书 (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.CertificateRuleId">
<summary>
培训证书规则ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.StaffId">
@ -2247,7 +2252,7 @@
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.AwardSource">
<summary>
颁发来源
颁奖来源
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateBase.RemarkSz">
@ -15718,7 +15723,12 @@
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_Certificate">
<summary>
培训记录 (Model)
培训证书 (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.CertificateRuleId">
<summary>
培训证书规则ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.StaffId">
@ -15763,7 +15773,7 @@
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.AwardSource">
<summary>
颁发来源
颁奖来源
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Certificate.RemarkSz">

Write Preview
Loading…
Cancel
Save