讲师等级异动新增集团数据归属维护

master
xiaochanghai 3 weeks ago
parent 0952e01c1e
commit 5c1b6fd1dc
  1. 5763
      Model/Tiobon.Web.pdm
  2. 19
      Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs
  3. 21
      Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs
  4. 1
      Tiobon.Core.Model/View/Ghre/Ghre_TeacherChange.Dto.View.cs
  5. 5
      Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs
  6. 32
      Tiobon.Core/Tiobon.Core.Model.xml

File diff suppressed because it is too large Load Diff

@ -6,9 +6,9 @@
*
* Ver
*
*V0.01 2024/9/26 16:09:52 SimonHsiao
*V0.01 2025/5/29 17:07:25 SimonHsiao
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
*  
* SimonHsiao
@ -155,11 +155,6 @@ public class Ghre_TeacherChangeBase
[Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")]
public string ApplyReason { get; set; }
/// <summary>
/// 发起人
/// </summary>
public long? SponsorId { get; set; }
/// <summary>
/// 状态
/// </summary>
@ -321,4 +316,14 @@ public class Ghre_TeacherChangeBase
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 发起人
/// </summary>
public int? SponsorId { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
}

@ -6,9 +6,9 @@
*
* Ver
*
*V0.01 2024/9/26 16:09:52 SimonHsiao
*V0.01 2025/5/29 17:07:25 SimonHsiao
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
*  
* SimonHsiao
@ -48,7 +48,7 @@ public class Ghre_TeacherChange : BasePoco
/// <summary>
/// 原调动日期
/// </summary>
/// </summary>
public DateTime? OriginChangeDate { get; set; }
/// <summary>
@ -162,11 +162,6 @@ public class Ghre_TeacherChange : BasePoco
[Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
public string Status { get; set; }
/// <summary>
/// 发起人
/// </summary>
public long? SponsorId { get; set; }
/// <summary>
/// 默认标志
/// </summary>
@ -322,4 +317,14 @@ public class Ghre_TeacherChange : BasePoco
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 发起人
/// </summary>
public int? SponsorId { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
}

@ -46,4 +46,5 @@ public class Ghre_TeacherChangeDto : Ghre_TeacherChange
public string ChangeDate1 { get; set; }
public List<Ghre_TeacherChangeAttachmentDto> TeacherAttachments { get; set; }
public string DataBelongName { get; set; }
}

@ -58,7 +58,7 @@ public class Ghre_TeacherChangeServices : BaseServices<Ghre_TeacherChange, Ghre_
var value = jProperty.Value.ToString();
if (name == "page" || name == "pageSize")
continue;
if (!string.IsNullOrWhiteSpace(value))
conditions = DealConditions(condition, name, value);
}
@ -68,6 +68,8 @@ public class Ghre_TeacherChangeServices : BaseServices<Ghre_TeacherChange, Ghre_
else if (IsEnable == false)
sql += " WHERE IsEnable = 0";
conditions += $" AND dbo.FUserDataBelongPriv ({App.User.ID}, DataBelongID, NULL) = 1";
if (!string.IsNullOrWhiteSpace(condition))
conditions += " AND " + condition;
@ -97,6 +99,7 @@ public class Ghre_TeacherChangeServices : BaseServices<Ghre_TeacherChange, Ghre_
x.TeacherName = teacher?.TeacherName;
x.OriginChangeDate1 = DateTimeHelper.ConvertToDayString(x.OriginChangeDate);
x.ChangeDate1 = DateTimeHelper.ConvertToDayString(x.ChangeDate);
x.DataBelongName = await GetDataBelongName(x.DataBelongID);
});
return new ServicePageResult<Ghre_TeacherChangeDto>(filter.pageNum, total, filter.pageSize, data);

@ -10780,11 +10780,6 @@
申请理由
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChangeBase.SponsorId">
<summary>
发起人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChangeBase.Status">
<summary>
状态
@ -10930,6 +10925,16 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChangeBase.SponsorId">
<summary>
发起人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChangeBase.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_TeacherChangeAttachmentBase">
<summary>
培训讲师异动附件 (Dto.Base)
@ -30320,7 +30325,7 @@
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.OriginChangeDate">
<summary>
原调动日期
</summary>
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.ChangeDate">
<summary>
@ -30417,11 +30422,6 @@
状态
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.SponsorId">
<summary>
发起人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.IsDefault">
<summary>
默认标志
@ -30562,6 +30562,16 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.SponsorId">
<summary>
发起人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherChange.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_TeacherChangeAttachment">
<summary>
培训讲师异动附件 (Model)

Loading…
Cancel
Save