From 7bad8eb2d01e1ba918deb77fe3cf2f52aea403d2 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Fri, 18 Apr 2025 15:55:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=8A=80=E8=83=BD=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=5F=E5=AE=9D=E8=BF=9E=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml         | 20 -----------
 .../Ghre/Ghre_TitleSkill_BoltoneServices.cs   | 33 +++++++++++++++----
 Tiobon.Core/Tiobon.Core.Model.xml             | 20 -----------
 3 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index d4f97082..9c9df59e 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -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>
             封面图
diff --git a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
index 100b20a0..d03f2e5a 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
@@ -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);
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index d4f97082..9c9df59e 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -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>
             封面图