2.新增 考试新增页的基础数据接口

master
xiaochanghai 1 year ago
parent 7d0cf3faab
commit b96b8bcecb
  1. 20
      Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamController.cs
  2. 10
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 1
      Tiobon.Core.Api/Tiobon.Core.xml
  4. 2
      Tiobon.Core.IServices/Ghre/IGhre_ExamServices.cs
  5. 54
      Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamInput.cs
  6. 3
      Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamPaperInput.cs
  7. 180
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  8. 10
      Tiobon.Core/Tiobon.Core.Model.xml
  9. 1
      Tiobon.Core/Tiobon.Core.xml

@ -20,8 +20,7 @@ public class Ghre_ExamController : BaseController<IGhre_ExamServices, Ghre_Exam,
[HttpPost, Route("GetModuleInfo")] [HttpPost, Route("GetModuleInfo")]
public async Task<dynamic> GetModuleInfo([FromBody] ModuleParam param) public async Task<dynamic> GetModuleInfo([FromBody] ModuleParam param)
{ {
var data = await _service.GetModuleInfo(param); return await _service.GetModuleInfo(param);
return data;
} }
#endregion #endregion
@ -36,8 +35,21 @@ public class Ghre_ExamController : BaseController<IGhre_ExamServices, Ghre_Exam,
[HttpPost, Route("QueryList/{status}")] [HttpPost, Route("QueryList/{status}")]
public async Task<ServicePageResult<Ghre_ExamDto>> QueryList(string status, [FromBody] QueryBody body) public async Task<ServicePageResult<Ghre_ExamDto>> QueryList(string status, [FromBody] QueryBody body)
{ {
var data = await _service.QueryList(body, status); return await _service.QueryList(body, status);
return data; }
#endregion
#region 查询明细数据
/// <summary>
/// 查询明细数据
/// </summary>
/// <param name="status">status</param
/// <returns></returns>
[HttpPost, Route("QueryDefault/{id}")]
public async Task<ServiceResult<DefaultGhre_ExamInput>> QueryDefault(long id)
{
return await _service.QueryDefault(id);
} }
#endregion #endregion

@ -6334,6 +6334,16 @@
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamInput.UpdateDataInfo">
<summary>
修改信息 黄一名 于 2024-05-10 15:02 最后修改
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamInput.CreateDataInfo">
<summary>
创建信息 黄一名 于 2024-05-10 14:57 创建
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.UpdateDataInfo"> <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.UpdateDataInfo">
<summary> <summary>
修改信息 黄一名 于 2024-05-10 15:02 最后修改 修改信息 黄一名 于 2024-05-10 15:02 最后修改

@ -598,6 +598,7 @@
<param name="body">条件</param> <param name="body">条件</param>
<returns></returns> <returns></returns>
</member> </member>
<!-- Badly formed XML comment ignored for member "M:Tiobon.Core.Api.Controllers.Ghre_ExamController.QueryDefault(System.Int64)" -->
<member name="T:Tiobon.Core.Api.Controllers.Ghre_ExamPaperConfigController"> <member name="T:Tiobon.Core.Api.Controllers.Ghre_ExamPaperConfigController">
<summary> <summary>
试卷配置(Controller) 试卷配置(Controller)

@ -12,5 +12,7 @@ namespace Tiobon.Core.IServices
{ {
Task<dynamic> GetModuleInfo(ModuleParam param); Task<dynamic> GetModuleInfo(ModuleParam param);
Task<ServicePageResult<Ghre_ExamDto>> QueryList(QueryBody body, string status); Task<ServicePageResult<Ghre_ExamDto>> QueryList(QueryBody body, string status);
Task<ServiceResult<DefaultGhre_ExamInput>> QueryDefault(long Id);
} }
} }

@ -0,0 +1,54 @@
using Tiobon.Core.Model.Models;
namespace Tiobon.Core.Model;
public class DefaultGhre_ExamInput
{
public List<DefaultGhre_ExamColumn> baseColumns { get; set; } = new List<DefaultGhre_ExamColumn>();
public List<DefaultGhre_ExamColumn> staffTableColumns { get; set; } = new List<DefaultGhre_ExamColumn>();
public DefaultGhre_ExamPageData pageData { get; set; } = new DefaultGhre_ExamPageData();
/// <summary>
/// 修改信息 黄一名 于 2024-05-10 15:02 最后修改
/// </summary>
public string UpdateDataInfo { get; set; }
/// <summary>
/// 创建信息 黄一名 于 2024-05-10 14:57 创建
/// </summary>
public string CreateDataInfo { get; set; }
}
public class DefaultGhre_ExamColumn
{
public string label { get; set; }
public string field { get; set; }
public string elementType { get; set; }
public bool required { get; set; }
public bool multipleSelect { get; set; }
public bool editable { get; set; }
public string dataSource { get; set; }
public string placeholder { get; set; }
public int displayType { get; set; }
public int width { get; set; } = 150;
public string @fixed { get; set; }
public string align { get; set; }
}
public class DefaultGhre_ExamPageData : Ghre_ExamBase
{
public List<StaffTableData> staffTableData { get; set; } = new List<StaffTableData>();
}
public class StaffTableData
{
public int StaffID { get; set; }
public string StaffNo { get; set; }
public string StaffName { get; set; }
public string DeptName { get; set; }
public string TitleName { get; set; }
public string InDate { get; set; }
public string Mail { get; set; }
public string DataSource { get; set; }
}

