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

培训需求新增 培训天数（牛尾需求）

Browse Source
master
xiaochanghai 4 months ago
parent 1edf72038d
commit 66dc75b5b0
10 changed files with 7780 additions and 4327 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. 12007
      Model/Tiobon.Web.pdm
  2. 25
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 6
      Tiobon.Core.Common/Helper/StringHelper.cs
  4. 5
      Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs
  5. 10
      Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
  6. 5
      Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs
  7. 10
      Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
  8. 6
      Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs
  9. 8
      Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
  10. 25
      Tiobon.Core/Tiobon.Core.Model.xml

12007
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

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

@ -2675,11 +2675,6 @@
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseBase.CourseClassId2">
<summary>
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseBase.CourseSceneId">
<summary>
课程场景ID
@ -5260,6 +5255,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.TrainDays">
<summary>
培训天数
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
<summary>
必选修查询 (Dto.Base)
@ -16651,11 +16651,6 @@
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Course.CourseClassId2">
<summary>
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Course.CourseSceneId">
<summary>
课程场景ID
@ -19236,6 +19231,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.TrainDays">
<summary>
培训天数
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
<summary>
必选修查询 (Model)
@ -28387,6 +28387,11 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestDto.TotalTrainDays">
<summary>
合计天数
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseDto">
<summary>
必选修查询(Dto.View)

6
Tiobon.Core.Common/Helper/StringHelper.cs
Unescape View File

@ -149,7 +149,11 @@ public class StringHelper
{
return TrimDecimalString(value.ToString());
}
public static string TrimDecimalString(decimal? value)
{
if (value is null) return "";
return TrimDecimalString(value.ToString());
}
/// <summary>
/// 格式化数字字符，并保留指定的小数位
/// </summary>

5
Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs
Unescape View File

@ -41,11 +41,6 @@ public class Ghre_CourseBase
[Display(Name = "CourseClassId"), Description("课程分类ID"), MaxLength(2000, ErrorMessage = "课程分类ID 不能超过 2000 个字符")]
public string CourseClassId { get; set; }
/// <summary>
/// 课程分类ID
/// </summary>
public long? CourseClassId2 { get; set; }
/// <summary>
/// 课程场景ID
/// </summary>

10
Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
Unescape View File

@ -6,9 +6,9 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
*V0.01 2024/9/12 13:18:47 SimonHsiao 初版
*V0.01 2025/2/8 9:57:16 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　作者：SimonHsiao │
@ -293,4 +293,10 @@ public class Ghre_RequestBase
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 培训天数
/// </summary>
[Display(Name = "TrainDays"), Description("培训天数"), Column(TypeName = "decimal(20,2)")]
public decimal? TrainDays { get; set; }
}

5
Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs
Unescape View File

@ -42,11 +42,6 @@ public class Ghre_Course : BasePoco
[Display(Name = "CourseClassId"), Description("课程分类ID"), MaxLength(2000, ErrorMessage = "课程分类ID 不能超过 2000 个字符")]
public string CourseClassId { get; set; }
/// <summary>
/// 课程分类ID
/// </summary>
public long? CourseClassId2 { get; set; }
/// <summary>
/// 课程场景ID
/// </summary>

10
Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
Unescape View File

@ -6,9 +6,9 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
*V0.01 2024/9/12 13:18:47 SimonHsiao 初版
*V0.01 2025/2/8 9:57:16 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　作者：SimonHsiao │
@ -294,4 +294,10 @@ public class Ghre_Request : BasePoco
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 培训天数
/// </summary>
[Display(Name = "TrainDays"), Description("培训天数"), Column(TypeName = "decimal(20,2)")]
public decimal? TrainDays { get; set; }
}

6
Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs
Unescape View File

@ -59,7 +59,11 @@ public class Ghre_RequestDto : Ghre_Request
public string DeptNo { get; set; }
public string TrainStaffId1 { get; set; }
public string SponsorNo { get; set; }
/// <summary>
/// 合计天数
/// </summary>
public string TotalTrainDays { get; set; } = "0";
}

8
Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
Unescape View File

@ -1,4 +1,5 @@
using Mapster;
using Microsoft.IdentityModel.Tokens;
using Serilog;
using static Tiobon.Core.Model.Consts;
@ -83,6 +84,13 @@ FROM Ghre_Request A
if (x.WorkState == 0) x.WorkStateLabel = "审批中";
if (x.WorkState == 1) x.WorkStateLabel = "审批通过";
}
if (x.RequestNum.IsNotEmptyOrNull() && x.RequestNum > 0)
if (x.TrainDays.IsNotEmptyOrNull() && x.TrainDays > 0)
{
var TotalTrainDays = x.TrainDays * x.RequestNum;
x.TotalTrainDays = StringHelper.TrimDecimalString(TotalTrainDays);
}
});
return result;

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

@ -2675,11 +2675,6 @@
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseBase.CourseClassId2">
<summary>
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseBase.CourseSceneId">
<summary>
课程场景ID
@ -5260,6 +5255,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.TrainDays">
<summary>
培训天数
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
<summary>
必选修查询 (Dto.Base)
@ -16651,11 +16651,6 @@
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Course.CourseClassId2">
<summary>
课程分类ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Course.CourseSceneId">
<summary>
课程场景ID
@ -19236,6 +19231,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.TrainDays">
<summary>
培训天数
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
<summary>
必选修查询 (Model)
@ -28387,6 +28387,11 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestDto.TotalTrainDays">
<summary>
合计天数
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseDto">
<summary>
必选修查询(Dto.View)

Write Preview
Loading…
Cancel
Save