孤兰 2 months ago
commit f55d2f95a1
  1. 2313
      Model/Tiobon.Web.pdm
  2. 11
      Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs
  3. 11
      Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseSceneController.cs
  4. 9
      Tiobon.Core.Api/Controllers/Ghre/Ghre_SurveyController.cs
  5. 30
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  6. 22
      Tiobon.Core.Api/Tiobon.Core.xml
  7. 2
      Tiobon.Core.Api/appsettings.json
  8. 6
      Tiobon.Core.IServices/Ghre/IGhre_CourseSceneServices.cs
  9. 2
      Tiobon.Core.IServices/Ghre/IGhre_CourseServices.cs
  10. 2
      Tiobon.Core.IServices/Ghre/IGhre_SurveyServices.cs
  11. 13
      Tiobon.Core.Model/Base/Ghre/Ghre_OpenClass.Dto.Base.cs
  12. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_SurveyRecord.Dto.Base.cs
  13. 12
      Tiobon.Core.Model/Models/Ghre/Ghre_OpenClass.cs
  14. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_SurveyRecord.cs
  15. 35
      Tiobon.Core.Services/BASE/BaseServices.cs
  16. 195
      Tiobon.Core.Services/Ghre/Ghre_CourseSceneServices.cs
  17. 193
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  18. 12
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  19. 2
      Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
  20. 20
      Tiobon.Core/Tiobon.Core.Model.xml
  21. 14
      Tiobon.Core/Tiobon.Core.xml

File diff suppressed because it is too large Load Diff

@ -92,4 +92,15 @@ public class Ghre_CourseController : BaseController<IGhre_CourseServices, Ghre_C
{
return await _service.ModifyCourseSortNo(courses);
}
/// <summary>
/// 统计
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[Route("QueryStatistic/{id}")]
public async Task<dynamic> QueryStatistic(long id)
{
return await _service.QueryStatistic(id);
}
}

@ -11,4 +11,15 @@ public class Ghre_CourseSceneController : BaseController<IGhre_CourseSceneServic
public Ghre_CourseSceneController(IGhre_CourseSceneServices service) : base(service)
{
}
/// <summary>
/// 统计
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[Route("QueryStatistic/{id}")]
public async Task<dynamic> QueryStatistic(long id)
{
return await _service.QueryStatistic(id);
}
}

@ -77,6 +77,15 @@ public class Ghre_SurveyController : BaseController<IGhre_SurveyServices, Ghre_S
[HttpPost("QueryESSData/{id}")]
public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id) => await _service.QueryESSData(id);
/// <summary>
/// 查询
/// </summary>
/// <param name="id"></param>
/// <param name="openClassId">开班ID</param>
/// <returns></returns>
[HttpPost("QueryESSData/{id}/{openClassId}")]
public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSDataFromOpenCLass(long id, long openClassId) => await _service.QueryESSData(id, openClassId);
#endregion
#region 提交

@ -6135,6 +6135,16 @@
查看答案和解析后,是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
<summary>
课程ID
@ -9180,6 +9190,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_SurveyRecordBase.OpenClassId">
<summary>
开班ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_SurveyRecordDetailBase">
<summary>
Ghre_SurveyRecordDetail (Dto.Base)
@ -24777,6 +24792,16 @@
查看答案和解析后,是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttend">
<summary>
开班打卡 (Model)
@ -27732,6 +27757,11 @@
预留字段12
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_SurveyRecord.OpenClassId">
<summary>
开班ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_SurveyRecordDetail">
<summary>
Ghre_SurveyRecordDetail (Model)

@ -796,11 +796,25 @@
<param name="KeyWords"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryStatistic(System.Int64)">
<summary>
统计
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_CourseSceneController">
<summary>
课程场景(Controller)
</summary>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseSceneController.QueryStatistic(System.Int64)">
<summary>
统计
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_CourseSnapController">
<summary>
Ghre_CourseSnap(Controller)
@ -1507,6 +1521,14 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryESSDataFromOpenCLass(System.Int64,System.Int64)">
<summary>
查询
</summary>
<param name="id"></param>
<param name="openClassId">开班ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.SubmitESSData(System.Int64,Tiobon.Core.Model.ViewModels.Extend.Ghre_SurveyExtend)">
<summary>
提交

