Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增查询开班课表数据接口

Browse Source
master
xiaochanghai 2 months ago
parent 258a3ce892
commit 6b500e207f
9 changed files with 992 additions and 751 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1513
      Model/Tiobon.Web.pdm
  2. 10
      Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs
  3. 45
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  4. 7
      Tiobon.Core.Api/Tiobon.Core.xml
  5. 2
      Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs
  6. 60
      Tiobon.Core.Model/ViewModels/Extend/Ghre_OpenClassScore.cs
  7. 54
      Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
  8. 45
      Tiobon.Core/Tiobon.Core.Model.xml
  9. 7
      Tiobon.Core/Tiobon.Core.xml

1513
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

10
Tiobon.Core.Api/Controllers/Ghre/Ghre_OpenClassController.cs
Unescape View File

@ -190,4 +190,14 @@ public class Ghre_OpenClassController : BaseController<IGhre_OpenClassServices,
[HttpPost, Route("CheckIn/{Id}")]
public async Task<ServiceResult> CheckIn(long Id) => await _service.CheckIn(Id);
#endregion
#region 课表
/// <summary>
/// 查询课表
/// </summary>
/// <param name="Id">开班ID</param>
/// <returns></returns>
[HttpPost, Route("QuerySchedule/{Id}")]
public async Task<ServiceResult<Ghre_OpenClassSchedule1>> QuerySchedule(long Id) => await _service.QuerySchedule(Id);
#endregion
}

45
Tiobon.Core.Api/Tiobon.Core.Model.xml
Unescape View File

@ -38453,6 +38453,51 @@
批改评语
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.CourseId">
<summary>
课程ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.TeacherId">
<summary>
讲师ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.Address">
<summary>
培训地点
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.StartTime">
<summary>
开始时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.EndTime">
<summary>
结束时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.Time">
<summary>
时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.CourseName">
<summary>
课程名称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.Status">
<summary>
状态，缺席：Absence，出席：Attend，当前课程：Current，待开课：WaitStart
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_StudyRecordESS.StaffId">
<summary>
员工ID

7
Tiobon.Core.Api/Tiobon.Core.xml
Unescape View File

@ -1184,6 +1184,13 @@
<param name="Id">开班ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.QuerySchedule(System.Int64)">
<summary>
查询课表
</summary>
<param name="Id">开班ID</param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_OpenClassFeeController">
<summary>
开班费用(Controller)

2
Tiobon.Core.IServices/Ghre/IGhre_OpenClassServices.cs
Unescape View File

@ -31,4 +31,6 @@ public interface IGhre_OpenClassServices : IBaseServices<Ghre_OpenClass, Ghre_Op
Task<ServiceResult> CheckIn(long Id);
Task<ServiceResult<ExcelData>> ExportStaff(long Id);
Task<ServiceResult<Ghre_OpenClassSchedule1>> QuerySchedule(long Id);
}

60
Tiobon.Core.Model/ViewModels/Extend/Ghre_OpenClassScore.cs
Unescape View File

@ -84,4 +84,64 @@ public class Ghre_OpenClassScore
/// 批改评语
/// </summary>
public string Comment { get; set; }
}
public class Ghre_OpenClassSchedule1
{
public string SceneName { get; set; }
public List<Ghre_OpenClassScheduleDeatil> Details { get; set; }
}
public class Ghre_OpenClassScheduleDeatil
{
public string Id { get; set; }
/// <summary>
/// 课程ID
/// </summary>
public long? CourseId { get; set; }
/// <summary>
/// 讲师ID
/// </summary>
public long? TeacherId { get; set; }
/// <summary>
/// 培训地点
/// </summary>
public string Address { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public DateTime? StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string RemarkSz { get; set; }
/// <summary>
/// 时间
/// </summary>
public string Time { get; set; }
/// <summary>
/// 课程名称
/// </summary>
public string CourseName { get; set; }
/// <summary>
/// 状态，缺席：Absence，出席：Attend，当前课程：Current，待开课：WaitStart
/// </summary>
public string Status { get; set; } = "Absence";
}

54
Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
Unescape View File

@ -482,4 +482,58 @@ WHERE B.OpenClassId = '{Id}'";
return ServiceResult.OprateSuccess("报名成功！");
}
#endregion
#region 课表
public async Task<ServiceResult<Ghre_OpenClassSchedule1>> QuerySchedule(long Id)
{
var data = new Ghre_OpenClassSchedule1();
var entity = await base.QueryById(Id);
if (entity.LinkType == "CourseScene")
{
data.SceneName = await Db.Queryable<Ghre_CourseScene>().Where(x => x.Id == entity.LinkId).Select(x => x.SceneName).FirstAsync();
var sql = @$"SELECT A.Id,
A.Address,
A.StartTime,
A.EndTime,
A.TeacherId,
A.CourseId,
B.CourseName
FROM Ghre_OpenClassSchedule A LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
WHERE A.OpenClassId = '{Id}' AND A.IsEnable = 1";
data.Details = await Db.Ado.SqlQueryAsync<Ghre_OpenClassScheduleDeatil>(sql);
}
else
{
var detail = new Ghre_OpenClassScheduleDeatil()
{
Address = entity.Address,
StartTime = entity.StartTime,
EndTime = entity.EndTime,
CourseId = entity.LinkId,
};
detail.CourseName = await Db.Queryable<Ghre_Course>().Where(x => x.Id == entity.LinkId).Select(x => x.CourseName).FirstAsync();
data.Details.Add(detail);
}
data.Details.ForEach(d =>
{
d.Time = DateTimeHelper.ConvertToMiniuteString(d.StartTime) + " ~ " + DateTimeHelper.ConvertToMiniuteString(d.EndTime);
});
//entitys.ForEach(it =>
//{
// it.IsPassLabel = it.IsPass == true ? "合格" : "不合格";
// it.FinallyIsPassLabel = it.FinallyIsPass == true ? "合格" : "不合格";
//});
return ServiceResult<Ghre_OpenClassSchedule1>.OprateSuccess("查询成功！", data);
}
#endregion
}

45
Tiobon.Core/Tiobon.Core.Model.xml
Unescape View File

@ -38453,6 +38453,51 @@
批改评语
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.CourseId">
<summary>
课程ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.TeacherId">
<summary>
讲师ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.Address">
<summary>
培训地点
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.StartTime">
<summary>
开始时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.EndTime">
<summary>
结束时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.RemarkSz">
<summary>
备注
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.Time">
<summary>
时间
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.CourseName">
<summary>
课程名称
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_OpenClassScheduleDeatil.Status">
<summary>
状态，缺席：Absence，出席：Attend，当前课程：Current，待开课：WaitStart
</summary>
</member>
<member name="P:Tiobon.Core.Model.Ghre_StudyRecordESS.StaffId">
<summary>
员工ID

7
Tiobon.Core/Tiobon.Core.xml
Unescape View File

@ -1184,6 +1184,13 @@
<param name="Id">开班ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_OpenClassController.QuerySchedule(System.Int64)">
<summary>
查询课表
</summary>
<param name="Id">开班ID</param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_OpenClassFeeController">
<summary>
开班费用(Controller)

Write Preview
Loading…
Cancel
Save