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

课程保存、发布新增关联数据有效性验证

Browse Source
master
xiaochanghai 11 months ago
parent e0789936a3
commit a6778c8443
4 changed files with 206 additions and 12 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. 40
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 50
      Tiobon.Core.Model/Consts.cs
  3. 88
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  4. 40
      Tiobon.Core/Tiobon.Core.Model.xml

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

@ -12592,6 +12592,46 @@
全局常量 全局常量
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS">
<summary>
课程管理-状态
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS.DRAFT">
<summary>
草稿箱
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS.RELEASED">
<summary>
已发布
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS.DISABLED">
<summary>
已停用
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS">
<summary>
考试管理-状态
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS.DRAFT">
<summary>
草稿箱
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS.RELEASED">
<summary>
已发布
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS.DISABLED">
<summary>
已停用
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STATUS"> <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STATUS">
<summary> <summary>
考试管理-状态 考试管理-状态

50
Tiobon.Core.Model/Consts.cs
Unescape View File

@ -5,7 +5,54 @@
/// </summary> /// </summary>
public class Consts public class Consts
{ {
#region 考试管理-日期类型
#region 课程管理
/// <summary>
/// 课程管理-状态
/// </summary>
public static class DIC_COURSE_STATUS
{
/// <summary>
/// 草稿箱
/// </summary>
public const string DRAFT = "Draft";
/// <summary>
/// 已发布
/// </summary>
public const string RELEASED = "Released";
/// <summary>
/// 已停用
/// </summary>
public const string DISABLED = "Disabled";
}
#endregion
#region 考试管理
/// <summary>
/// 考试管理-状态
/// </summary>
public static class DIC_EXAM_PAPER_STATUS
{
/// <summary>
/// 草稿箱
/// </summary>
public const string DRAFT = "Draft";
/// <summary>
/// 已发布
/// </summary>
public const string RELEASED = "Released";
/// <summary>
/// 已停用
/// </summary>
public const string DISABLED = "Disabled";
}
#endregion
#region 考试管理
#region 考试管理-状态 #region 考试管理-状态
/// <summary> /// <summary>
@ -78,7 +125,6 @@ public class Consts
#endregion #endregion
#region 培训记录-课程状态 #region 培训记录-课程状态
/// <summary> /// <summary>

88
Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
Unescape View File

@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Http;
using Tiobon.Core.Common.UserManager; using Tiobon.Core.Common.UserManager;
using Tiobon.Core.Common.Helper; using Tiobon.Core.Common.Helper;
using AgileObjects.AgileMapper; using AgileObjects.AgileMapper;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services; namespace Tiobon.Core.Services;
@ -266,7 +267,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
public async Task<ServiceResult> UpdateStatus(long[] ids, string status) public async Task<ServiceResult> UpdateStatus(long[] ids, string status)
{ {
if (status != "Released" && status != "Disabled" && status != "Draft") if (status != Consts.DIC_COURSE_STATUS.RELEASED && status != Consts.DIC_COURSE_STATUS.DISABLED && status != Consts.DIC_COURSE_STATUS.DRAFT)
throw new Exception("无效的状态"); throw new Exception("无效的状态");
HttpRequest request = UserContext.Context.Request; HttpRequest request = UserContext.Context.Request;
@ -281,25 +282,60 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
var entity = await BaseDal.QueryById(id); var entity = await BaseDal.QueryById(id);
if (entity.Status == "Released") #region 关联数据有效性验证
if (entity.Status == Consts.DIC_COURSE_STATUS.DRAFT && status == Consts.DIC_COURSE_STATUS.RELEASED)
{ {
var examPaper = await Db.Queryable<Ghre_ExamPaper>().FirstAsync(x => x.LinkId == id && x.LinkType == "CourseId" && x.Status != "Disabled"); if (!entity.CourseClassId.IsNull())
{
var CourseClassIds = JsonConvert.DeserializeObject<List<long>>(entity.CourseClassId);
if (CourseClassIds != null && CourseClassIds.Any())
{
for (int i = 0; i < CourseClassIds.Count; i++)
{
if (!await Db.Queryable<Ghre_CourseClass>().AnyAsync(x => x.Id == CourseClassIds[i]))
throw new Exception($"课程关联的课程分类已失效，请修正数据后继续发布！");
}
}
}
if (!entity.CourseSceneId.IsNull())
if (!await Db.Queryable<Ghre_CourseScene>().AnyAsync(x => x.Id == entity.CourseSceneId))
return ServiceResult.OprateFailed($"课程关联的课程场景已失效，请修正数据后继续发布！");
if (!entity.ExamPaperId.IsNull())
{
var ExamPaperIds = JsonConvert.DeserializeObject<List<long>>(entity.ExamPaperId);
if (ExamPaperIds != null && ExamPaperIds.Any())
{
for (int i = 0; i < ExamPaperIds.Count; i++)
{
if (!await Db.Queryable<Ghre_ExamPaper>().AnyAsync(x => x.Id == ExamPaperIds[0] && x.Status == DIC_EXAM_PAPER_STATUS.RELEASED))
return ServiceResult.OprateFailed($"课程关联的试卷已失效，请修正数据后继续发布！");
}
}
}
}
#endregion
if (entity.Status == Consts.DIC_COURSE_STATUS.RELEASED)
{
var examPaper = await Db.Queryable<Ghre_ExamPaper>().FirstAsync(x => x.LinkId == id && x.LinkType == "CourseId" && x.Status != Consts.DIC_COURSE_STATUS.DISABLED);
if (examPaper != null) if (examPaper != null)
return ServiceResult.OprateFailed($"课程【{entity.CourseName}({entity.CourseNo})】已与试卷【{examPaper.PaperName}({examPaper.PaperName})】关联，暂不可{(status == "Draft" ? "取消发布" : "停用")}"); return ServiceResult.OprateFailed($"课程【{entity.CourseName}({entity.CourseNo})】已与试卷【{examPaper.PaperName}({examPaper.PaperName})】关联，暂不可{(status == Consts.DIC_COURSE_STATUS.DRAFT ? "取消发布" : "停用")}");
} }
BasePoco ent = entity; BasePoco ent = entity;
ent.UpdateIP = ip; ent.UpdateIP = ip;
ent.UpdateProg = api; ent.UpdateProg = api;
if (status == "Released" || status == "Disabled" || status == "Draft") if (status == Consts.DIC_COURSE_STATUS.RELEASED || status == Consts.DIC_COURSE_STATUS.DISABLED || status == Consts.DIC_COURSE_STATUS.DRAFT)
{ {
entity.Status = status; entity.Status = status;
entities.Add(entity); entities.Add(entity);
} }
#region 生成课程快照 #region 生成课程快照
if (status == "Released") if (status == Consts.DIC_COURSE_STATUS.RELEASED)
{ {
var sql = $"UPDATE Ghre_CourseSnap SET IsEnable = 0 WHERE CourseId = '{id}' AND IsEnable = 1"; var sql = $"UPDATE Ghre_CourseSnap SET IsEnable = 0 WHERE CourseId = '{id}' AND IsEnable = 1";
await Db.Ado.ExecuteCommandAsync(sql); await Db.Ado.ExecuteCommandAsync(sql);
@ -315,9 +351,9 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
} }
var result = await BaseDal.Update(entities); var result = await BaseDal.Update(entities);
if (status == "Released") if (status == Consts.DIC_COURSE_STATUS.RELEASED)
return ServiceResult.OprateSuccess("发布成功！"); return ServiceResult.OprateSuccess("发布成功！");
else if (status == "Draft") else if (status == Consts.DIC_COURSE_STATUS.DRAFT)
return ServiceResult.OprateSuccess("已启用成功，请进入草稿箱查看！"); return ServiceResult.OprateSuccess("已启用成功，请进入草稿箱查看！");
else else
return ServiceResult.OprateSuccess("停用成功！"); return ServiceResult.OprateSuccess("停用成功！");
@ -328,7 +364,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
{ {
entity.ExamPaperId = JsonHelper.ObjToJson(entity.ExamPaperIds); entity.ExamPaperId = JsonHelper.ObjToJson(entity.ExamPaperIds);
entity.CourseClassId = JsonHelper.ObjToJson(entity.CourseClassIds); entity.CourseClassId = JsonHelper.ObjToJson(entity.CourseClassIds);
entity.Status = "Draft"; entity.Status = Consts.DIC_COURSE_STATUS.DRAFT;
entity.DefaultCoverImageName = entity.DefaultCoverImageName ?? "defaultCourseCover1"; entity.DefaultCoverImageName = entity.DefaultCoverImageName ?? "defaultCourseCover1";
entity.UseDefaultCoverImage = entity.UseDefaultCoverImage ?? true; entity.UseDefaultCoverImage = entity.UseDefaultCoverImage ?? true;
return await base.Add(entity); return await base.Add(entity);
@ -339,6 +375,38 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
editModel.ExamPaperId = JsonHelper.ObjToJson(editModel.ExamPaperIds); editModel.ExamPaperId = JsonHelper.ObjToJson(editModel.ExamPaperIds);
editModel.CourseClassId = JsonHelper.ObjToJson(editModel.CourseClassIds); editModel.CourseClassId = JsonHelper.ObjToJson(editModel.CourseClassIds);
if (!editModel.CourseClassId.IsNull())
{
var CourseClassIds = JsonConvert.DeserializeObject<List<long>>(editModel.CourseClassId);
if (CourseClassIds != null && CourseClassIds.Any())
{
for (int i = 0; i < CourseClassIds.Count; i++)
{
if (!await Db.Queryable<Ghre_CourseClass>().AnyAsync(x => x.Id == CourseClassIds[i]))
throw new Exception($"课程关联的课程分类已失效，请修正数据后继续发布！");
}
}
}
if (!editModel.CourseSceneId.IsNull())
if (!await Db.Queryable<Ghre_CourseScene>().AnyAsync(x => x.Id == editModel.CourseSceneId))
throw new Exception($"课程关联的课程场景已失效，请修正数据后继续发布！");
if (!editModel.ExamPaperId.IsNull())
{
var ExamPaperIds = JsonConvert.DeserializeObject<List<long>>(editModel.ExamPaperId);
if (ExamPaperIds != null && ExamPaperIds.Any())
{
for (int i = 0; i < ExamPaperIds.Count; i++)
{
if (!await Db.Queryable<Ghre_ExamPaper>().AnyAsync(x => x.Id == ExamPaperIds[i] && x.Status == DIC_EXAM_PAPER_STATUS.RELEASED))
throw new Exception($"课程关联的试卷已失效，请修正数据后继续发布！");
}
}
}
return await base.Update(Id, editModel); return await base.Update(Id, editModel);
} }
@ -370,7 +438,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
]; ];
TableColumn.Add(searchItem); TableColumn.Add(searchItem);
sql = $"SELECT Id, CourseNo , CourseName FROM Ghre_Course WHERE Status ='Released' AND IsEnable=1"; sql = $"SELECT Id, CourseNo , CourseName FROM Ghre_Course WHERE Status ='{Consts.DIC_COURSE_STATUS.RELEASED}' AND IsEnable=1";
if (!string.IsNullOrWhiteSpace(keyWords)) if (!string.IsNullOrWhiteSpace(keyWords))
sql += $"AND ( CourseNo like '%{keyWords}%' or CourseName like '%{keyWords}%')"; sql += $"AND ( CourseNo like '%{keyWords}%' or CourseName like '%{keyWords}%')";

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

@ -12592,6 +12592,46 @@
全局常量 全局常量
</summary> </summary>
</member> </member>
<member name="T:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS">
<summary>
课程管理-状态
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS.DRAFT">
<summary>
草稿箱
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS.RELEASED">
<summary>
已发布
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_COURSE_STATUS.DISABLED">
<summary>
已停用
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS">
<summary>
考试管理-状态
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS.DRAFT">
<summary>
草稿箱
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS.RELEASED">
<summary>
已发布
</summary>
</member>
<member name="F:Tiobon.Core.Model.Consts.DIC_EXAM_PAPER_STATUS.DISABLED">
<summary>
已停用
</summary>
</member>
<member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STATUS"> <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_STATUS">
<summary> <summary>
考试管理-状态 考试管理-状态

Write Preview
Loading…
Cancel
Save