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 4cbb1ad5f7
commit 7bad8eb2d0
3 changed files with 26 additions and 47 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. 20
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 33
      Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
  3. 20
      Tiobon.Core/Tiobon.Core.Model.xml

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

@ -38488,26 +38488,6 @@
Type Description balabala
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.IndateLabel">
<summary>
入职日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.StaffType1Label">
<summary>
员工类别1
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.DeptName">
<summary>
部门
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.TitleName">
<summary>
岗位
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_SurveyExtendBase.CoverImageUrl">
<summary>
封面图

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

@ -1,6 +1,7 @@
using MySqlX.XDevAPI.Common;
using NPOI.SS.Formula.Functions;
using OfficeOpenXml.FormulaParsing;
using Org.BouncyCastle.Utilities;
using System.Collections.Generic;
namespace Tiobon.Core.Services;
@ -121,17 +122,15 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
var result2 = await _staffServices.QueryFilterPage(filter);
var DT_TableDataT1 = result2.result.DT_TableDataT1;
var DT_TableDataT1 = result2.result.DT_TableDataT1;
ModuleParam param = new ModuleParam()
var param = new ModuleParam()
{
langId = filter.langId,
menuName = filter.menuName
};
var module = await _commonServices.GetModuleInfoAsync(param);
//var result1 = new ServicePageResult<Ghre_TitleSkillMatrix_Boltone>(filter.pageNum, result2.result.DT_TablePageInfoT1.TotalCount, filter.pageSize, entitys);
//result1.result.JM_TableColumnT1 = module.Data.JM_TableColumnT1;
var titleSkills = await base.QueryFilterPage(new QueryBody()
{
@ -146,7 +145,7 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
{
var column = result2.result.DT_TableDataT1[i];
var item = new JObject
var item1 = new JObject
{
new JProperty("StaffID", column.StaffID),
new JProperty("DeptName", column.DeptName),
@ -156,7 +155,27 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
new JProperty("StaffType1Label", column.StaffType1Label),
new JProperty("TitleName", column.TitleName),
};
columns.Add(item);
//× 生手 技能有效期内所对应课程还未分配或课程学习时长为0
//◑ 受训中 技能有效期内所对应课程学习时长大于0小时
//☆ 熟练工 技能有效期内所对应的课程学习状态为已完成（含必修、选修课程状态）
//★ 可带教 员工技能所对应的课程学习状态已完成，且通过讲师课程培训学习和考核
titleSkills.result.DT_TableDataT1.ForEach(item =>
{
var key = item.CourseId + "_" + item.DeptId + "_" + item.TitleId + "_" + item.RequiredElective;
//if (dict.ContainsKey(column.Id.ObjToString()))
//{
// var ids = dict[column.Id.ObjToString()];
// if (ids.Where(id => id == x.TitleID).Any())
// item.Add(new JProperty("Title_" + x.TitleNo, "✔"));
// else
// item.Add(new JProperty("Title_" + x.TitleNo, ""));
//}
//else
item1.Add(new JProperty(key, "★"));
});
columns.Add(item1);
}
@ -189,7 +208,7 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
x.items.ForEach(item =>
{
var column1 = Mapper.Map(demoColumn).ToANew<TableColumn>();
column1.field = item.CourseId + "" + item.DeptId + item.TitleId + item.RequiredElective;
column1.field = item.CourseId + "_" + item.DeptId + "_" + item.TitleId + "_" + item.RequiredElective;
column1.label = item.CourseName;
column1.GroupName = x.Name;
module.Data.JM_TableColumnT1.TableColumn.Add(column1);

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

@ -38488,26 +38488,6 @@
Type Description balabala
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.IndateLabel">
<summary>
入职日期
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.StaffType1Label">
<summary>
员工类别1
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.DeptName">
<summary>
部门
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_TitleSkillMatrix_Boltone.TitleName">
<summary>
岗位
</summary>
</member>
<member name="P:Tiobon.Core.Model.ViewModels.Extend.Ghre_SurveyExtendBase.CoverImageUrl">
<summary>
封面图

Write Preview
Loading…
Cancel
Save