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] =?UTF-8?q?StaffInfoColumn=20=E5=A2=9E=E5=8A=A0dataType?= 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 @@ 已完成 + + + 培训记录-学习状态 + + + + + 已完成 + + + + + 未完成 + + 考试记录-状态