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

岗位技能_宝连通

Browse Source
master
xiaochanghai 2 months ago
parent c76d582815
commit cf101f748f
8 changed files with 138 additions and 9 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. 12
      Model/Tiobon.Web.pdm
  2. 10
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 3
      Tiobon.Core.Model/View/Ghra/Ghra_Staff.Dto.View.cs
  4. 17
      Tiobon.Core.Model/View/Ghre/Ghre_TitleSkill_Boltone.Dto.View.cs
  5. 4
      Tiobon.Core.Services/Ghra/Ghra_StaffServices.cs
  6. 2
      Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs
  7. 89
      Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
  8. 10
      Tiobon.Core/Tiobon.Core.Model.xml

12
Model/Tiobon.Web.pdm
Unescape View File

@ -9743,7 +9743,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:ReferenceSymbol Id="o46">
<a:CreationDate>1717726229</a:CreationDate>
<a:ModificationDate>1719381754</a:ModificationDate>
<a:Rect>((-42337,11400), (-39337,18375))</a:Rect>
<a:Rect>((-42449,11400), (-39225,18375))</a:Rect>
<a:ListOfPoints>((-40837,11400),(-40837,18375))</a:ListOfPoints>
<a:CornerStyle>2</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
@ -9966,7 +9966,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:ReferenceSymbol Id="o79">
<a:CreationDate>1727337857</a:CreationDate>
<a:ModificationDate>1727337857</a:ModificationDate>
<a:Rect>((-54786,11250), (-48786,18150))</a:Rect>
<a:Rect>((-54898,11250), (-48674,18150))</a:Rect>
<a:ListOfPoints>((-51786,18150),(-51786,11250))</a:ListOfPoints>
<a:CornerStyle>2</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
@ -10010,7 +10010,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:ReferenceSymbol Id="o85">
<a:CreationDate>1738913762</a:CreationDate>
<a:ModificationDate>1738913762</a:ModificationDate>
<a:Rect>((-43349,-30975), (-38849,-24075))</a:Rect>
<a:Rect>((-43461,-30975), (-38737,-24075))</a:Rect>
<a:ListOfPoints>((-41099,-30975),(-41099,-24075))</a:ListOfPoints>
<a:CornerStyle>2</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
@ -10055,7 +10055,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:ReferenceSymbol Id="o92">
<a:CreationDate>1738915648</a:CreationDate>
<a:ModificationDate>1738915648</a:ModificationDate>
<a:Rect>((-43011,-23625), (-38511,-17925))</a:Rect>
<a:Rect>((-43123,-23625), (-38399,-17925))</a:Rect>
<a:ListOfPoints>((-40761,-17925),(-40761,-23625))</a:ListOfPoints>
<a:CornerStyle>2</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
@ -10077,7 +10077,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:ReferenceSymbol Id="o95">
<a:CreationDate>1738916095</a:CreationDate>
<a:ModificationDate>1738916119</a:ModificationDate>
<a:Rect>((-53924,-23812), (-39449,-17325))</a:Rect>
<a:Rect>((-54036,-23812), (-39449,-17325))</a:Rect>
<a:ListOfPoints>((-51674,-17325),(-51674,-23400),(-39449,-23400))</a:ListOfPoints>
<a:CornerStyle>2</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
@ -10099,7 +10099,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
<o:ReferenceSymbol Id="o98">
<a:CreationDate>1738916098</a:CreationDate>
<a:ModificationDate>1738916104</a:ModificationDate>
<a:Rect>((-53999,-31050), (-42899,-24863))</a:Rect>
<a:Rect>((-54111,-31050), (-42899,-24863))</a:Rect>
<a:ListOfPoints>((-51749,-31050),(-51749,-25275),(-42899,-25275))</a:ListOfPoints>
<a:CornerStyle>2</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>

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

@ -36418,6 +36418,16 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TitleSkill_BoltoneDto.EffectiveDate1">
<summary>
生效日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TitleSkill_BoltoneDto.ExpiryDate1">
<summary>
失效日期
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_UshioPlanDto">
<summary>
【牛尾】培训计划(Dto.View1)

