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

培训讲师异动申请

Browse Source
master
xiaochanghai 9 months ago
parent 5d1ca265c7
commit b3ad8fb73c
8 changed files with 1048 additions and 1162 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. 1854
      Model/Tiobon.Web.pdm
  2. 20
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 5
      Tiobon.Core.Model/Base/Ghre/Ghre_Teacher.Dto.Base.cs
  4. 5
      Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs
  5. 5
      Tiobon.Core.Model/Models/Ghre/Ghre_Teacher.cs
  6. 5
      Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs
  7. 314
      Tiobon.Core.Services/CommonServices.cs
  8. 2
      Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs

1854
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

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

@ -5345,6 +5345,11 @@
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.SponsorId">
<summary>
发起人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TeacherBase.Status">
<summary>
状态
@ -5705,6 +5710,11 @@
申请理由
</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>
状态
@ -13051,6 +13061,11 @@
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.SponsorId">
<summary>
发起人
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Teacher.Status">
<summary>
状态
@ -13416,6 +13431,11 @@
状态
</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>
默认标志

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

@ -119,6 +119,11 @@ namespace Tiobon.Core.Model.Models
/// </summary>
public int? IsDefault { get; set; }
/// <summary>
/// 发起人
/// </summary>
public long? SponsorId { get; set; }
/// <summary>
/// 状态
/// </summary>

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

@ -159,6 +159,11 @@ namespace Tiobon.Core.Model.Models
[Display(Name = "ApplyReason"), Description("申请理由"), MaxLength(2000, ErrorMessage = "申请理由 不能超过 2000 个字符")]
public string ApplyReason { get; set; }
/// <summary>
/// 发起人
/// </summary>
public long? SponsorId { get; set; }
/// <summary>
/// 状态
/// </summary>

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

@ -121,6 +121,11 @@ namespace Tiobon.Core.Model.Models
/// </summary>
public int? IsDefault { get; set; }
/// <summary>
/// 发起人
/// </summary>
public long? SponsorId { get; set; }
/// <summary>
/// 状态
/// </summary>

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