@ -269,7 +269,7 @@
"Enabled": false
},
"QuartzNetJob": {
"Enabled": true
"Enabled": false
},
"Consul": {
"Enabled": false

@ -1,11 +1,9 @@
using Tiobon.Core.IServices.BASE;
using Tiobon.Core.Model.Models;
namespace Tiobon.Core.IServices;
namespace Tiobon.Core.IServices;
/// <summary>
/// 课程场景(自定义服务接口)
/// </summary>
public interface IGhre_CourseSceneServices : IBaseServices<Ghre_CourseScene, Ghre_CourseSceneDto, InsertGhre_CourseSceneInput, EditGhre_CourseSceneInput>
{
Task<dynamic> QueryStatistic(long id);
}

@ -26,4 +26,6 @@ public interface IGhre_CourseServices : IBaseServices<Ghre_Course, Ghre_CourseDt
Task<ServiceResult<List<Ghre_CourseDto>>> QueryBySceneId(long courseSceneId);
Task<ServiceResult> ModifyCourseSortNo(List<Ghre_Course> courses);
Task<dynamic> QueryStatistic(long id);
}

@ -16,7 +16,7 @@ public interface IGhre_SurveyServices : IBaseServices<Ghre_Survey, Ghre_SurveyDt
Task<ServiceResult<InsertGhre_SurveyExtend>> QueryData(long id);
Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id);
Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id, long? openClassId = null);
Task<ServiceResult> SubmitESSData(long id, Ghre_SurveyExtend input);

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/4/1 15:31:14 SimonHsiao
*V0.01 2025/5/6 11:16:14 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -318,6 +318,17 @@ public class Ghre_OpenClassBase
/// </summary>
public bool? IsAfterViewResultRetake { get; set; }
/// <summary>
/// 讲师上级ID
/// </summary>
public long? ParentTeacherId { get; set; }
/// <summary>
/// 上级反馈单ID
/// </summary>
public int? ParentFeedbackIdbig { get; set; }
/// <summary>
/// 课程ID

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/4/2 10:23:05 SimonHsiao
*V0.01 2025/5/6 13:17:08 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -160,4 +160,9 @@ public class Ghre_SurveyRecordBase
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 开班ID
/// </summary>
public long? OpenClassId { get; set; }
}

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/4/1 15:31:14 SimonHsiao
*V0.01 2025/5/6 11:16:14 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -318,4 +318,14 @@ public class Ghre_OpenClass : BasePoco
/// 查看答案和解析后,是否允许重新考试
/// </summary>
public bool? IsAfterViewResultRetake { get; set; }
/// <summary>
/// 讲师上级ID
/// </summary>
public long? ParentTeacherId { get; set; }
/// <summary>
/// 上级反馈单ID
/// </summary>
public int? ParentFeedbackIdbig { get; set; }
}

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/4/2 10:23:05 SimonHsiao
*V0.01 2025/5/6 13:17:08 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -161,4 +161,9 @@ public class Ghre_SurveyRecord : BasePoco
/// 预留字段12
/// </summary>
public int? ReverseI2 { get; set; }
/// <summary>
/// 开班ID
/// </summary>
public long? OpenClassId { get; set; }
}

@ -330,7 +330,17 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
ip = GetUserIp(UserContext.Context);
}
var list = Mapper.Map(listEntity).ToANew<List<TEntity>>();
var list = new List<TEntity>();
foreach (var item in listEntity)
{
var entity = new TEntity();
ConvertTInsertDto2TEntity(item, entity);
list.Add(entity);
}
//var list = Mapper.Map(listEntity).ToANew<List<TEntity>>();
list.ForEach(entity =>
{
BasePoco ent = entity as BasePoco;
@ -1154,6 +1164,25 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
// dest.SetValueForField(DbConsts.ColunmName_TenantId, _currentTenantId);
//}
}
protected void ConvertTInsertDto2TEntity(TInsertDto source, TEntity dest)
{
foreach (System.Reflection.PropertyInfo mItem in typeof(TEditDto).GetProperties())
{
if (dest.HasField(mItem.Name))
dest.SetValueForField(mItem.Name, mItem.GetValue(source, null));
}
//dest.SetValueForField(DbConsts.ColunmName_LastModificationTime, DateTimeHelper.Now());
//if (_currentUserId != default)
//{
// //dest.SetValueForField(DbConsts.ColunmName_LastModifierId, _currentUserId);
// dest.SetValueForField(DbConsts.ColunmName_LastModifier, _currentUserName);
//}
//if (_currentTenantId != null)
//{
// dest.SetValueForField(DbConsts.ColunmName_TenantId, _currentTenantId);
//}
}
#region 检查表中是否已经存在相同代码的数据
@ -1393,8 +1422,8 @@ where IsEnable=1
and ParaMasterNo = '{ParaMasterNo}'
and ParaDetailNo in (select value from Openjson('{value}'))
ORDER BY SortNo ASC";
var list = DbAccess.QueryList<Ghrs_ParaDetail>(sql);
var list = DbAccess.QueryList<Ghrs_ParaDetail>(sql);
label = string.Join(",", list.Select(o => o.ParaDetailName));
return label;
}

