From 41398bc1f012629c69a9913d160fb30f605e6baf Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Wed, 23 Apr 2025 16:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=B4=B9=E7=94=A8=E8=AE=B2?= =?UTF-8?q?=E5=B8=88=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=20=E5=A4=96?= =?UTF-8?q?=E8=AE=AD=E7=94=B3=E8=AF=B7=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Api/Tiobon.Core.Model.xml | 345 ++++++++++++++++++ Tiobon.Core.Api/Tiobon.Core.xml | 5 + .../Ghre/Ghre_StudyRecordServices.cs | 4 + .../Ghre/Ghre_TitleSkill_BoltoneServices.cs | 54 ++- Tiobon.Core/Tiobon.Core.Model.xml | 345 ++++++++++++++++++ Tiobon.Core/Tiobon.Core.xml | 5 + 6 files changed, 740 insertions(+), 18 deletions(-) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index c537d061..ac92ccc8 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -15000,6 +15000,166 @@ DeptDataType + + + 考核指标 (Dto.Base) + + + + + 指标编号 + + + + + 指标内容 + + + + + 指标说明 + + + + + 目标达成说明 + + + + + 一级指标分类 + + + + + 二级指标分类 + + + + + 三级指标分类 + + + + + 默认权重(%) + + + + + 指标性质 + + + + + 评估部门分类 + + + + + 标签1 + + + + + 标签2 + + + + + 标签3 + + + + + 有效开始日 + + + + + 有效结束日 + + + + + 备注 + + + + + 排序 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + + + + 内置 + + 考核期间 (Dto.Base) @@ -17397,6 +17557,11 @@ Ghro_Dept (Dto.EditInput) + + + 考核指标 (Dto.EditInput) + + 考核期间 (Dto.EditInput) @@ -18023,6 +18188,11 @@ Ghro_Dept (Dto.InsertInput) + + + 考核指标 (Dto.InsertInput) + + 考核期间 (Dto.InsertInput) @@ -33267,6 +33437,166 @@ DeptDataType + + + 考核指标 (Model) + + + + + 指标编号 + + + + + 指标内容 + + + + + 指标说明 + + + + + 目标达成说明 + + + + + 一级指标分类 + + + + + 二级指标分类 + + + + + 三级指标分类 + + + + + 默认权重(%) + + + + + 指标性质 + + + + + 评估部门分类 + + + + + 标签1 + + + + + 标签2 + + + + + 标签3 + + + + + 有效开始日 + + + + + 有效结束日 + + + + + 备注 + + + + + 排序 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + + + + 内置 + + 考核期间 (Model) @@ -38413,6 +38743,21 @@ 修改信息 + + + 考核指标(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 考核期间(Dto.View1) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 3fd58c19..6bbae7a7 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -2209,6 +2209,11 @@ Ghro_Dept(Controller) + + + 考核指标(Controller) + + 考核期间(Controller) diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index ce0ab9b3..b44d5cc6 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -283,7 +283,11 @@ public class Ghre_StudyRecordServices : BaseServices().FirstAsync(x => x.CourseId == entity.CourseId); entity.CourseSnapId = snap?.Id; diff --git a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs index 5de8e889..a16a9e0d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs @@ -1,11 +1,4 @@ -using MySqlX.XDevAPI.Common; -using NPOI.OpenXmlFormats; -using NPOI.SS.Formula.Functions; -using OfficeOpenXml.FormulaParsing; -using Org.BouncyCastle.Utilities; -using System.Collections.Generic; - -namespace Tiobon.Core.Services; +namespace Tiobon.Core.Services; /// /// 岗位技能_宝连通 (服务) @@ -192,24 +185,44 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices - x.CourseId == item.CourseId && + if (await Db.Queryable().Where(x => + (x.CourseId == item.CourseId || x.CourseSceneId == item.CourseId) && x.StaffId == column.StaffID && x.StudyStatus == "NoFinish" && ((x.CourseBeginTime >= item.EffectiveDate && x.CourseBeginTime <= item.ExpiryDate) || (x.CourseEndTime >= item.EffectiveDate && x.CourseEndTime <= item.ExpiryDate)) ).AnyAsync()) value = "◑"; - if (await src.Where(x => - x.CourseId == item.CourseId && + if (await Db.Queryable().Where(x => + (x.CourseId == item.CourseId || x.CourseSceneId == item.CourseId) && x.StaffId == column.StaffID && x.StudyStatus == "HasFinish" && ((x.CourseBeginTime >= item.EffectiveDate && x.CourseBeginTime <= item.ExpiryDate) || (x.CourseEndTime >= item.EffectiveDate && x.CourseEndTime <= item.ExpiryDate)) ).AnyAsync()) value = "☆"; + string courseName = string.Empty; + courseName = await Db.Queryable().Where(x => x.Id == item.CourseId).Select(x => x.CourseName).FirstAsync(); + if (courseName.IsNullOrEmpty()) + courseName = await Db.Queryable().Where(x => x.Id == item.CourseId).Select(x => x.SceneName).FirstAsync(); + + + long? courseId = null; + + courseId = await Db.Queryable().Where(x => x.CourseName.Contains(courseName) && x.CourseName.Contains("可带教")).Select(x => x.Id).FirstAsync(); + if (courseId == 0) + courseId = await Db.Queryable().Where(x => x.SceneName.Contains(courseName) && x.SceneName.Contains("可带教")).Select(x => x.Id).FirstAsync(); + + if (courseId != null && courseId > 0) + if (await Db.Queryable().Where(x => + (x.CourseId == courseId || x.CourseSceneId == courseId) && + x.StaffId == column.StaffID && + x.StudyStatus == "HasFinish" && + ((x.CourseBeginTime >= item.EffectiveDate && x.CourseBeginTime <= item.ExpiryDate) || (x.CourseEndTime >= item.EffectiveDate && x.CourseEndTime <= item.ExpiryDate)) + ).AnyAsync()) + value = "★"; item1.Add(new JProperty(key, value)); } @@ -245,11 +258,16 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices { - var column1 = Mapper.Map(demoColumn).ToANew(); - 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); + var field = item.CourseId + "_" + item.DeptId + "_" + item.RequiredElective; + if (!module.Data.JM_TableColumnT1.TableColumn.Where(x => x.field == field).Any()) + { + + var column1 = Mapper.Map(demoColumn).ToANew(); + column1.field = field; + 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 c537d061..ac92ccc8 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -15000,6 +15000,166 @@ DeptDataType + + + 考核指标 (Dto.Base) + + + + + 指标编号 + + + + + 指标内容 + + + + + 指标说明 + + + + + 目标达成说明 + + + + + 一级指标分类 + + + + + 二级指标分类 + + + + + 三级指标分类 + + + + + 默认权重(%) + + + + + 指标性质 + + + + + 评估部门分类 + + + + + 标签1 + + + + + 标签2 + + + + + 标签3 + + + + + 有效开始日 + + + + + 有效结束日 + + + + + 备注 + + + + + 排序 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + + + + 内置 + + 考核期间 (Dto.Base) @@ -17397,6 +17557,11 @@ Ghro_Dept (Dto.EditInput) + + + 考核指标 (Dto.EditInput) + + 考核期间 (Dto.EditInput) @@ -18023,6 +18188,11 @@ Ghro_Dept (Dto.InsertInput) + + + 考核指标 (Dto.InsertInput) + + 考核期间 (Dto.InsertInput) @@ -33267,6 +33437,166 @@ DeptDataType + + + 考核指标 (Model) + + + + + 指标编号 + + + + + 指标内容 + + + + + 指标说明 + + + + + 目标达成说明 + + + + + 一级指标分类 + + + + + 二级指标分类 + + + + + 三级指标分类 + + + + + 默认权重(%) + + + + + 指标性质 + + + + + 评估部门分类 + + + + + 标签1 + + + + + 标签2 + + + + + 标签3 + + + + + 有效开始日 + + + + + 有效结束日 + + + + + 备注 + + + + + 排序 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + + + + 内置 + + 考核期间 (Model) @@ -38413,6 +38743,21 @@ 修改信息 + + + 考核指标(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 考核期间(Dto.View1) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 3fd58c19..6bbae7a7 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -2209,6 +2209,11 @@ Ghro_Dept(Controller) + + + 考核指标(Controller) + + 考核期间(Controller)