考试管理新增集团数据归属维护

master
xiaochanghai 3 weeks ago
parent ea9ff02aec
commit b1cea51862
  1. 8041
      Model/Tiobon.Web.pdm
  2. 7
      Tiobon.Core.Model/Base/Ghre/Ghre_Exam.Dto.Base.cs
  3. 7
      Tiobon.Core.Model/Models/Ghre/Ghre_Exam.cs
  4. 1
      Tiobon.Core.Model/View/Ghre/Ghre_Exam.Dto.View.cs
  5. 26
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  6. 10
      Tiobon.Core/Tiobon.Core.Model.xml

File diff suppressed because it is too large Load Diff

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/4/1 15:30:59 SimonHsiao
*V0.01 2025/5/29 16:35:07 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -250,4 +250,9 @@ public class Ghre_ExamBase
/// 查看答案和解析后,是否允许重新考试
/// </summary>
public bool? IsAfterViewResultRetake { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
}

@ -6,7 +6,7 @@
*
* Ver
*
*V0.01 2025/4/1 15:30:59 SimonHsiao
*V0.01 2025/5/29 16:35:07 SimonHsiao
*
* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
*
@ -251,4 +251,9 @@ public class Ghre_Exam : BasePoco
/// 查看答案和解析后,是否允许重新考试
/// </summary>
public bool? IsAfterViewResultRetake { get; set; }
/// <summary>
/// 集团数据归属
/// </summary>
public int? DataBelongID { get; set; }
}

@ -75,4 +75,5 @@ public class Ghre_ExamDto : Ghre_Exam
/// 可取消归档
/// </summary>
public int canClose { get; set; } = 1;
public string DataBelongName { get; set; }
}

@ -1,5 +1,4 @@
using MongoDB.Driver.Linq;
using System.Drawing.Drawing2D;
using static Tiobon.Core.Model.Consts;
namespace Tiobon.Core.Services;
@ -458,7 +457,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
public async Task<ServicePageResult<Ghre_ExamDto>> QueryFilterPage1(QueryBody filter, string status = null, List<long> ids = null)
{
RefAsync<int> totalCount = 0;
string sql = @"SELECT *
string sql = @$"SELECT *
FROM (SELECT A.*,
CASE
WHEN A.LinkType = 'CourseId' THEN B.CourseName
@ -473,7 +472,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
LEFT JOIN Ghre_CourseScene D ON A.CourseSceneId = D.Id
LEFT JOIN Ghre_ExamPaper E ON A.ExamPaperId = E.Id
WHERE A.IsEnable = 1) A";
WHERE A.IsEnable = 1 AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1) A";
if (string.IsNullOrWhiteSpace(filter.orderBy))
filter.orderBy = "CreateTime1 DESC";
@ -998,6 +997,17 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
required = true,
multipleSelect = false,
editable = true
},
new DefaultGhre_ExamColumn()
{
label = "集团数据归属",
field = "DataBelongID",
elementType = "ApiSelect",
required = false,
multipleSelect = false,
editable = true,
dataSource = "CommonList_DataBelongAll",
placeholder = ""
}
};
@ -1404,13 +1414,13 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
if (entity.LinkType == DIC_EXAM_LINK_TYPE_COURSE)
{
var ids1 = await Db.Queryable<Ghre_Exam>()
.Where(x =>
x.Source == null &&
x.Status == DIC_EXAM_STATUS.RELEASED &&
x.CourseId == entity.CourseId &&
.Where(x =>
x.Source == null &&
x.Status == DIC_EXAM_STATUS.RELEASED &&
x.CourseId == entity.CourseId &&
x.Id != id)
.Select(x => x.Id).ToListAsync();
#region 校验同一个课程下 考试时间不允许重叠
var exams = await base.Query(x => (
x.Source == null &&

@ -4735,6 +4735,11 @@
查看答案和解析后,是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamBase.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamMessageLogBase">
<summary>
考试通知记录 (Dto.Base)
@ -24452,6 +24457,11 @@
查看答案和解析后,是否允许重新考试
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_Exam.DataBelongID">
<summary>
集团数据归属
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_ExamMessageLog">
<summary>
考试通知记录 (Model)

Loading…
Cancel
Save