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 213a8ed0f9
commit c1b2669a1e
5 changed files with 69 additions and 15 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. 5
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 5
      Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFee.Dto.View.cs
  3. 3
      Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs
  4. 66
      Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
  5. 5
      Tiobon.Core/Tiobon.Core.Model.xml

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

@ -38183,6 +38183,11 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassFeeDto.StaffName">
<summary>
员工
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleDto">
<summary>
开班课表(Dto.View1)

5
Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFee.Dto.View.cs
Unescape View File

@ -31,4 +31,9 @@ public class Ghre_OpenClassFeeDto : Ghre_OpenClassFee
/// 修改信息
/// </summary>
public string UpdateDataInfo { get; set; }
/// <summary>
/// 员工
/// </summary>
public string StaffName { get; set; }
}

3
Tiobon.Core.Services/Ghre/Ghre_OpenClassFeeServices.cs
Unescape View File

@ -25,7 +25,8 @@ public class Ghre_OpenClassFeeServices : BaseServices<Ghre_OpenClassFee, Ghre_Op
//DT_TableDataT1.Source = DT_TableDataT1.Source == "Backend" ? "后台新增" : "报名";
DT_TableDataT1.ItemCode = await GetParaLabel("TrainOpenClassFee", result.result.DT_TableDataT1[i].ItemCode);
if (DT_TableDataT1.StaffId != null)
DT_TableDataT1.StaffName = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == DT_TableDataT1.StaffId).Select(x => x.StaffName).FirstAsync();
result.result.DT_TableDataT1[i] = DT_TableDataT1;
}
return result;

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