@ -1,4 +1,6 @@
namespace Tiobon.Core.Services;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services;
/// <summary>
/// 课程场景 (服务)
@ -250,4 +252,195 @@ public class Ghre_CourseSceneServices : BaseServices<Ghre_CourseScene, Ghre_Cour
return ServiceResult<ExcelData>.OprateSuccess("导入成功!", data);
}
#endregion
#region 课程统计
/// <summary>
/// 课程统计
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<dynamic> QueryStatistic(long id)
{
dynamic obj = new ExpandoObject();
dynamic data = new ExpandoObject();
var entity = await QueryById(id);
//data.CourseClassName = entity.CourseClassName;
//data.StandardHour = entity.StandardHour;
//data.CreditPoints = entity.CreditPoints;
//data.ManagerStaffName = entity.ManagerStaffName;
//data.InOrOut = entity.InOrOutLabel;
//data.IsOpen = entity.IsOPenLabel;
//data.ValidityPeriod = entity.ValidityPeriod;
//data.CourseSceneName = entity.CourseSceneName;
//必修人数
var RequiredCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && (x.CourseType == "ManualRequired" || x.CourseType == "Required")).CountAsync();
data.RequiredCount = RequiredCount;
//选修人次
var ElectiveCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && (x.CourseType == "ManualElective" || x.CourseType == "Elective")).CountAsync();
data.ElectiveCount = ElectiveCount;
var CompleteCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && x.CompleteStatus == DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.FINISHED && (x.CourseType == "ManualElective" || x.CourseType == "Elective" || x.CourseType == "ManualElective" || x.CourseType == "Elective")).CountAsync();
//完成人数
data.CompleteCount = CompleteCount;
//开班人数
var OpenClassCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && x.OpenClassId != null).CountAsync();
data.OpenClassCount = OpenClassCount;
var studyRecordIds = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id).Select(x => x.Id).ToListAsync();
//总学习时长
data.TotalStudyDuration = await Db.Queryable<Ghre_StudyRecordDetail>().Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value)).SumAsync(x => x.StudyDuration);
var AvgStudyDuration = await Db.Queryable<Ghre_StudyRecordDetail>().Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value)).GroupBy(x => x.StaffId)
.Select(m => new { m.StaffId, StudyDuration = SqlFunc.AggregateSum(m.StudyDuration) }).ToListAsync();
//平均学习时长
data.AvgStudyDuration = AvgStudyDuration.Average(x => x.StudyDuration);
//平均分
var AvgScore = await Db.Queryable<Ghre_ExamRecord>().Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value)).AvgAsync(x => x.FinallyScore ?? (x.Score + x.AdjustScore));
data.AvgScore = AvgScore ?? 0;
//通过率
var passPercent = 0;
if (CompleteCount > 0 && (RequiredCount + ElectiveCount + OpenClassCount) > 0)
passPercent = CompleteCount / (RequiredCount + ElectiveCount + OpenClassCount);
data.PassPercent = passPercent;
//考试安排次数
data.ExamScheduleCount = await Db.Queryable<Ghre_Exam>().Where(x => x.CourseId == id).CountAsync();
//考试人数
data.ExamCount = await Db.Queryable<Ghre_ExamRecord>().Where(x => x.CourseId == id).CountAsync();
//考试人次
data.ExamGroupCount = await Db.Queryable<Ghre_ExamRecordGroup>()
.Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value))
.CountAsync();
//反馈人数
data.FeedbackCount = 0;
#region 课件学习时长
var courseWareStudyDuration = await Db.Queryable<Ghre_StudyRecordDetail>()
.Where(a => a.StudyRecordId != null && studyRecordIds.Contains(a.StudyRecordId.Value))
.GroupBy(a => new { a.CourseWareId, a.CourseWareAttachmentId })
.Select(a => new
{
a.CourseWareId,
a.CourseWareAttachmentId,
StudyDuration = SqlFunc.AggregateSum(a.StudyDuration)
})
.ToListAsync();
var courseWareStudyDurations = new JArray();
for (int i = 0; i < courseWareStudyDuration.Count; i++)
{
var courseWare = await Db.Queryable<Ghre_CourseWare>().Where(x => x.Id == courseWareStudyDuration[i].CourseWareId).FirstAsync();
var courseWareAttachment = await Db.Queryable<Ghre_CourseWareAttachment>().Where(x => x.Id == courseWareStudyDuration[i].CourseWareAttachmentId).FirstAsync();
var item = new JObject
{
new JProperty("CourseWareId", courseWareStudyDuration[i].CourseWareAttachmentId),
new JProperty("CourseWareAttachmentId", courseWareStudyDuration[i].CourseWareAttachmentId),
new JProperty("StudyDuration", courseWareStudyDuration[i].StudyDuration),
new JProperty("CourseWareName", courseWare?.CourseWareNo+courseWare?.CourseWareName+courseWare?.VersionNo+courseWareAttachment.AttachmentName),
};
courseWareStudyDurations.Add(item);
}
data.CourseWareStudyDurations = courseWareStudyDurations;
#endregion
#region 课件学习人数占比
var courseWareStudyCount1 = await Db.Queryable<Ghre_StudyRecordDetail>()
.Where(a => a.StudyRecordId != null && studyRecordIds.Contains(a.StudyRecordId.Value))
.Select(a => new { a.CourseWareAttachmentId, a.StaffId })
.Distinct().ToListAsync();
var courseWareStudyCount = courseWareStudyCount1
.GroupBy(a => a.CourseWareAttachmentId)
.Select(a => new
{
CourseWareAttachmentId = a.Key,
Count = a.Count()
})
.ToList();
var courseWareStudyCounts = new JArray();
for (int i = 0; i < courseWareStudyCount.Count; i++)
{
var courseWareAttachment = await Db.Queryable<Ghre_CourseWareAttachment>().Where(x => x.Id == courseWareStudyCount[i].CourseWareAttachmentId).FirstAsync();
var item = new JObject
{
new JProperty("CourseWareAttachmentId", courseWareStudyCount[i].CourseWareAttachmentId),
new JProperty("CourseWareName", courseWareAttachment.AttachmentName),
new JProperty("Count", courseWareStudyCount[i].Count),
};
courseWareStudyCounts.Add(item);
}
data.CourseWareStudyCounts = courseWareStudyCounts;
#endregion
#region 关联的考试排行
var exams = await Db.Queryable<Ghre_Exam>()
.LeftJoin<Ghre_ExamPaper>((a, b) => a.ExamPaperId == b.Id)//多个条件用&&
.Where(a => a.CourseId == id && a.Status != "Draft")
.Select((a, b) => new
{
a.Id,
a.ExamNo,
a.ExamName,
b.PaperName
})
.ToListAsync();
var examRanking = new JArray();
var examRankings = new JArray();
for (int i = 0; i < exams.Count; i++)
{
var groups = await Db.Queryable<Ghre_ExamRecordGroup>().Where(x => x.ExamId == exams[i].Id).CountAsync();
var examRecordCount = await Db.Queryable<Ghre_ExamRecord>().Where(x => x.ExamId == exams[i].Id).CountAsync();
var examRecordPassCount = await Db.Queryable<Ghre_ExamRecord>()
.Where(x => x.ExamId == exams[i].Id && x.IsPass == true && x.IsPass != null)
.CountAsync();
var examRecordRetakeCount = await Db.Queryable<Ghre_ExamRecord>()
.Where(x => x.ExamId == exams[i].Id && x.RetakeTimes > 0 && x.RetakeTimes != null)
.CountAsync();
passPercent = 0;
var retakePercent = 0;
if (examRecordCount > 0)
{
if (examRecordPassCount > 0) passPercent = (examRecordPassCount / examRecordCount) * 100;
if (examRecordRetakeCount > 0) retakePercent = (examRecordRetakeCount / examRecordCount) * 100;
}
var item = new JObject
{
new JProperty("ExamName", $"{exams[i].ExamName}({exams[i].ExamNo})" ),
new JProperty("PaperName", exams[i].PaperName),
new JProperty("Attempts", groups),
new JProperty("PassPercent", passPercent),
new JProperty("RetakePercent", retakePercent),
//new JProperty("CourseWareName", courseWareAttachment.AttachmentName),
};
examRankings.Add(item);
}
data.ExamRankings = examRankings;
#endregion
obj.Data = data;
obj.Success = true;
obj.Status = 200;
obj.Message = "查询成功!";
return obj;
}
#endregion
}

