培训费用讲师申请_宝连通

master
xiaochanghai 2 months ago
parent 21bbbfbda6
commit 8a6fb1b524
  1. 6
      Model/Tiobon.Web.pdm
  2. 4
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 8
      Tiobon.Core.Model/Base/Ghre/Ghre_TrainFeeApplyOrder_Boltone.Dto.Base.cs
  4. 4
      Tiobon.Core.Model/Models/Ghre/Ghre_TrainFeeApplyOrder_Boltone.cs
  5. 63
      Tiobon.Core.Services/CommonServices.cs
  6. 1
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  7. 998
      Tiobon.Core/Tiobon.Core.Model.xml
  8. 10
      Tiobon.Core/Tiobon.Core.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1745301837" Name="Tiobon" Objects="4181" Symbols="160" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1745305602" Name="Tiobon" Objects="4181" Symbols="160" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -61157,10 +61157,10 @@ Ghra_staff_InsureBase
<o:Column Id="o3956">
<a:ObjectID>981C2929-F209-41DB-B368-16352EDD2C86</a:ObjectID>
<a:Name>讲师手机号</a:Name>
<a:Code>讲师手机号</a:Code>
<a:Code>Phone</a:Code>
<a:CreationDate>1745299386</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1745300191</a:ModificationDate>
<a:ModificationDate>1745305602</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:Comment>讲师手机号</a:Comment>
<a:DataType>nvarchar(100)</a:DataType>

@ -10160,7 +10160,7 @@
培训时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TrainFeeApplyOrder_BoltoneBase.讲师手机号">
<member name="P:Tiobon.Core.Model.Models.Ghre_TrainFeeApplyOrder_BoltoneBase.Phone">
<summary>
讲师手机号
</summary>
@ -28287,7 +28287,7 @@
培训时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TrainFeeApplyOrder_Boltone.讲师手机号">
<member name="P:Tiobon.Core.Model.Models.Ghre_TrainFeeApplyOrder_Boltone.Phone">
<summary>
讲师手机号
</summary>

@ -14,6 +14,8 @@
* SimonHsiao
*
*/
using Tiobon.Core.Model.ViewModels.Extend;
namespace Tiobon.Core.Model.Models;
@ -114,8 +116,8 @@ public class Ghre_TrainFeeApplyOrder_BoltoneBase
/// <summary>
/// 讲师手机号
/// </summary>
[Display(Name = "讲师手机号"), Description("讲师手机号"), MaxLength(100, ErrorMessage = "讲师手机号 不能超过 100 个字符")]
public string { get; set; }
[Display(Name = "Phone"), Description("讲师手机号"), MaxLength(100, ErrorMessage = "讲师手机号 不能超过 100 个字符")]
public string Phone { get; set; }
/// <summary>
/// 主办单位
@ -283,4 +285,6 @@ public class Ghre_TrainFeeApplyOrder_BoltoneBase
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
public List<Ghre_Attachment1> Attachments { get; set; } = new List<Ghre_Attachment1>();
}

@ -115,8 +115,8 @@ public class Ghre_TrainFeeApplyOrder_Boltone : BasePoco
/// <summary>
/// 讲师手机号
/// </summary>
[Display(Name = "讲师手机号"), Description("讲师手机号"), MaxLength(100, ErrorMessage = "讲师手机号 不能超过 100 个字符")]
public string { get; set; }
[Display(Name = "Phone"), Description("讲师手机号"), MaxLength(100, ErrorMessage = "讲师手机号 不能超过 100 个字符")]
public string Phone { get; set; }
/// <summary>
/// 主办单位

@ -2443,9 +2443,9 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault();
if (toolbar != null) toolbar.fnKey = "TBD2YN";
toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault();
if (toolbar != null) toolbar.fnKey = "TBD3YN";
if (toolbar != null) toolbar.fnKey = "TBD3YN";
break;
case "F_PerformancePeriod":
case "F_PerformancePeriod":
result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()
{
display = true,
@ -3937,6 +3937,21 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
};
}
break;
case "F_ESS_TrainFeeApplyOrder_Boltone":
if (param.doType == "Insert")
{
flowReturn.DT_TableDataT1 = new List<Ghre_TrainFeeApplyOrder_Boltone>()
{
new Ghre_TrainFeeApplyOrder_Boltone()
{
ApplicantId = App.User.StaffId,
ApplicantDeptId = GetStaffDeptId(),
ApplicantTime = DateTime.Now
}
};
}
break;
}
#endregion
@ -4331,6 +4346,50 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
}
#endregion
break;
case "F_ESS_TrainFeeApplyOrder_Boltone": //培训费用_宝连通
#region 写入数据,并判断是否有错误
switch (param.doType)
{
case "Apply":
case "BatchApply":
#region 写入数据,并判断是否有错误
string json = param.jsonParam.ToString();
var dict = JsonHelper.JsonToObj<Ghre_ExternalTrainApplyOrder_Boltone>(json);
var dict1 = JsonHelper.JsonToObj<Ghre_TrainFeeApplyOrder_BoltoneBase>(json);
//dict.RequestNo = await GenerateContinuousSequence("Ghrh_HumanRequest", "RequestNo", "R");
id = await Db.Insertable(dict).ExecuteReturnSnowflakeIdAsync();
sql = $"SELECT ISNULL(MAX(id)+1,1) FROM Ghre_TrainFeeApplyOrder_Boltone WHERE Id !='{id}' and len(Id) !=19";
var id1 = await Db.Ado.GetLongAsync(sql);
sql = $"UPDATE Ghre_TrainFeeApplyOrder_Boltone SET Id={id1} WHERE Id ='{id}'";
await Db.Ado.ExecuteCommandAsync(sql);
id = id1;
if (dict1.Attachments.Any())
{
var ids = dict1.Attachments.Select(x => x.AttachmentID).ToList();
await Db.Updateable<Ghre_Attachment>()
.SetColumns(it => new Ghre_Attachment()
{
TableName = "Ghre_TrainFeeApplyOrder_Boltone",
TableKeyID = id.ObjToInt(),
Reverse1 = "Attachments"
})
.Where(it => ids.Contains(it.Id))
.ExecuteCommandAsync();
}
#endregion
break;
}
#endregion
break;
}

@ -1170,6 +1170,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
LEFT JOIN Ghre_Exam B
ON A.Id = B.CourseId
AND B.Status = '{DIC_EXAM_STATUS.RELEASED}'
AND B.IsEnable =1
AND ( ( B.DateType = '{DicExamDateType.EXAM_DATE}'
AND B.BeginTime <= '{dt}'
AND B.EndTime >= '{dt}')

File diff suppressed because it is too large Load Diff

@ -1579,6 +1579,16 @@
岗位技能_宝连通(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_TrainFeeApplyDetail_BoltoneController">
<summary>
Ghre_TrainFeeApplyDetail_Boltone(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_TrainFeeApplyOrder_BoltoneController">
<summary>
培训费用_宝连通(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_UshioPlanController">
<summary>
【牛尾】培训计划(Controller)

Loading…
Cancel
Save