培训需求、培训计划、问卷设定新增内置字段

master
xiaochanghai 3 months ago
parent b3fc343093
commit 42c6f0efbd
  1. 5033
      Model/Tiobon.Web.pdm
  2. 30
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_Plan.Dto.Base.cs
  4. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_Request.Dto.Base.cs
  5. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_Survey.Dto.Base.cs
  6. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_Plan.cs
  7. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_Request.cs
  8. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_Survey.cs
  9. 1
      Tiobon.Core.Model/View/Ghre/Ghre_Plan.Dto.View.cs
  10. 1
      Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs
  11. 1
      Tiobon.Core.Model/ViewModels/Extend/FromGhre_QuestionInput.cs
  12. 2
      Tiobon.Core.Services/CommonServices.cs
  13. 13
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
  14. 1
      Tiobon.Core.Services/Ghre/Ghre_PlanServices.cs
  15. 14
      Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
  16. 1
      Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
  17. 30
      Tiobon.Core/Tiobon.Core.Model.xml

File diff suppressed because it is too large Load Diff

@ -6115,6 +6115,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_PlanBase.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_QuestionBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_QuestionBase">
<summary> <summary>
题目 (Dto.Base) 题目 (Dto.Base)
@ -6610,6 +6615,11 @@
培训预期效果 培训预期效果
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
<summary> <summary>
必选修查询 (Dto.Base) 必选修查询 (Dto.Base)
@ -8015,6 +8025,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_SurveyBase.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOptionBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOptionBase">
<summary> <summary>
问卷调查选项 (Dto.Base) 问卷调查选项 (Dto.Base)
@ -22962,6 +22977,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Plan.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_Question"> <member name="T:Tiobon.Core.Model.Models.Ghre_Question">
<summary> <summary>
题目 (Model) 题目 (Model)
@ -23457,6 +23477,11 @@
培训预期效果 培训预期效果
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse"> <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
<summary> <summary>
必选修查询 (Model) 必选修查询 (Model)
@ -24792,6 +24817,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Survey.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOption"> <member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOption">
<summary> <summary>
问卷调查选项 (Model) 问卷调查选项 (Model)

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/3/26 10:17:03 SimonHsiao *V0.01 2025/4/8 11:44:41 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -227,6 +227,11 @@ public class Ghre_PlanBase
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 系统内置
/// </summary>
public int? BuiltIn { get; set; }
public List<int> StaffId { get; set; } public List<int> StaffId { get; set; }
public List<string> Months { get; set; } = new List<string>(); public List<string> Months { get; set; } = new List<string>();
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/2/28 9:47:32 SimonHsiao *V0.01 2025/4/8 11:44:56 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -317,4 +317,9 @@ public class Ghre_RequestBase
/// </summary> /// </summary>
[Display(Name = "DesiredResult"), Description("培训预期效果"), MaxLength(2000, ErrorMessage = "培训预期效果 不能超过 2000 个字符")] [Display(Name = "DesiredResult"), Description("培训预期效果"), MaxLength(2000, ErrorMessage = "培训预期效果 不能超过 2000 个字符")]
public string DesiredResult { get; set; } public string DesiredResult { get; set; }
/// <summary>
/// 系统内置
/// </summary>
public int? BuiltIn { get; set; }
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/4/1 16:25:48 SimonHsiao *V0.01 2025/4/8 11:45:17 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -226,4 +226,9 @@ public class Ghre_SurveyBase
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 系统内置
/// </summary>
public int? BuiltIn { get; set; }
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/3/26 10:17:03 SimonHsiao *V0.01 2025/4/8 11:44:41 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -227,4 +227,9 @@ public class Ghre_Plan : BasePoco
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 系统内置
/// </summary>
public int? BuiltIn { get; set; }
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/2/28 9:47:32 SimonHsiao *V0.01 2025/4/8 11:44:56 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -318,4 +318,9 @@ public class Ghre_Request : BasePoco
/// </summary> /// </summary>
[Display(Name = "DesiredResult"), Description("培训预期效果"), MaxLength(2000, ErrorMessage = "培训预期效果 不能超过 2000 个字符")] [Display(Name = "DesiredResult"), Description("培训预期效果"), MaxLength(2000, ErrorMessage = "培训预期效果 不能超过 2000 个字符")]
public string DesiredResult { get; set; } public string DesiredResult { get; set; }
/// <summary>
/// 系统内置
/// </summary>
public int? BuiltIn { get; set; }
} }

@ -6,7 +6,7 @@
* *
* Ver * Ver
* *
*V0.01 2025/4/1 16:25:48 SimonHsiao *V0.01 2025/4/8 11:45:17 SimonHsiao
* *
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
* *
@ -227,4 +227,9 @@ public class Ghre_Survey : BasePoco
/// 预留字段12 /// 预留字段12
/// </summary> /// </summary>
public int? ReverseI2 { get; set; } public int? ReverseI2 { get; set; }
/// <summary>
/// 系统内置
/// </summary>
public int? BuiltIn { get; set; }
} }