@ -1,4 +1,5 @@
using MongoDB.Driver.Linq;
using System.Text.RegularExpressions;
namespace Tiobon.Core.Services;
@ -118,17 +119,17 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
else
prefixTemp = (await Db.Queryable<Ghre_CourseScene>().FirstAsync(x => x.Id == entity.CourseSceneId))?.SceneNo;
if (entity.StartEndTime.Count == 2)
if (entity.StartEndTime != null && entity.StartEndTime.Count == 2)
{
entity.StartTime = entity.StartEndTime[0];
entity.EndTime = entity.StartEndTime[1];
}
if (entity.RegisterStartEndTime.Count == 2)
if (entity.RegisterStartEndTime != null && entity.RegisterStartEndTime.Count == 2)
{
entity.RegisterStartTime = entity.RegisterStartEndTime[0];
entity.RegisterEndTime = entity.RegisterStartEndTime[1];
}
if (entity.ExamStartEndTime.Count == 2)
if (entity.ExamStartEndTime != null && entity.ExamStartEndTime.Count == 2)
{
entity.ExamStartTime = entity.ExamStartEndTime[0];
entity.ExamEndTime = entity.ExamStartEndTime[1];
@ -145,7 +146,7 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
entity.Schedules.ForEach(x =>
{
x.OpenClassId = result;
if (x.StartEndTime.Count == 2)
if (x.StartEndTime != null && x.StartEndTime.Count == 2)
{
x.StartTime = x.StartEndTime[0];
x.EndTime = x.StartEndTime[1];
@ -170,17 +171,17 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
entity.LinkId = entity.LinkType == "Course" ? entity.CourseId : entity.CourseSceneId;
if (entity.StartEndTime.Count == 2)
if (entity.StartEndTime != null && entity.StartEndTime.Count == 2)
{
entity.StartTime = entity.StartEndTime[0];
entity.EndTime = entity.StartEndTime[1];
}
if (entity.RegisterStartEndTime.Count == 2)
if (entity.RegisterStartEndTime != null && entity.RegisterStartEndTime.Count == 2)
{
entity.RegisterStartTime = entity.RegisterStartEndTime[0];
entity.RegisterEndTime = entity.RegisterStartEndTime[1];
}
if (entity.ExamStartEndTime.Count == 2)
if (entity.ExamStartEndTime != null && entity.ExamStartEndTime.Count == 2)
{
entity.ExamStartTime = entity.ExamStartEndTime[0];
entity.ExamEndTime = entity.ExamStartEndTime[1];
@ -188,7 +189,20 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
await _ghre_OpenClassScheduleServices.Delete(x => x.OpenClassId == Id);
if (entity.Schedules != null && entity.Schedules.Any())
{
entity.Schedules.ForEach(x => x.OpenClassId = Id);
entity.Schedules.ForEach(x =>
{
if (x.StartEndTime != null && x.StartEndTime.Count == 2)
{
x.StartTime = x.StartEndTime[0];
x.EndTime = x.StartEndTime[1];
}
else
{
x.StartTime = null;
x.EndTime = null;
}
x.OpenClassId = Id;
});
await _ghre_OpenClassScheduleServices.Add(entity.Schedules);
}
@ -221,14 +235,23 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
else
result.result.DT_TableDataT1[0].CourseSceneId = result.result.DT_TableDataT1[0].LinkId;
result.result.DT_TableDataT1[0].StartEndTime.Add(result.result.DT_TableDataT1[0].StartTime);
result.result.DT_TableDataT1[0].StartEndTime.Add(result.result.DT_TableDataT1[0].EndTime);
if (result.result.DT_TableDataT1[0].StartTime != null && result.result.DT_TableDataT1[0].EndTime != null)
{
result.result.DT_TableDataT1[0].StartEndTime.Add(result.result.DT_TableDataT1[0].StartTime);
result.result.DT_TableDataT1[0].StartEndTime.Add(result.result.DT_TableDataT1[0].EndTime);
}
result.result.DT_TableDataT1[0].RegisterStartEndTime.Add(result.result.DT_TableDataT1[0].RegisterStartTime);
result.result.DT_TableDataT1[0].RegisterStartEndTime.Add(result.result.DT_TableDataT1[0].RegisterEndTime);
if (result.result.DT_TableDataT1[0].RegisterStartTime != null && result.result.DT_TableDataT1[0].RegisterEndTime != null)
{
result.result.DT_TableDataT1[0].RegisterStartEndTime.Add(result.result.DT_TableDataT1[0].RegisterStartTime);
result.result.DT_TableDataT1[0].RegisterStartEndTime.Add(result.result.DT_TableDataT1[0].RegisterEndTime);
}
result.result.DT_TableDataT1[0].ExamStartEndTime.Add(result.result.DT_TableDataT1[0].ExamStartTime);
result.result.DT_TableDataT1[0].ExamStartEndTime.Add(result.result.DT_TableDataT1[0].ExamEndTime);
if (result.result.DT_TableDataT1[0].ExamStartTime != null && result.result.DT_TableDataT1[0].ExamEndTime != null)
{
result.result.DT_TableDataT1[0].ExamStartEndTime.Add(result.result.DT_TableDataT1[0].ExamStartTime);
result.result.DT_TableDataT1[0].ExamStartEndTime.Add(result.result.DT_TableDataT1[0].ExamEndTime);
}
result.result.DT_TableDataT1[0].Schedules = await _ghre_OpenClassScheduleServices.QueryDto(x => x.OpenClassId == body.id);
result.result.DT_TableDataT1[0].Attachments = await Db.Queryable<Ghre_Attachment>().Where(x => x.TableName == body.id.ObjToString() && x.AttachmentGroupID == 1).ToListAsync();
@ -768,4 +791,19 @@ WHERE A.OpenClassId = '{Id}' AND A.IsEnable = 1";
return ServiceResult.OprateSuccess("发送成功！");
}
#endregion
#region 评估汇总
/// <summary>
/// 评估汇总
/// </summary>
/// <param name="Id">开班ID</param>
/// <returns></returns>
public async Task<ServiceResult<Ghre_SurveyStatistic>> QueryStatistic(long id)
{
var data = new Ghre_SurveyStatistic();
return ServiceResult<Ghre_SurveyStatistic>.OprateSuccess("查询成功！", data);
}
#endregion
}

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

@ -38183,6 +38183,11 @@
修改信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassFeeDto.StaffName">
<summary>
员工
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassScheduleDto">
<summary>
开班课表(Dto.View1)

Write Preview
Loading…
Cancel
Save