讲师维护新增集团数据归属维护

master
xiaochanghai 4 weeks ago
parent b1cea51862
commit 0952e01c1e
  1. 7221
      Model/Tiobon.Web.pdm
  2. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs
  3. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs
  4. 1
      Tiobon.Core.Model/View/Ghre/Ghre_Teacher.Dto.View.cs
  5. 4
      Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs
  6. 10
      Tiobon.Core/Tiobon.Core.Model.xml

File diff suppressed because it is too large Load Diff

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/3/7 11:21:46 SimonHsiao *V0.01 2025/5/29 16:50:05 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -286,4 +286,9 @@ public class Ghre_TeacherBase
/// 失效日期 /// 失效日期
/// </summary> /// </summary>
public DateTime? ExpirationDate { get; set; } public DateTime? ExpirationDate { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/3/7 11:21:46 SimonHsiao *V0.01 2025/5/29 16:50:04 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -287,4 +287,9 @@ public class Ghre_Teacher : BasePoco
/// 失效日期 /// 失效日期
/// </summary> /// </summary>
public DateTime? ExpirationDate { get; set; } public DateTime? ExpirationDate { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
} }

@ -39,4 +39,5 @@ public class Ghre_TeacherDto : Ghre_Teacher
public string GenderLabel { get; set; } public string GenderLabel { get; set; }
public List<Ghre_TeacherAttachmentDto> TeacherAttachments { get; set; } public List<Ghre_TeacherAttachmentDto> TeacherAttachments { get; set; }
public string DataBelongName { get; set; }
} }

@ -79,7 +79,7 @@ FROM (SELECT A.*,
if (!string.IsNullOrWhiteSpace(condition)) if (!string.IsNullOrWhiteSpace(condition))
conditions += " AND " + condition; conditions += " AND " + condition;
conditions += $" AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1";
if (filter.jsonParam != null) if (filter.jsonParam != null)
foreach (JProperty jProperty in filter.jsonParam.Properties()) foreach (JProperty jProperty in filter.jsonParam.Properties())
{ {
@ -155,7 +155,7 @@ FROM (SELECT A.*,
x.TeacherTypeLabel = await GetParaLabel("TrainingTeacherType", x.TeacherType); x.TeacherTypeLabel = await GetParaLabel("TrainingTeacherType", x.TeacherType);
x.TeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.TeacherLevel); x.TeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.TeacherLevel);
x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == x.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == x.DeptID)?.DeptName; x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == x.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == x.DeptID)?.DeptName;
x.DataBelongName = await GetDataBelongName(x.DataBelongID);
}); });
return data; return data;
} }

@ -10550,6 +10550,11 @@
失效日期 失效日期
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachmentBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachmentBase">
<summary> <summary>
Ghre_TeacherAttachment (Dto.Base) Ghre_TeacherAttachment (Dto.Base)
@ -30177,6 +30182,11 @@
失效日期 失效日期
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachment"> <member name="T:Tiobon.Core.Model.Models.Ghre_TeacherAttachment">
<summary> <summary>
Ghre_TeacherAttachment (Model) Ghre_TeacherAttachment (Model)

Loading…
Cancel
Save