@ -1,4 +1,5 @@
using NPOI.SS.UserModel;
using Tiobon.Core.IServices;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services;
@ -291,6 +292,9 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
public override async Task<Ghre_CourseDto> QueryById(object objId)
{
var data = await base.QueryById(objId);
if (data == null)
throw new Exception("无效的Id");
var DT_TableDataT1 = Mapper.Map(data).ToANew<Ghre_CourseDto>();
string examPaperId = DT_TableDataT1.ExamPaperId;
@ -1309,4 +1313,193 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
return ServiceResult.OprateSuccess("执行成功!");
}
#endregion
#region 课程统计
/// <summary>
/// 课程统计
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<dynamic> QueryStatistic(long id)
{
dynamic obj = new ExpandoObject();
dynamic data = new ExpandoObject();
var entity = await QueryById(id);
data.CourseClassName = entity.CourseClassName;
data.StandardHour = entity.StandardHour;
data.CreditPoints = entity.CreditPoints;
data.ManagerStaffName = entity.ManagerStaffName;
data.InOrOut = entity.InOrOutLabel;
data.IsOpen = entity.IsOPenLabel;
data.ValidityPeriod = entity.ValidityPeriod;
data.CourseSceneName = entity.CourseSceneName;
//必修人数
var RequiredCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && (x.CourseType == "ManualRequired" || x.CourseType == "Required")).CountAsync();
data.RequiredCount = RequiredCount;
//选修人次
var ElectiveCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && (x.CourseType == "ManualElective" || x.CourseType == "Elective")).CountAsync();
data.ElectiveCount = ElectiveCount;
var CompleteCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && x.CompleteStatus == DIC_STUDY_RECORD_STUDY_COMPLETE_STATUS.FINISHED && (x.CourseType == "ManualElective" || x.CourseType == "Elective" || x.CourseType == "ManualElective" || x.CourseType == "Elective")).CountAsync();
//完成人数
data.CompleteCount = CompleteCount;
//开班人数
var OpenClassCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && x.OpenClassId != null).CountAsync();
data.OpenClassCount = OpenClassCount;
var studyRecordIds = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id).Select(x => x.Id).ToListAsync();
//总学习时长
data.TotalStudyDuration = await Db.Queryable<Ghre_StudyRecordDetail>().Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value)).SumAsync(x => x.StudyDuration);
var AvgStudyDuration = await Db.Queryable<Ghre_StudyRecordDetail>().Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value)).GroupBy(x => x.StaffId)
.Select(m => new { m.StaffId, StudyDuration = SqlFunc.AggregateSum(m.StudyDuration) }).ToListAsync();
//平均学习时长
data.AvgStudyDuration = AvgStudyDuration.Average(x => x.StudyDuration);
//平均分
var AvgScore = await Db.Queryable<Ghre_ExamRecord>().Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value)).AvgAsync(x => x.FinallyScore ?? (x.Score + x.AdjustScore));
data.AvgScore = AvgScore ?? 0;
//通过率
var passPercent = 0;
if (CompleteCount > 0 && (RequiredCount + ElectiveCount + OpenClassCount) > 0)
passPercent = CompleteCount / (RequiredCount + ElectiveCount + OpenClassCount);
data.PassPercent = passPercent;
//考试安排次数
data.ExamScheduleCount = await Db.Queryable<Ghre_Exam>().Where(x => x.CourseId == id).CountAsync();
//考试人数
data.ExamCount = await Db.Queryable<Ghre_ExamRecord>().Where(x => x.CourseId == id).CountAsync();
//考试人次
data.ExamGroupCount = await Db.Queryable<Ghre_ExamRecordGroup>()
.Where(x => x.StudyRecordId != null && studyRecordIds.Contains(x.StudyRecordId.Value))
.CountAsync();
//反馈人数
data.FeedbackCount = 0;
#region 课件学习时长
var courseWareStudyDuration = await Db.Queryable<Ghre_StudyRecordDetail>()
.Where(a => a.StudyRecordId != null && studyRecordIds.Contains(a.StudyRecordId.Value))
.GroupBy(a => new { a.CourseWareId, a.CourseWareAttachmentId })
.Select(a => new
{
a.CourseWareId,
a.CourseWareAttachmentId,
StudyDuration = SqlFunc.AggregateSum(a.StudyDuration)
})
.ToListAsync();
var courseWareStudyDurations = new JArray();
for (int i = 0; i < courseWareStudyDuration.Count; i++)
{
var courseWare = await Db.Queryable<Ghre_CourseWare>().Where(x => x.Id == courseWareStudyDuration[i].CourseWareId).FirstAsync();
var courseWareAttachment = await Db.Queryable<Ghre_CourseWareAttachment>().Where(x => x.Id == courseWareStudyDuration[i].CourseWareAttachmentId).FirstAsync();
var item = new JObject
{
new JProperty("CourseWareId", courseWareStudyDuration[i].CourseWareAttachmentId),
new JProperty("CourseWareAttachmentId", courseWareStudyDuration[i].CourseWareAttachmentId),
new JProperty("StudyDuration", courseWareStudyDuration[i].StudyDuration),
new JProperty("CourseWareName", courseWare?.CourseWareNo+courseWare?.CourseWareName+courseWare?.VersionNo+courseWareAttachment.AttachmentName),
};
courseWareStudyDurations.Add(item);
}
data.CourseWareStudyDurations = courseWareStudyDurations;
#endregion
#region 课件学习人数占比
var courseWareStudyCount1 = await Db.Queryable<Ghre_StudyRecordDetail>()
.Where(a => a.StudyRecordId != null && studyRecordIds.Contains(a.StudyRecordId.Value))
.Select(a => new { a.CourseWareAttachmentId, a.StaffId })
.Distinct().ToListAsync();
var courseWareStudyCount = courseWareStudyCount1
.GroupBy(a => a.CourseWareAttachmentId)
.Select(a => new
{
CourseWareAttachmentId = a.Key,
Count = a.Count()
})
.ToList();
var courseWareStudyCounts = new JArray();
for (int i = 0; i < courseWareStudyCount.Count; i++)
{
var courseWareAttachment = await Db.Queryable<Ghre_CourseWareAttachment>().Where(x => x.Id == courseWareStudyCount[i].CourseWareAttachmentId).FirstAsync();
var item = new JObject
{
new JProperty("CourseWareAttachmentId", courseWareStudyCount[i].CourseWareAttachmentId),
new JProperty("CourseWareName", courseWareAttachment.AttachmentName),
new JProperty("Count", courseWareStudyCount[i].Count),
};
courseWareStudyCounts.Add(item);
}
data.CourseWareStudyCounts = courseWareStudyCounts;
#endregion
#region 关联的考试排行
var exams = await Db.Queryable<Ghre_Exam>()
.LeftJoin<Ghre_ExamPaper>((a, b) => a.ExamPaperId == b.Id)//多个条件用&&
.Where(a => a.CourseId == id && a.Status != "Draft")
.Select((a, b) => new
{
a.Id,
a.ExamNo,
a.ExamName,
b.PaperName
})
.ToListAsync();
var examRanking = new JArray();
var examRankings = new JArray();
for (int i = 0; i < exams.Count; i++)
{
var groups = await Db.Queryable<Ghre_ExamRecordGroup>().Where(x => x.ExamId == exams[i].Id).CountAsync();
var examRecordCount = await Db.Queryable<Ghre_ExamRecord>().Where(x => x.ExamId == exams[i].Id).CountAsync();
var examRecordPassCount = await Db.Queryable<Ghre_ExamRecord>()
.Where(x => x.ExamId == exams[i].Id && x.IsPass == true && x.IsPass != null)
.CountAsync();
var examRecordRetakeCount = await Db.Queryable<Ghre_ExamRecord>()
.Where(x => x.ExamId == exams[i].Id && x.RetakeTimes > 0 && x.RetakeTimes != null)
.CountAsync();
passPercent = 0;
var retakePercent = 0;
if (examRecordCount > 0)
{
if (examRecordPassCount > 0) passPercent = (examRecordPassCount / examRecordCount) * 100;
if (examRecordRetakeCount > 0) retakePercent = (examRecordRetakeCount / examRecordCount) * 100;
}
var item = new JObject
{
new JProperty("ExamName", $"{exams[i].ExamName}({exams[i].ExamNo})" ),
new JProperty("PaperName", exams[i].PaperName),
new JProperty("Attempts", groups),
new JProperty("PassPercent", passPercent),
new JProperty("RetakePercent", retakePercent),
//new JProperty("CourseWareName", courseWareAttachment.AttachmentName),
};
examRankings.Add(item);
}
data.ExamRankings = examRankings;
#endregion
obj.Data = data;
obj.Success = true;
obj.Status = 200;
obj.Message = "查询成功!";
return obj;
}
#endregion
}