@ -52,4 +52,5 @@ public class Ghre_PlanDto : Ghre_Plan
public string M10 { get; set; } public string M10 { get; set; }
public string M11 { get; set; } public string M11 { get; set; }
public string M12 { get; set; } public string M12 { get; set; }
public string BuiltInLabel { get; set; }
} }

@ -64,6 +64,7 @@ public class Ghre_RequestDto : Ghre_Request
/// 合计天数 /// 合计天数
/// </summary> /// </summary>
public string TotalTrainDays { get; set; } = "0"; public string TotalTrainDays { get; set; } = "0";
public string BuiltInLabel { get; set; }
} }

@ -27,6 +27,7 @@ public class FromGhre_QuestionBaseData
{ {
public List<long?> courseID { get; set; } = new List<long?> { }; public List<long?> courseID { get; set; } = new List<long?> { };
public string questionNo { get; set; } public string questionNo { get; set; }
public int? BuiltIn { get; set; }
/// <summary> /// <summary>

@ -1048,7 +1048,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
break; break;
case "F_CourseClassification": //case "F_CourseClassification":
case "F_CourseScene": case "F_CourseScene":
index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "BatchUpdateYN"); index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "BatchUpdateYN");
if (index >= 0) if (index >= 0)

@ -339,6 +339,15 @@ public class Ghre_ExamPaperServices : BaseServices<Ghre_ExamPaper, Ghre_ExamPape
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
dataSource = "/api/Common/GetSelect/Ghre_CourseScene?FW=DOTNETCORE" dataSource = "/api/Common/GetSelect/Ghre_CourseScene?FW=DOTNETCORE"
},
new DefaultGhre_ExamPaperColumn()
{
label = "系统内置",
field = "BuiltIn",
elementType = "Switch",
required = true,
multipleSelect = false,
editable = true,
} }
}; };
#endregion #endregion
@ -478,6 +487,7 @@ public class Ghre_ExamPaperServices : BaseServices<Ghre_ExamPaper, Ghre_ExamPape
baseData.LinkType = "CourseId"; baseData.LinkType = "CourseId";
baseData.CourseId = null; baseData.CourseId = null;
baseData.CourseSceneId = null; baseData.CourseSceneId = null;
baseData.BuiltIn = null;
input.pageData.baseData = baseData; input.pageData.baseData = baseData;
input.pageData.examPaperSetType = "random"; input.pageData.examPaperSetType = "random";
@ -496,6 +506,7 @@ public class Ghre_ExamPaperServices : BaseServices<Ghre_ExamPaper, Ghre_ExamPape
baseData.RetakeTimes = exampaper.RetakeTimes; baseData.RetakeTimes = exampaper.RetakeTimes;
baseData.RemarkSz = exampaper.RemarkSz; baseData.RemarkSz = exampaper.RemarkSz;
baseData.LinkType = exampaper.LinkType; baseData.LinkType = exampaper.LinkType;
baseData.BuiltIn = exampaper.BuiltIn;
baseData.CourseId = exampaper.LinkType == "CourseId" ? exampaper.LinkId : null; baseData.CourseId = exampaper.LinkType == "CourseId" ? exampaper.LinkId : null;
baseData.CourseSceneId = exampaper.LinkType == "CourseSceneId" ? exampaper.LinkId : null; baseData.CourseSceneId = exampaper.LinkType == "CourseSceneId" ? exampaper.LinkId : null;
input.pageData.baseData = baseData; input.pageData.baseData = baseData;
@ -659,6 +670,7 @@ public class Ghre_ExamPaperServices : BaseServices<Ghre_ExamPaper, Ghre_ExamPape
insert.CoverBackGround = insertModel.styleInfo.coverBackGround; insert.CoverBackGround = insertModel.styleInfo.coverBackGround;
insert.Style = insertModel.styleInfo.paperStyle; insert.Style = insertModel.styleInfo.paperStyle;
insert.SetMethod = insertModel.examPaperSetType; insert.SetMethod = insertModel.examPaperSetType;
insert.BuiltIn = insertModel.baseData.BuiltIn;
insert.Status = "Draft"; insert.Status = "Draft";
var id = await Add(insert); var id = await Add(insert);
@ -722,6 +734,7 @@ delete from Ghre_ExamPaperQuestion WHERE ExamPaperId='{id}';");
insert.CoverBackGround = insertModel.styleInfo.coverBackGround; insert.CoverBackGround = insertModel.styleInfo.coverBackGround;
insert.Style = insertModel.styleInfo.paperStyle; insert.Style = insertModel.styleInfo.paperStyle;
insert.SetMethod = insertModel.examPaperSetType; insert.SetMethod = insertModel.examPaperSetType;
insert.BuiltIn = insertModel.baseData.BuiltIn;
insert.Status = "Draft"; insert.Status = "Draft";

