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

Merge branch 'master' of http://git.tiobon.com/Simon/Tiobon.Web.Core

Browse Source
master
孤兰 2 months ago
parent 3ccfa6203f 41398bc1f0
commit 94063a4c1d
4 changed files with 390 additions and 18 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. 345
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 5
      Tiobon.Core.Api/Tiobon.Core.xml
  3. 4
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
  4. 54
      Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs

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

@ -15000,6 +15000,166 @@
DeptDataType
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase">
<summary>
考核指标 (Dto.Base)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemNo">
<summary>
指标编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemName">
<summary>
指标内容
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemCaption">
<summary>
指标说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.TargetCaption">
<summary>
目标达成说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemType1">
<summary>
一级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemType2">
<summary>
二级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemType3">
<summary>
三级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemWeight">
<summary>
默认权重(%)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ItemKind">
<summary>
指标性质
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.DeptType">
<summary>
评估部门分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Tag1">
<summary>
标签1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Tag2">
<summary>
标签2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Tag3">
<summary>
标签3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.BeginDate">
<summary>
有效开始日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.EndDate">
<summary>
有效结束日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.SortNo">
<summary>
排序
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemBase.BuiltIn">
<summary>
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodBase">
<summary>
考核期间 (Dto.Base)
@ -17397,6 +17557,11 @@
Ghro_Dept (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrp_PerformanceItemInput">
<summary>
考核指标 (Dto.EditInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.EditGhrp_PerformancePeriodInput">
<summary>
考核期间 (Dto.EditInput)
@ -18023,6 +18188,11 @@
Ghro_Dept (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrp_PerformanceItemInput">
<summary>
考核指标 (Dto.InsertInput)
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.InsertGhrp_PerformancePeriodInput">
<summary>
考核期间 (Dto.InsertInput)
@ -33267,6 +33437,166 @@
DeptDataType
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceItem">
<summary>
考核指标 (Model)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemNo">
<summary>
指标编号
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemName">
<summary>
指标内容
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemCaption">
<summary>
指标说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.TargetCaption">
<summary>
目标达成说明
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemType1">
<summary>
一级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemType2">
<summary>
二级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemType3">
<summary>
三级指标分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemWeight">
<summary>
默认权重(%)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ItemKind">
<summary>
指标性质
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.DeptType">
<summary>
评估部门分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Tag1">
<summary>
标签1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Tag2">
<summary>
标签2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Tag3">
<summary>
标签3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.BeginDate">
<summary>
有效开始日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.EndDate">
<summary>
有效结束日
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.SortNo">
<summary>
排序
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.IsDefault">
<summary>
默认标志
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse1">
<summary>
预留字段1
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse2">
<summary>
预留字段2
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse3">
<summary>
预留字段3
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse4">
<summary>
预留字段4
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse5">
<summary>
预留字段5
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse6">
<summary>
预留字段6
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse7">
<summary>
预留字段7
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse8">
<summary>
预留字段8
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse9">
<summary>
预留字段9
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.Reverse10">
<summary>
预留字段10
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ReverseI1">
<summary>
预留字段11
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.ReverseI2">
<summary>
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItem.BuiltIn">
<summary>
内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformancePeriod">
<summary>
考核期间 (Model)
@ -38413,6 +38743,21 @@
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformanceItemDto">
<summary>
考核指标(Dto.View1)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghrp_PerformanceItemDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghrp_PerformancePeriodDto">
<summary>
考核期间(Dto.View1)

5
Tiobon.Core.Api/Tiobon.Core.xml
Unescape View File

@ -2209,6 +2209,11 @@
Ghro_Dept(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrp_PerformanceItemController">
<summary>
考核指标(Controller)
</summary>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghrp_PerformancePeriodController">
<summary>
考核期间(Controller)

4
Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
Unescape View File

@ -283,7 +283,11 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
throw new Exception("学习结束时间需小于当前时间！");
TimeSpan timeDifference = entity.EndTime.Value - entity.BeginTime.Value;
entity.StudyDuration = (decimal)timeDifference.TotalMinutes;
entity.CourseBeginTime = entity.BeginTime;
entity.CourseEndTime = entity.EndTime;
}
entity.StudyStatus = "HasFinish";
var snap = await Db.Queryable<Ghre_CourseSnap>().FirstAsync(x => x.CourseId == entity.CourseId);
entity.CourseSnapId = snap?.Id;

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

@ -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;
/// <summary>
/// 岗位技能_宝连通 (服务)
@ -192,24 +185,44 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
var item = titleSkills.result.DT_TableDataT1[j];
if (column.DeptID != item.DeptId || column.TitleID != item.TitleId)
continue;
var key = item.CourseId + "_" + item.DeptId + "_" + item.TitleId + "_" + item.RequiredElective;
var key = item.CourseId + "_" + item.DeptId + "_" + item.RequiredElective;
var value = "×";
if (await src.Where(x =>
x.CourseId == item.CourseId &&
if (await Db.Queryable<Ghre_StudyRecord>().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<Ghre_StudyRecord>().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<Ghre_Course>().Where(x => x.Id == item.CourseId).Select(x => x.CourseName).FirstAsync();
if (courseName.IsNullOrEmpty())
courseName = await Db.Queryable<Ghre_CourseScene>().Where(x => x.Id == item.CourseId).Select(x => x.SceneName).FirstAsync();
long? courseId = null;
courseId = await Db.Queryable<Ghre_Course>().Where(x => x.CourseName.Contains(courseName) && x.CourseName.Contains("可带教")).Select(x => x.Id).FirstAsync();
if (courseId == 0)
courseId = await Db.Queryable<Ghre_CourseScene>().Where(x => x.SceneName.Contains(courseName) && x.SceneName.Contains("可带教")).Select(x => x.Id).FirstAsync();
if (courseId != null && courseId > 0)
if (await Db.Queryable<Ghre_StudyRecord>().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<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.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<TableColumn>();
column1.field = field;
column1.label = item.CourseName;
column1.GroupName = x.Name;
module.Data.JM_TableColumnT1.TableColumn.Add(column1);
}
});
});

Write Preview
Loading…
Cancel
Save