From c13098b40b54fbc8ae49ce6ae70c7a35b0118c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E5=85=B0?= Date: Wed, 30 Apr 2025 11:42:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?StaffInfoColumn=20=E5=A2=9E=E5=8A=A0dataTyp?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Api/Tiobon.Core.Model.xml | 35 +++++++++++++++++++ .../Ghra/Ghra_StaffGroupServices.cs | 7 ++-- Tiobon.Core/Tiobon.Core.Model.xml | 35 +++++++++++++++++++ 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 0bdd0484..fce35185 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -39568,6 +39568,26 @@ 手动选修 + + + 考试管理-学习完成标准 + + + + + 学习完成+考试合格 + + + + + 学习完成 + + + + + 不学习但考试合格 + + 培训规则种类 @@ -39643,6 +39663,21 @@ 已完成 + + + 培训记录-学习状态 + + + + + 已完成 + + + + + 未完成 + + 考试记录-状态 diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs index ea6e1e63..5dd8c351 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs @@ -92,7 +92,7 @@ namespace Tiobon.Core.Services else '' end dataSourceType, dbo.FS_GetdataSourceBySet('',DataSourceType, DataSource) dataSource , case when ColumnType in ('OrgTreeSelect','ApiSelect','StaffSelect') then 1 - else 0 end multipleSelect, + else 0 end multipleSelectInt, (select ParaDetailNo operatorNo,ParaDetailName operatorDesc,SqlFunction operatorIcon,SortNo from Ghrs_ParaDetail where IsEnable= 1 and ParaDetailNo in (select value from dbo.Fs1_GHR30_SplitString(case when ColumnType in ('OrgTreeSelect','ApiSelect','StaffSelect') @@ -129,10 +129,11 @@ namespace Tiobon.Core.Services public string StaffInfoColumnNo { get; set; } public string StaffInfoColumnName { get; set; } public string elementType { get; set; } + public string dataType { get; set; } public string dataSourceType { get; set; } public string dataSource { get; set; } - public int multipleSelect { get; set; } - + public int multipleSelectInt { get; set; } + public bool multipleSelect => multipleSelectInt==1?true :false; public string OperatorDataStr { get; set; } public List operatorData { get; set; } } diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 0bdd0484..fce35185 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -39568,6 +39568,26 @@ 手动选修 + + + 考试管理-学习完成标准 + + + + + 学习完成+考试合格 + + + + + 学习完成 + + + + + 不学习但考试合格 + + 培训规则种类 @@ -39643,6 +39663,21 @@ 已完成 + + + 培训记录-学习状态 + + + + + 已完成 + + + + + 未完成 + + 考试记录-状态 From af6b40a2f6e14fb319471a0d13a20afc3e6cb58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E5=85=B0?= Date: Wed, 30 Apr 2025 14:50:17 +0800 Subject: [PATCH 2/3] StaffGroup update FieldValue_Object Attr --- .../Ghra/Ghra_StaffGroupDetail.Dto.Base.cs | 2 +- .../Models/Ghra/Ghra_StaffGroupDetail.cs | 2 +- .../Ghra/Ghra_StaffGroupServices.cs | 38 +++++++++++++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs index 08d1dcd1..8fb7f8b3 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs @@ -47,7 +47,7 @@ namespace Tiobon.Core.Model.Models /// 字段所选值 /// [Display(Name = "FieldValue"), Description("字段所选值"), MaxLength(-1, ErrorMessage = "字段所选值 不能超过 -1 个字符")] - public string FieldValue { get; set; } + public object FieldValue { get; set; } /// /// 备注 diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs index 0251e3cb..8da0322d 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs @@ -49,7 +49,7 @@ namespace Tiobon.Core.Model.Models /// 字段所选值 /// [Display(Name = "FieldValue"), Description("字段所选值"), MaxLength(-1, ErrorMessage = "字段所选值 不能超过 -1 个字符")] - public string FieldValue { get; set; } + public object FieldValue { get; set; } /// /// 备注 diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs index 5dd8c351..702f5b31 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs @@ -60,7 +60,23 @@ namespace Tiobon.Core.Services var StaffGroupDetail = await _StaffGroupDetailServices.Query(x => x.StaffGroupID == body.id); result.result.DT_TableDataT1[0].StaffGroupDetail = StaffGroupDetail.OrderBy(x => x.SortNo).ToList(); - + result.result.DT_TableDataT1[0].StaffGroupDetail.ForEach((x) => + { + if (x.FieldValue != null) + { + if (JsonHelper.IsJson(x.FieldValue.ToString())) + { + try + { + x.FieldValue = JsonHelper.JsonToObj>(x.FieldValue.ToString()); + } + catch (Exception) + { + x.FieldValue = JsonHelper.JsonToObj>(x.FieldValue.ToString()); + } + } + } + }); if (body.doType == "Copy") { result.result.DT_TableDataT1[0].StaffGroupNo = null; @@ -82,8 +98,8 @@ namespace Tiobon.Core.Services return result; } - public async Task> GetStaffInfoColumnData() - { + public async Task> GetStaffInfoColumnData() + { string sql = @$"select StaffInfoColumnNo, dbo.FLangKeyToValue(MKey,1,StaffInfoColumnName) StaffInfoColumnName, ColumnType elementType, @@ -115,34 +131,34 @@ namespace Tiobon.Core.Services and StaffInfoGroupId = 1 and IsRelease = 1 and StaffInfoColumnNo != 'AttachmentIDs' "; - + var result = Db.Ado.SqlQuery(sql); - result.ForEach( x => + result.ForEach(x => { - x.operatorData = JsonConvert.DeserializeObject>(x.OperatorDataStr); + x.operatorData = JsonConvert.DeserializeObject>(x.OperatorDataStr); }); return ServiceResult.OprateSuccess("查询成功！", result); } - public class StaffInfoColumn() + public class StaffInfoColumn() { - public string StaffInfoColumnNo { get; set; } + public string StaffInfoColumnNo { get; set; } public string StaffInfoColumnName { get; set; } public string elementType { get; set; } public string dataType { get; set; } public string dataSourceType { get; set; } public string dataSource { get; set; } public int multipleSelectInt { get; set; } - public bool multipleSelect => multipleSelectInt==1?true :false; + public bool multipleSelect => multipleSelectInt == 1 ? true : false; public string OperatorDataStr { get; set; } - public List operatorData { get; set; } + public List operatorData { get; set; } } public class OperatorData() { public string operatorNo { get; set; } public string ParaDetailName { get; set; } public string operatorIcon { get; set; } - public string SortNo { get; set; } + public string SortNo { get; set; } } } From 2a21adb88c8f81ba728be90bdd9406a6d98f20c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E5=85=B0?= Date: Wed, 30 Apr 2025 15:07:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?StaffGroup=E5=A2=9E=E5=8A=A0=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ghra/Ghra_StaffGroupServices.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs index 702f5b31..dacbd1d3 100644 --- a/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs +++ b/Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs @@ -88,12 +88,14 @@ namespace Tiobon.Core.Services { var result = await base.QueryFilterPage(filter, condition, IsEnable); - //var a = await _StaffGroupDetailServices.Query(); - //result.result.DT_TableDataT1.ForEach(async x => - //{ - // x.DetailInfo = (await _StaffGroupDetailServices.Query(a => a.StaffGroupID == x.Id)) - // .Select(a => a.StaffField).ToString(); - //}); + + result.result.DT_TableDataT1.ForEach(async x => + { + x.DetailInfo = Db.Ado.SqlQuerySingle($@"select stuff((select distinct ',' + (select top 1 dbo.FLangKeyToValue(MKey,1,StaffInfoColumnName) from Ghra_StaffInfoColumn where IsEnable=1 and StaffInfoGroupId = 1 and IsRelease = 1 and StaffInfoColumnNo=a.StaffField) + from Ghra_StaffGroupDetail a + where StaffGroupID = {x.Id} + for XML path(''),type).value('.','nvarchar(max)'),1,1,'')"); + }); return result; }