证书管理、学员群组新增集团数据归属维护

master
xiaochanghai 4 weeks ago
parent 92f53b5bd1
commit 0389f06eed
  1. 6228
      Model/Tiobon.Web.pdm
  2. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_CertificateRule.Dto.Base.cs
  3. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs
  4. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_CertificateRule.cs
  5. 9
      Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs
  6. 1
      Tiobon.Core.Model/View/Ghre/Ghre_CertificateRule.Dto.View.cs
  7. 1
      Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs
  8. 2
      Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs
  9. 20
      Tiobon.Core/Tiobon.Core.Model.xml

File diff suppressed because it is too large Load Diff

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/5/20 11:29:11 SimonHsiao
*V0.01 2025/5/29 12:20:13 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -211,6 +211,11 @@ public class Ghre_CertificateRuleBase
/// </summary>
public int? IssueCompanyId { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
/// <summary>

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/2/18 14:11:44 SimonHsiao
*V0.01 2025/5/29 11:45:39 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -206,6 +206,11 @@ public class Ghre_StaffGroupBase
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
/// <summary>
/// 直间接
/// </summary>

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/5/20 11:29:11 SimonHsiao
*V0.01 2025/5/29 12:20:13 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -209,4 +209,9 @@ public class Ghre_CertificateRule : BasePoco
/// 颁发公司ID
/// </summary>
public int? IssueCompanyId { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
}

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/2/18 14:11:44 SimonHsiao
*V0.01 2025/5/29 11:45:39 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -20,7 +20,7 @@ namespace Tiobon.Core.Model.Models;
/// <summary>
/// 员工群组 (Model)
/// </summary>
[SugarTable("Ghre_StaffGroup", "Ghre_StaffGroup"), Entity(TableCnName = "员工群组", TableName = "Ghre_StaffGroup")]
[SugarTable("Ghre_StaffGroup", "Ghre_StaffGroup"), Entity(TableCnName = "Ghre_StaffGroup", TableName = "Ghre_StaffGroup")]
public class Ghre_StaffGroup : BasePoco
{
@ -206,4 +206,9 @@ public class Ghre_StaffGroup : BasePoco
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
}

@ -62,5 +62,6 @@ public class Ghre_CertificateRuleDto : Ghre_CertificateRule
public List<long?> CourseIds { get; set; } = new List<long?>();
public CertificateDesignerData CertificateDesignerData { get; set; } = new CertificateDesignerData();
public string DataBelongName { get; set; }
}

@ -104,4 +104,5 @@ public class Ghre_StaffGroupDto : Ghre_StaffGroup
public int MasterId { get; set; }
public string DataType { get; set; }
public string DataBelongName { get; set; }
}

@ -198,6 +198,8 @@ public class Ghre_StaffGroupServices : BaseServices<Ghre_StaffGroup, Ghre_StaffG
x.StaffType1 = string.Join(",", StaffType1s);
x.StaffType2 = string.Join(",", StaffType2s);
x.DataBelongName = await GetDataBelongName(x.DataBelongID);
});
if (zoneIds.Any())

@ -3025,6 +3025,11 @@
颁发公司ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateRuleBase.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateRuleBase.CourseSceneIds">
<summary>
课程场景ID
@ -8425,6 +8430,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroupBase.StaffType1s">
<summary>
直间接
@ -22702,6 +22712,11 @@
颁发公司ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CertificateRule.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_Config">
<summary>
参数配置 (Model)
@ -28062,6 +28077,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_StaffGroup.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecord">
<summary>
培训记录 (Model)

Loading…
Cancel
Save