@ -1135,13 +1135,13 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
data.ForEach(x =>
{
if (x.DataSource.IsNull())
x.DataSource = DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED;
x.DataSource = DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED;
if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED)
if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED)
x.DataSourceLabel = "手动必修";
else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.STUDY_RULE_REQUIRED)
else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.STUDY_RULE_REQUIRED)
x.DataSourceLabel = "必修规则";
else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_ELECTIVE)
else if (x.DataSource == DIC_EXAM_STAFF_SOURCE.MANUAL_ELECTIVE)
x.DataSourceLabel = "手动选修";
});
@ -1460,7 +1460,9 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
var exist = await Db.Queryable<Ghre_StudyRecord>()
.WhereIF(!entity.CourseId.IsNull(), x => x.CourseId == entity.CourseId)
.WhereIF(!entity.CourseSceneId.IsNull(), x => x.CourseSceneId == entity.CourseSceneId)
.Where(x => x.ExamId == id && x.StaffId == staff.StaffId).AnyAsync();
//.Where(x => (x.CourseBeginTime <= courseTime.Date && x.CourseEndTime >= courseTime.Date) ||
//(x.CourseBeginTime <= courseEndTime && x.CourseEndTime >= courseEndTime))
.Where(x => x.ExamId == id && x.StaffId == staff.StaffId && x.CourseType != "ExcelImport").AnyAsync();
if (!exist)
inserts.Add(new Ghre_StudyRecord()

@ -196,7 +196,7 @@ public class Ghre_SurveyServices : BaseServices<Ghre_Survey, Ghre_SurveyDto, Ins
}
public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id)
public async Task<ServiceResult<Ghre_SurveyExtend>> QueryESSData(long id, long? openClassId = null)
{
var entity = await base.QueryById(id);
var data = Mapper.Map(entity).ToANew<Ghre_SurveyExtend>();

@ -6135,6 +6135,16 @@
查看答案和解析后,是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClassBase.CourseId">
<summary>
课程ID
@ -24777,6 +24787,16 @@
查看答案和解析后,是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentTeacherId">
<summary>
讲师上级ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_OpenClass.ParentFeedbackIdbig">
<summary>
上级反馈单ID
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_OpenClassAttend">
<summary>
开班打卡 (Model)

@ -796,11 +796,25 @@
<param name="KeyWords"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseController.QueryStatistic(System.Int64)">
<summary>
统计
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_CourseSceneController">
<summary>
课程场景(Controller)
</summary>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_CourseSceneController.QueryStatistic(System.Int64)">
<summary>
统计
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Tiobon.Core.Api.Controllers.Ghre_CourseSnapController">
<summary>
Ghre_CourseSnap(Controller)

Loading…
Cancel
Save