@ -1,5 +1,4 @@
using System.Net.NetworkInformation; using Tiobon.Core.Model.Models;
using Tiobon.Core.Model.Models;
namespace Tiobon.Core.Model; namespace Tiobon.Core.Model;

@ -9,7 +9,6 @@ using Tiobon.Core.Model;
using Tiobon.Core.Common; using Tiobon.Core.Common;
using AgileObjects.AgileMapper; using AgileObjects.AgileMapper;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Text.RegularExpressions;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using SqlSugar; using SqlSugar;
@ -269,4 +268,183 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
return new ServicePageResult<Ghre_Exam>(filter.pageNum, totalCount, filter.pageSize, list); return new ServicePageResult<Ghre_Exam>(filter.pageNum, totalCount, filter.pageSize, list);
} }
public async Task<ServiceResult<DefaultGhre_ExamInput>> QueryDefault(long Id)
{
var input = new DefaultGhre_ExamInput();
#region baseColumns
var baseColumns = new List<DefaultGhre_ExamColumn>
{
new DefaultGhre_ExamColumn()
{
label = "关联课程",
field = "LinkType",
elementType = "RadioBox",
required = true,
multipleSelect = false,
editable = false,
},
new DefaultGhre_ExamColumn()
{
label = "课程名称",
field = "CourseId",
elementType = "ApiSelect",
required = true,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "选择试卷",
field = "ExamPaperId",
elementType = "ApiSelect",
required = true,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "考试编号",
field = "ExamNo",
elementType = "Input",
required =false ,
multipleSelect = false,
editable = false
},
new DefaultGhre_ExamColumn()
{
label = "考试名称",
field = "ExamName",
elementType = "Input",
required = true,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "考试日期",
field = "DateType",
elementType = "RadioBox",
required = true,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "考试区间",
field = "ExamDate",
elementType = "GRangePicker",
required = true,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "学完多久",
field = "AfterHowLong",
elementType = "RadioBox",
required = false,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "考试形式",
field = "ExamMode",
elementType = "RadioBox",
required = false,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "线下考试地点",
field = "ExamPlace",
elementType = "Input",
required = true,
multipleSelect = false,
editable = true,
},
new DefaultGhre_ExamColumn()
{
label = "关联开班",
field = "IsLinkOpenClass",
elementType = "RadioBox",
required = true,
multipleSelect = false,
editable = true
},
new DefaultGhre_ExamColumn()
{
label = "考试说明",
field = "RemarkSz",
elementType = "InputTextArea",
required = true,
multipleSelect = false,
editable = true
}
};
#endregion
#region staffTableColumns
var staffTableColumns = new List<DefaultGhre_ExamColumn>
{
new DefaultGhre_ExamColumn()
{
label = "工号",
field = "StaffNo",
align = "center",
},
new DefaultGhre_ExamColumn()
{
label = "姓名",
field = "StaffName",
align = "center",
}, new DefaultGhre_ExamColumn()
{
label = "部门",
field = "DeptName",
align = "center",
}, new DefaultGhre_ExamColumn()
{
label = "岗位",
field = "TitleName",
align = "center",
}, new DefaultGhre_ExamColumn()
{
label = "入职日期",
field = "InDate",
align = "center",
}, new DefaultGhre_ExamColumn()
{
label = "邮箱",
field = "Mail",
align = "center",
width=200
}, new DefaultGhre_ExamColumn()
{
label = "数据来源",
field = "DataSource",
align = "center",
width=200
}
};
#endregion
#region pageData
if (Id != 0)
{
var exam = await base.QueryById(Id);
input.pageData = Mapper.Map(exam).ToANew<DefaultGhre_ExamPageData>();
}
#endregion
input.baseColumns = baseColumns;
input.staffTableColumns = staffTableColumns;
return ServiceResult<DefaultGhre_ExamInput>.OprateSuccess("查询成功!", input);
}
} }

@ -6334,6 +6334,16 @@
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamInput.UpdateDataInfo">
<summary>
修改信息 黄一名 于 2024-05-10 15:02 最后修改
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamInput.CreateDataInfo">
<summary>
创建信息 黄一名 于 2024-05-10 14:57 创建
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.UpdateDataInfo"> <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.UpdateDataInfo">
<summary> <summary>
修改信息 黄一名 于 2024-05-10 15:02 最后修改 修改信息 黄一名 于 2024-05-10 15:02 最后修改

@ -598,6 +598,7 @@
<param name="body">条件</param> <param name="body">条件</param>
<returns></returns> <returns></returns>
</member> </member>
<!-- Badly formed XML comment ignored for member "M:Tiobon.Core.Api.Controllers.Ghre_ExamController.QueryDefault(System.Int64)" -->
<member name="T:Tiobon.Core.Api.Controllers.Ghre_ExamPaperConfigController"> <member name="T:Tiobon.Core.Api.Controllers.Ghre_ExamPaperConfigController">
<summary> <summary>
试卷配置(Controller) 试卷配置(Controller)

Loading…
Cancel
Save