3
Tiobon.Core.Model/View/Ghra/Ghra_Staff.Dto.View.cs
Unescape View File

@ -78,4 +78,7 @@ public class Ghra_StaffDto : Ghra_Staff
/// 职务
/// </summary>
public string JobName { get; set; }
public int? TitleId { get; set; }
public int? DeptId { get; set; }
}

17
Tiobon.Core.Model/View/Ghre/Ghre_TitleSkill_Boltone.Dto.View.cs
Unescape View File

@ -31,4 +31,21 @@ public class Ghre_TitleSkill_BoltoneDto : Ghre_TitleSkill_Boltone
/// 修改信息
/// </summary>
public string UpdateDataInfo { get; set; }
public string CourseName { get; set; }
public string DeptName { get; set; }
public string TitleName { get; set; }
/// <summary>
/// 生效日期
/// </summary>
public string EffectiveDate1 { get; set; }
/// <summary>
/// 失效日期
/// </summary>
public string ExpiryDate1 { get; set; }
public string ParentDeptName { get; set; }
}

4
Tiobon.Core.Services/Ghra/Ghra_StaffServices.cs
Unescape View File

@ -18,7 +18,7 @@ public class Ghra_StaffServices : BaseServices<Ghra_Staff, Ghra_StaffDto, Insert
}
public override async Task<ServicePageResult<Ghra_StaffDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
{
{
var result = await base.QueryFilterPage(filter, condition, IsEnable);
for (int i = 0; i < result.result.DT_TableDataT1.Count; i++)
@ -37,6 +37,8 @@ public class Ghra_StaffServices : BaseServices<Ghra_Staff, Ghra_StaffDto, Insert
if (entity != null)
{
entity.TitleId = entity.TitleID;
entity.DeptId = entity.DeptID;
var licences = await Db.Ado.SqlQueryAsync<Ghra_StaffLicenceDto>($"SELECT * FROM Ghra_StaffLicence WHERE StaffID='{id}' AND IsEnable=1");
//var licences = await _ghra_StaffLicenceServices.QueryDto(x => x.StaffID == id);

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

@ -1,7 +1,5 @@
using NPOI.SS.UserModel;
using NPOI.SS.Util;
using Tiobon.Core.Model.Models;
using static Tiobon.Core.DataAccess.ReportHelper;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services;

89
Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
Unescape View File

@ -12,4 +12,93 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
base.BaseDal = dal;
base._caching = caching;
}
public override async Task<ServicePageResult<Ghre_TitleSkill_BoltoneDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true)
{
if (filter.orderBy == "EffectiveDate1")
filter.orderBy = "EffectiveDate";
if (filter.orderBy == "ExpiryDate1")
filter.orderBy = "ExpiryDate";
var result = await base.QueryFilterPage(filter, condition, IsEnable);
var DT_TableDataT1 = result.result.DT_TableDataT1;
var deptIds = DT_TableDataT1.Select(x => x.DeptId).Distinct().ToList();
var courseIds = DT_TableDataT1.Select(x => x.CourseId).Distinct().ToList();
var titleIds = DT_TableDataT1.Select(x => x.TitleId).Distinct().ToList();
var depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID)).ToListAsync();
var deptIds1 = depts.Select(x => x.ParentDeptID).Distinct().ToList();
depts = await Db.Queryable<Ghro_Dept>().Where(x => deptIds.Contains(x.DeptID) || deptIds1.Contains(x.DeptID)).ToListAsync();
var courses = await Db.Queryable<Ghre_Course>().Where(x => courseIds.Contains(x.Id)).ToListAsync();
var courseScenes = await Db.Queryable<Ghre_CourseScene>().Where(x => courseIds.Contains(x.Id)).ToListAsync();
var titles = await Db.Queryable<Ghra_Title>().Where(x => titleIds.Contains(x.TitleID)).ToListAsync();
for (int i = 0; i < DT_TableDataT1.Count; i++)
{
if (DT_TableDataT1[i].CourseId.IsNotEmptyOrNull())
DT_TableDataT1[i].CourseName = courses.Where(x => x.Id == DT_TableDataT1[i].CourseId).Select(x => x.CourseName).FirstOrDefault();
if (DT_TableDataT1[i].CourseName.IsNullOrEmpty())
DT_TableDataT1[i].CourseName = courseScenes.Where(x => x.Id == DT_TableDataT1[i].CourseId).Select(x => x.SceneName).FirstOrDefault();
if (DT_TableDataT1[i].DeptId.IsNotEmptyOrNull())
{
var dept = depts.Where(x => x.DeptID == DT_TableDataT1[i].DeptId).FirstOrDefault();
DT_TableDataT1[i].DeptName = dept?.DeptName;
if (dept != null && dept.ParentDeptID.IsNotEmptyOrNull())
DT_TableDataT1[i].ParentDeptName = depts.Where(x => x.DeptID == dept.ParentDeptID).Select(X => X.DeptName).FirstOrDefault();
}
if (DT_TableDataT1[i].TitleId.IsNotEmptyOrNull())
DT_TableDataT1[i].TitleName = titles.Where(x => x.TitleID == DT_TableDataT1[i].TitleId).Select(x => x.TitleName).FirstOrDefault();
DT_TableDataT1[i].EffectiveDate1 = DateTimeHelper.ConvertToDayString(DT_TableDataT1[i].EffectiveDate);
DT_TableDataT1[i].ExpiryDate1 = DateTimeHelper.ConvertToDayString(DT_TableDataT1[i].ExpiryDate);
}
return result;
}
//public override async Task<long> Add(InsertGhre_TitleSkill_BoltoneInput entity)
//{
// if (entity.StaffId != null)
// entity.StaffIds = JsonHelper.ObjToJson(entity.StaffId.OrderBy(n => n).ToList());
// if (entity.StaffId.IsNotEmptyOrNull() && entity.StaffId.Count > 0)
// entity.TrainNum = entity.StaffId.Count;
// if (entity.Months != null)
// entity.Month = JsonHelper.ObjToJson(entity.Months.OrderBy(n => n).ToList());
// var result = await base.Add(entity);
// return result;
//}
//public override async Task<bool> Update(long Id, EditGhre_TitleSkill_BoltoneInput editModel)
//{
// if (editModel.StaffId != null)
// editModel.StaffIds = JsonHelper.ObjToJson(editModel.StaffId);
// if (editModel.StaffId.IsNotEmptyOrNull() && editModel.StaffId.Count > 0)
// editModel.TrainNum = editModel.StaffId.Count;
// if (editModel.Months != null)
// editModel.Month = JsonHelper.ObjToJson(editModel.Months.OrderBy(n => n).ToList());
// var result = await base.Update(Id, editModel);
// return result;
//}
//public override async Task<ServiceFormResult<Ghre_TitleSkill_BoltoneDto>> QueryForm(QueryForm body)
//{
// var result = await base.QueryForm(body);
// string StaffIds = result.result.DT_TableDataT1[0].StaffIds;
// string Month = result.result.DT_TableDataT1[0].Month;
// if (!string.IsNullOrWhiteSpace(StaffIds))
// result.result.DT_TableDataT1[0].StaffId = JsonConvert.DeserializeObject<List<int>>(StaffIds);
// if (!string.IsNullOrWhiteSpace(Month))
// result.result.DT_TableDataT1[0].Months = JsonConvert.DeserializeObject<List<string>>(Month);
// if (result.result.DT_TableDataT1[0].TrainNum != null && result.result.DT_TableDataT1[0].TrainDays != null)
// result.result.DT_TableDataT1[0].TotalDays = result.result.DT_TableDataT1[0].TrainNum * result.result.DT_TableDataT1[0].TrainDays;
// return result;
//}
}

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

@ -36418,6 +36418,16 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TitleSkill_BoltoneDto.EffectiveDate1">
<summary>
生效日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_TitleSkill_BoltoneDto.ExpiryDate1">
<summary>
失效日期
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_UshioPlanDto">
<summary>
【牛尾】培训计划(Dto.View1)

Write Preview
Loading…
Cancel
Save