@ -167,6 +167,11 @@ namespace Tiobon.Core.Model.Models
[Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
public string Status { get; set; }
/// <summary>
/// 发起人
/// </summary>
public long? SponsorId { get; set; }
/// <summary>
/// 默认标志
/// </summary>

314
Tiobon.Core.Services/CommonServices.cs
Unescape View File

@ -1,10 +1,12 @@
using System.Data;
using AgileObjects.AgileMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.HttpResults;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NPOI.OpenXmlFormats.Spreadsheet;
using SqlSugar;
using Tiobon.Core.Common;
using Tiobon.Core.Common.DB.Dapper;
@ -2578,245 +2580,35 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
break;
case "F_ESS_TrainTeacherChangeApply":
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.TeacherId,
a.SchoolId,
a.OriginChangeType,
a.ChangeType,
a.OriginChangeDate,
a.ChangeDate,
a.DeptID,
a.StaffId,
a.TeacherType,
a.TeacherNo,
a.TeacherName,
a.PhotoUrl,
a.Gender,
a.Email,
a.Mobile,
a.OriginTeacherLevel,
a.TeacherLevel,
a.OriginPrice,
a.Price,
a.OriginSkillPoints,
a.SkillPoints,
a.RemarkSz,
a.ApplyReason,
a.Status,
a.IsDefault,
a.IsEnable,
a.WorkID,
a.WorkNo,
a.ToDoType,
a.BatchSID,
a.WorkState,
a.ShiftID,
a.ConfirmUserID,
a.ConfirmTime,
a.ConfirmComment,
a.AgreeUserId,
a.AgreeTime,
a.AgreeReason,
a.RefuseUserId,
a.RefuseTime,
a.RefuseReason,
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_TeacherChange a
WHERE a.Id = @ID
END
IF @DoType = 'Insert' -- 空白新增
BEGIN
SELECT (SELECT UserStaffID
FROM dbo.Ghrs_User
WHERE UserId = @userId) CreateBy,
NULL TeacherId,
NULL SchoolId,
NULL OriginChangeType,
NULL ChangeType,
NULL OriginChangeDate,
NULL ChangeDate,
NULL DeptID,
NULL StaffId,
NULL TeacherType,
NULL TeacherNo,
NULL TeacherName,
NULL PhotoUrl,
NULL Gender,
NULL Email,
NULL Mobile,
NULL OriginTeacherLevel,
NULL TeacherLevel,
NULL OriginPrice,
NULL Price,
NULL OriginSkillPoints,
NULL SkillPoints,
NULL ApplyReason,
NULL Status,
NULL IsEnable,
NULL WorkID,
NULL WorkNo,
NULL ToDoType,
NULL BatchSID,
NULL WorkState,
NULL ShiftID,
NULL ConfirmUserID,
NULL ConfirmTime,
NULL ConfirmComment,
NULL AgreeUserId,
NULL AgreeTime,
NULL AgreeReason,
NULL RefuseUserId,
NULL RefuseTime,
NULL RefuseReason,
'Wait' Status,
0 IsDefault,
0 Id,
NULL RemarkSz
END
//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}
// ";
if (param.doType == "Insert")
{
var data1 = new List<Ghre_TeacherChangeDto>
{
new Ghre_TeacherChangeDto()
{
CreateBy = GetStaffId(),
Id = 0,
Status = "Wait"
}
};
data1.ForEach(x => x.TeacherAttachments = new List<Ghre_TeacherChangeAttachmentDto>());
flowReturn.DT_TableDataT1 = data1;
IF @DoType = 'ReApply' -- ReApply:重新发起
BEGIN
SELECT Id,
CreateBy,
CreateTime,
CreateProg,
CreateIP,
UpdateBy,
UpdateTime,
UpdateProg,
UpdateIP,
OperateLogID,
TeacherId,
SchoolId,
OriginChangeType,
ChangeType,
OriginChangeDate,
ChangeDate,
DeptID,
StaffId,
TeacherType,
TeacherNo,
TeacherName,
PhotoUrl,
Gender,
Email,
Mobile,
OriginTeacherLevel,
TeacherLevel,
OriginPrice,
Price,
OriginSkillPoints,
SkillPoints,
RemarkSz,
ApplyReason,
Status,
IsDefault,
IsEnable,
WorkID,
WorkNo,
ToDoType,
BatchSID,
WorkState,
ShiftID,
ConfirmUserID,
ConfirmTime,
ConfirmComment,
AgreeUserId,
AgreeTime,
AgreeReason,
RefuseUserId,
RefuseTime,
RefuseReason,
Reverse1,
Reverse2,
Reverse3,
Reverse4,
Reverse5,
Reverse6,
Reverse7,
Reverse8,
Reverse9,
Reverse10,
ReverseI1,
ReverseI2,
Id1
FROM Ghre_TeacherChange
WHERE WorkID = @ID -- 根据流程单号读取
END
END";
var data1 = await Db.Ado.SqlQueryAsync<Ghre_TeacherChangeDto>(sql);
data1.ForEach(x => x.TeacherAttachments = new List<Ghre_TeacherChangeAttachmentDto>());
flowReturn.DT_TableDataT1 = data1;
}
break;
}
@ -2917,6 +2709,8 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
#region 写入数据,并判断是否有错误
string json = param.jsonParam.ToString();
var dict = JsonHelper.JsonToObj<Ghre_Teacher>(json);
var staffId = dict.StaffId;
dict.StaffId = GetStaffId();
id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync();
@ -2935,8 +2729,32 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
await Db.Ado.ExecuteCommandAsync(sql);
id = id1;
#endregion
#endregion
#region 生成流程数据
sql = @$"DECLARE @return_value int;
DECLARE @ErrorMsg nvarchar(2000);
SET @ErrorMsg = NULL;
EXEC @return_value = GHR30.dbo.[PT_GHR30_FlowApply]
@ID = {id},
@FlowID = {@FlowID},
@UserID = {param.userId},
@LangID = {param.langId},
@ErrorMsg = @ErrorMsg out;
SELECT @ErrorMsg as N'@ErrorMsg', @return_value as N'@Return Value';";
var message = await Db.Ado.GetStringAsync(sql);
if (message.IsNotEmptyOrNull())
return new ServiceResult() { Success = false, Message = message };
#endregion
sql = $"UPDATE Ghre_Teacher SET StaffId={staffId} WHERE Id ='{id}'";
await Db.Ado.ExecuteCommandAsync(sql);
break;
}
#endregion
@ -2953,6 +2771,8 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
#region 写入数据,并判断是否有错误
string json = param.jsonParam.ToString();
var dict = JsonHelper.JsonToObj<Ghre_TeacherChange>(json);
dict.SponsorId = GetStaffId();
dict.StaffId = GetStaffId();
id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync();
@ -2980,8 +2800,11 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
break;
}
#region 生成流程数据
sql = @$"DECLARE @return_value int;
if (param.menuName != "F_ESS_TrainTeacherApply")
{
#region 生成流程数据
sql = @$"DECLARE @return_value int;
DECLARE @ErrorMsg nvarchar(2000);
@ -2996,12 +2819,13 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
SELECT @ErrorMsg as N'@ErrorMsg', @return_value as N'@Return Value';";
var message = await Db.Ado.GetStringAsync(sql);
var message = await Db.Ado.GetStringAsync(sql);
if (message.IsNotEmptyOrNull())
return new ServiceResult() { Success = false, Message = message };
if (message.IsNotEmptyOrNull())
return new ServiceResult() { Success = false, Message = message };
#endregion
#endregion
}
return new ServiceResult() { Success = true, Message = "提交成功" };
}

2
Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs
Unescape View File

@ -101,7 +101,7 @@ public class Ghre_TeacherChangeServices : BaseServices<Ghre_TeacherChange, Ghre_
entity.SchoolId = teacher.SchoolId;
entity.DeptID = teacher.DeptID;
entity.SponsorId = GetStaffId();
var id = await base.Add(entity);
var sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_TeacherChange WHERE Id !='{id}'";
var id1 = await Db.Ado.GetLongAsync(sql);

Write Preview
Loading…
Cancel
Save