diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 8fb2acd9..7a539e0a 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -4045,11 +4045,66 @@
发起人
+
+
+ 状态
+
+
+
+
+ 备注
+
+
默认标志
+
+
+ WorkID
+
+
+
+
+ WorkNo
+
+
+
+
+ ToDoType
+
+
+
+
+ BatchSID
+
+
+
+
+ WorkState
+
+
+
+
+ ShiftID
+
+
+
+
+ ConfirmUserID
+
+
+
+
+ ConfirmTime
+
+
+
+
+ ConfirmComment
+
+
预留字段1
@@ -4110,16 +4165,6 @@
预留字段12
-
-
- 状态
-
-
-
-
- 备注
-
-
必选修查询 (Dto.Base)
@@ -10961,11 +11006,66 @@
发起人
+
+
+ 状态
+
+
+
+
+ 备注
+
+
默认标志
+
+
+ WorkID
+
+
+
+
+ WorkNo
+
+
+
+
+ ToDoType
+
+
+
+
+ BatchSID
+
+
+
+
+ WorkState
+
+
+
+
+ ShiftID
+
+
+
+
+ ConfirmUserID
+
+
+
+
+ ConfirmTime
+
+
+
+
+ ConfirmComment
+
+
预留字段1
@@ -11026,16 +11126,6 @@
预留字段12
-
-
- 状态
-
-
-
-
- 备注
-
-
必选修查询 (Model)
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
index e5be845e..7a0ff2bd 100644
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-*V0.01 2024/9/6 16:37:59 SimonHsiao 初版
+*V0.01 2024/9/10 14:28:24 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -130,11 +130,72 @@ namespace Tiobon.Core.Model.Models
///
public long? SponsorId { get; set; }
+ ///
+ /// 状态
+ ///
+ [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+ public string Status { get; set; }
+
+ ///
+ /// 备注
+ ///
+ [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
+ public string RemarkSz { get; set; }
+
///
/// 默认标志
///
public int? IsDefault { get; set; }
+ ///
+ /// WorkID
+ ///
+ public int? WorkID { get; set; }
+
+ ///
+ /// WorkNo
+ ///
+ [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")]
+ public string WorkNo { get; set; }
+
+ ///
+ /// ToDoType
+ ///
+ [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")]
+ public string ToDoType { get; set; }
+
+ ///
+ /// BatchSID
+ ///
+ [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")]
+ public string BatchSID { get; set; }
+
+ ///
+ /// WorkState
+ ///
+ public int? WorkState { get; set; }
+
+ ///
+ /// ShiftID
+ ///
+ public int? ShiftID { get; set; }
+
+ ///
+ /// ConfirmUserID
+ ///
+ public int? ConfirmUserID { get; set; }
+
+ ///
+ /// ConfirmTime
+ ///
+ public DateTime? ConfirmTime { get; set; }
+
+ ///
+ /// ConfirmComment
+ ///
+ [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")]
+ public string ConfirmComment { get; set; }
+
///
/// 预留字段1
///
@@ -204,17 +265,5 @@ namespace Tiobon.Core.Model.Models
/// 预留字段12
///
public int? ReverseI2 { get; set; }
-
- ///
- /// 状态
- ///
- [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
- public string Status { get; set; }
-
- ///
- /// 备注
- ///
- [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
- public string RemarkSz { get; set; }
}
}
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
index 313f7417..d93177d7 100644
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-*V0.01 2024/9/6 16:37:59 SimonHsiao 初版
+*V0.01 2024/9/10 14:28:24 SimonHsiao 初版
*
* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
*┌──────────────────────────────────┐
@@ -25,7 +25,7 @@ namespace Tiobon.Core.Model.Models
///
/// 培训需求 (Model)
///
- [SugarTable("Ghre_Request", "Ghre_Request"), Entity(TableCnName = "培训需求", TableName = "Ghre_Request")]
+ [SugarTable("Ghre_Request", "Ghre_Request"), Entity(TableCnName = "Ghre_Request", TableName = "Ghre_Request")]
public class Ghre_Request : BasePoco
{
@@ -132,11 +132,72 @@ namespace Tiobon.Core.Model.Models
///
public long? SponsorId { get; set; }
+ ///
+ /// 状态
+ ///
+ [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+ public string Status { get; set; }
+
+ ///
+ /// 备注
+ ///
+ [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
+ public string RemarkSz { get; set; }
+
///
/// 默认标志
///
public int? IsDefault { get; set; }
+ ///
+ /// WorkID
+ ///
+ public int? WorkID { get; set; }
+
+ ///
+ /// WorkNo
+ ///
+ [Display(Name = "WorkNo"), Description("WorkNo"), MaxLength(100, ErrorMessage = "WorkNo 不能超过 100 个字符")]
+ public string WorkNo { get; set; }
+
+ ///
+ /// ToDoType
+ ///
+ [Display(Name = "ToDoType"), Description("ToDoType"), MaxLength(100, ErrorMessage = "ToDoType 不能超过 100 个字符")]
+ public string ToDoType { get; set; }
+
+ ///
+ /// BatchSID
+ ///
+ [Display(Name = "BatchSID"), Description("BatchSID"), MaxLength(100, ErrorMessage = "BatchSID 不能超过 100 个字符")]
+ public string BatchSID { get; set; }
+
+ ///
+ /// WorkState
+ ///
+ public int? WorkState { get; set; }
+
+ ///
+ /// ShiftID
+ ///
+ public int? ShiftID { get; set; }
+
+ ///
+ /// ConfirmUserID
+ ///
+ public int? ConfirmUserID { get; set; }
+
+ ///
+ /// ConfirmTime
+ ///
+ public DateTime? ConfirmTime { get; set; }
+
+ ///
+ /// ConfirmComment
+ ///
+ [Display(Name = "ConfirmComment"), Description("ConfirmComment"), MaxLength(2000, ErrorMessage = "ConfirmComment 不能超过 2000 个字符")]
+ public string ConfirmComment { get; set; }
+
///
/// 预留字段1
///
@@ -206,17 +267,5 @@ namespace Tiobon.Core.Model.Models
/// 预留字段12
///
public int? ReverseI2 { get; set; }
-
- ///
- /// 状态
- ///
- [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
- public string Status { get; set; }
-
- ///
- /// 备注
- ///
- [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")]
- public string RemarkSz { get; set; }
}
}
diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index b0f7353c..fec41185 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -1829,7 +1829,7 @@ public partial class CommonServices : BaseServices>, ICommon
@JsonString NVARCHAR (MAX) = '',
@JsonString1 NVARCHAR (MAX) = '',
@JsonString2 NVARCHAR (MAX) = '',
- @ID INT = {param.id},
+ @ID INT = '{param.id}',
@userId INT = {param.userId}
BEGIN
@@ -1936,7 +1936,199 @@ public partial class CommonServices : BaseServices>, ICommon
END";
break;
case "F_ESS_TrainRequestApply":
+ sql = @$"DECLARE
+ @SQL NVARCHAR (MAX) = '',
+ @FlowID INT = {param.jsonParam.FlowID},
+ @langId INT = {param.langId},
+ @DoType NVARCHAR (MAX) = '{param.doType}',
+ @SQL2 NVARCHAR (MAX) = '',
+ @JsonString NVARCHAR (MAX) = '',
+ @JsonString1 NVARCHAR (MAX) = '',
+ @JsonString2 NVARCHAR (MAX) = '',
+ @ID INT = '{param.id}',
+ @userId INT = {param.userId}
+ BEGIN
+ IF @DoType IN ('Update', 'Copy') -- 读取修改
+ BEGIN
+ SELECT a.Id,
+ a.CreateBy,
+ a.CreateTime,
+ a.CreateProg,
+ a.CreateIP,
+ a.UpdateBy,
+ a.UpdateTime,
+ a.UpdateProg,
+ a.UpdateIP,
+ a.OperateLogID,
+ a.CourseSource,
+ a.RequestNo,
+ a.CourseName,
+ a.CourseId,
+ a.YearMonth,
+ a.RequestSource,
+ a.DeptId,
+ a.ApplicantId,
+ a.RequestNum,
+ a.TrainStaffId,
+ a.TrainClass,
+ a.TrainLevel,
+ a.InOrOut,
+ a.TeacherClass,
+ a.Reason,
+ a.PerCapitaBudget,
+ a.TotalBudget,
+ a.SponsorId,
+ a.Status,
+ a.RemarkSz,
+ a.IsDefault,
+ a.IsEnable,
+ a.WorkID,
+ a.WorkNo,
+ a.ToDoType,
+ a.BatchSID,
+ a.WorkState,
+ a.ShiftID,
+ a.ConfirmUserID,
+ a.ConfirmTime,
+ a.ConfirmComment,
+ a.Reverse1,
+ a.Reverse2,
+ a.Reverse3,
+ a.Reverse4,
+ a.Reverse5,
+ a.Reverse6,
+ a.Reverse7,
+ a.Reverse8,
+ a.Reverse9,
+ a.Reverse10,
+ a.ReverseI1,
+ a.ReverseI2,
+ isnull
+ (
+ (SELECT CASE
+ WHEN @langId = 1 THEN UserName
+ ELSE UserEname
+ END
+ FROM Ghrs_User kk
+ WHERE kk.UserId = a.CreateBy),
+ '')
+ + ' '
+ + [dbo].[FLangKeyToValue]
+ ('GHR_Common_000078', @langId, '于 ')
+ + ' '
+ + CONVERT (NVARCHAR (16), CreateTime, 121)
+ + ' '
+ + [dbo].[FLangKeyToValue]
+ ('GHR_Common_000079', @langId, ' 创建') CreateDataInfo,
+ isnull
+ (
+ (SELECT CASE
+ WHEN @langId = 1 THEN UserName
+ ELSE UserEname
+ END
+ FROM Ghrs_User kk
+ WHERE kk.UserId = a.UpdateBy),
+ '')
+ + ' '
+ + [dbo].[FLangKeyToValue]
+ ('GHR_Common_000078', @langId, '于')
+ + ' '
+ + CONVERT (NVARCHAR (16), UpdateTime, 121)
+ + ' '
+ + [dbo].[FLangKeyToValue]
+ ('GHR_Common_000080', @langId, ' 最后修改') UpdateDataInfo
+ FROM Ghre_Request a
+ WHERE a.Id = @ID
+ END
+
+ IF @DoType = 'Insert' -- 空白新增
+ BEGIN
+ SELECT (SELECT UserStaffID
+ FROM dbo.Ghrs_User
+ WHERE UserId = @userId) ApplicantId,
+ NULL CourseSource,
+ NULL RequestNo,
+ NULL CourseName,
+ NULL CourseId,
+ NULL YearMonth,
+ NULL RequestSource,
+ NULL DeptId,
+ NULL RequestNum,
+ NULL TrainStaffId,
+ NULL TrainClass,
+ NULL TrainLevel,
+ NULL InOrOut,
+ NULL TeacherClass,
+ NULL Reason,
+ NULL PerCapitaBudget,
+ NULL TotalBudget,
+ NULL SponsorId,
+ 'Wait' Status,
+ 0 IsDefault,
+ 0 Id,
+ '' RemarkSz
+ END
+
+ IF @DoType = 'ReApply' -- ReApply:重新发起
+ BEGIN
+ SELECT Id,
+ CreateBy,
+ CreateTime,
+ CreateProg,
+ CreateIP,
+ UpdateBy,
+ UpdateTime,
+ UpdateProg,
+ UpdateIP,
+ OperateLogID,
+ CourseSource,
+ RequestNo,
+ CourseName,
+ CourseId,
+ YearMonth,
+ RequestSource,
+ DeptId,
+ ApplicantId,
+ RequestNum,
+ TrainStaffId,
+ TrainClass,
+ TrainLevel,
+ InOrOut,
+ TeacherClass,
+ Reason,
+ PerCapitaBudget,
+ TotalBudget,
+ SponsorId,
+ Status,
+ RemarkSz,
+ IsDefault,
+ IsEnable,
+ WorkID,
+ WorkNo,
+ ToDoType,
+ BatchSID,
+ WorkState,
+ ShiftID,
+ ConfirmUserID,
+ ConfirmTime,
+ ConfirmComment,
+ Reverse1,
+ Reverse2,
+ Reverse3,
+ Reverse4,
+ Reverse5,
+ Reverse6,
+ Reverse7,
+ Reverse8,
+ Reverse9,
+ Reverse10,
+ ReverseI1,
+ ReverseI2
+ FROM Ghre_Request
+ WHERE WorkID = @ID -- 根据流程单号读取
+ END
+ END";
break;
}