@ -92,6 +92,7 @@ public class Ghre_PlanServices : BaseServices<Ghre_Plan, Ghre_PlanDto, InsertGhr
if (DT_TableDataT1[i].TrainNum != null && DT_TableDataT1[i].TrainDays != null) if (DT_TableDataT1[i].TrainNum != null && DT_TableDataT1[i].TrainDays != null)
DT_TableDataT1[i].TotalDays = DT_TableDataT1[i].TrainNum * DT_TableDataT1[i].TrainDays; DT_TableDataT1[i].TotalDays = DT_TableDataT1[i].TrainNum * DT_TableDataT1[i].TrainDays;
DT_TableDataT1[i].BuiltInLabel = DT_TableDataT1[i].BuiltIn == 1 ? "是" : "否";
} }
ModuleParam param = new ModuleParam() ModuleParam param = new ModuleParam()

@ -314,6 +314,17 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
dataSource = "", dataSource = "",
placeholder = "保存后自动生成" placeholder = "保存后自动生成"
}); });
data.Column.Add(new FromGhre_QuestionColumn()
{
label = "系统内置",
field = "BuiltIn",
elementType = "Switch",
required = false,
multipleSelect = false,
editable = true,
dataSource = "",
placeholder = "保存后自动生成"
});
#endregion #endregion
@ -424,6 +435,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
data.PageData.baseData.courseID = JsonHelper.JsonToObj<List<long?>>(question.CourseIds); data.PageData.baseData.courseID = JsonHelper.JsonToObj<List<long?>>(question.CourseIds);
data.PageData.baseData.CreateDataInfo = question.CreateDataInfo; data.PageData.baseData.CreateDataInfo = question.CreateDataInfo;
data.PageData.baseData.UpdateDataInfo = question.UpdateDataInfo; data.PageData.baseData.UpdateDataInfo = question.UpdateDataInfo;
data.PageData.baseData.BuiltIn = question.BuiltIn;
var questionType = data.PageData.questionType.Where(x => x.type == question.QuestionType).FirstOrDefault(); var questionType = data.PageData.questionType.Where(x => x.type == question.QuestionType).FirstOrDefault();
if (questionType != null) if (questionType != null)
@ -500,6 +512,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
var insert = new InsertGhre_QuestionInput(); var insert = new InsertGhre_QuestionInput();
//insert.CourseId = courseID; //insert.CourseId = courseID;
insert.CourseIds = JsonHelper.ObjToJson(insertModel.baseData.courseID); insert.CourseIds = JsonHelper.ObjToJson(insertModel.baseData.courseID);
insert.BuiltIn = insertModel.baseData.BuiltIn;
insert.QuestionType = questionType.type; insert.QuestionType = questionType.type;
insert.DifficultyLevel = questionType.detail.difficulty; insert.DifficultyLevel = questionType.detail.difficulty;
@ -591,6 +604,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
edit.CourseId = editModel.baseData.courseID[0]; edit.CourseId = editModel.baseData.courseID[0];
edit.QuestionType = questionType.type; edit.QuestionType = questionType.type;
edit.BuiltIn = editModel.baseData.BuiltIn;
edit.DifficultyLevel = questionType.detail.difficulty; edit.DifficultyLevel = questionType.detail.difficulty;
edit.QuestionContent = questionType.detail.content; edit.QuestionContent = questionType.detail.content;
edit.QuestionAnalysis = questionType.detail.RemarkSz; edit.QuestionAnalysis = questionType.detail.RemarkSz;

@ -90,6 +90,7 @@ FROM Ghre_Request A
var TotalTrainDays = x.TrainDays * x.RequestNum; var TotalTrainDays = x.TrainDays * x.RequestNum;
x.TotalTrainDays = StringHelper.TrimDecimalString(TotalTrainDays); x.TotalTrainDays = StringHelper.TrimDecimalString(TotalTrainDays);
} }
x.BuiltInLabel = x.BuiltIn == 1 ? "是" : "否";
}); });
return result; return result;

@ -6115,6 +6115,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_PlanBase.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_QuestionBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_QuestionBase">
<summary> <summary>
题目 (Dto.Base) 题目 (Dto.Base)
@ -6610,6 +6615,11 @@
培训预期效果 培训预期效果
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
<summary> <summary>
必选修查询 (Dto.Base) 必选修查询 (Dto.Base)
@ -8015,6 +8025,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_SurveyBase.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOptionBase"> <member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOptionBase">
<summary> <summary>
问卷调查选项 (Dto.Base) 问卷调查选项 (Dto.Base)
@ -22962,6 +22977,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Plan.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_Question"> <member name="T:Tiobon.Core.Model.Models.Ghre_Question">
<summary> <summary>
题目 (Model) 题目 (Model)
@ -23457,6 +23477,11 @@
培训预期效果 培训预期效果
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Request.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse"> <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
<summary> <summary>
必选修查询 (Model) 必选修查询 (Model)
@ -24792,6 +24817,11 @@
预留字段12 预留字段12
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Survey.BuiltIn">
<summary>
系统内置
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOption"> <member name="T:Tiobon.Core.Model.Models.Ghre_SurveyOption">
<summary> <summary>
问卷调查选项 (Model) 问卷调查选项 (Model)

Loading…
Cancel
Save