StaffInfoColumn 增加dataType

master
孤兰 2 months ago
parent 092210b69d
commit c13098b40b
  1. 35
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 7
      Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs
  3. 35
      Tiobon.Core/Tiobon.Core.Model.xml

@ -39568,6 +39568,26 @@
手动选修
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE">
<summary>
考试管理-学习完成标准
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.EXAM_PASS">
<summary>
学习完成+考试合格
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.STUDY_FINISHED">
<summary>
学习完成
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.NO_STUDY_EXAM_PASS">
<summary>
不学习但考试合格
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_TRAINING_STUDY_RULE_TRAIN_TYPE">
<summary>
培训规则种类
@ -39643,6 +39663,21 @@
已完成
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS">
<summary>
培训记录-学习状态
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.FINISHED">
<summary>
已完成
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.NO_FINISH">
<summary>
未完成
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">
<summary>
考试记录-状态

@ -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> operatorData { get; set; }
}

@ -39568,6 +39568,26 @@
手动选修
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE">
<summary>
考试管理-学习完成标准
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.EXAM_PASS">
<summary>
学习完成+考试合格
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.STUDY_FINISHED">
<summary>
学习完成
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_STUDY_FINISHED_RULE.NO_STUDY_EXAM_PASS">
<summary>
不学习但考试合格
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_TRAINING_STUDY_RULE_TRAIN_TYPE">
<summary>
培训规则种类
@ -39643,6 +39663,21 @@
已完成
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS">
<summary>
培训记录-学习状态
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.FINISHED">
<summary>
已完成
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.NO_FINISH">
<summary>
未完成
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">
<summary>
考试记录-状态

Loading…
Cancel
Save