diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs index 3e5942a9..90798626 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamPaperController.cs @@ -25,6 +25,22 @@ public class Ghre_ExamPaperController : BaseController + /// 根据条件查询数据 + /// + /// status + /// 条件 + /// + [HttpPost, Route("QueryList/{status}")] + public async Task> QueryList(string status, [FromBody] QueryBody body) + { + var data = await _service.QueryList(body, status); + return data; + } + + #endregion #endregion #region 新增 @@ -53,6 +69,11 @@ public class Ghre_ExamPaperController : BaseController UpdateStatus(string status, [FromBody] long[] ids) + { + return await _service.UpdateStatus(ids, status); + } #endregion #region 新增配置数据 diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index fd23003a..5b027bea 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -4049,6 +4049,11 @@ 修改信息 + + + 评分方式 + + 试卷配置(Dto.View) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 983f17a9..d773c557 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -655,6 +655,14 @@ + + + 根据条件查询数据 + + status + 条件 + + 新增 diff --git a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs index 47060363..4f66fba8 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamPaperServices.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Tiobon.Core.Common; using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; @@ -15,5 +16,9 @@ namespace Tiobon.Core.IServices Task> InsertConfig(InsertGhre_ExamPaperConfigInput insert); Task> Insert1([FromBody] DefaultGhre_ExamPaperPageData insert); Task Update1(long id, DefaultGhre_ExamPaperPageData insertModel); + + Task UpdateStatus(long[] ids, string status); + + Task> QueryList(QueryBody body, string status); } } \ No newline at end of file diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs index fba11762..106a0f9d 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamPaper.Dto.View.cs @@ -38,5 +38,14 @@ namespace Tiobon.Core.Model.Models /// 修改信息 /// public string UpdateDataInfo { get; set; } + + + + /// + /// 评分方式 + /// + public string TotalScore1 { get; set; } + public string SetMethodLabel { get; set; } + public string CourseName { get; set; } } } diff --git a/Tiobon.Core.PublishHelper/Tiobon.Core.PublishHelper.csproj b/Tiobon.Core.PublishHelper/Tiobon.Core.PublishHelper.csproj index afcaa906..37835400 100644 --- a/Tiobon.Core.PublishHelper/Tiobon.Core.PublishHelper.csproj +++ b/Tiobon.Core.PublishHelper/Tiobon.Core.PublishHelper.csproj @@ -38,9 +38,7 @@ Form - - Form - + Form diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index 320616b9..91c9284b 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -806,7 +806,7 @@ public class BaseServices : IBaseServ if (list == null || (list != null && !list.Any())) { string sql = $"SELECT * FROM Ghrs_ParaDetail WHERE ParaMasterNo ='{key}' ORDER BY SortNo ASC"; - list = await Db.Ado.SqlQueryAsync(sql); + list = DbAccess.QueryList(sql); if (list.Any()) await _caching.SetAsync(key, list); } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 099d4a8b..909f01f5 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1,4 +1,5 @@ using System.Data; +using System.Drawing; using AgileObjects.AgileMapper; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -273,6 +274,7 @@ public partial class CommonServices : BaseServices>, ICommon sql = string.Format(sql, param.menuName, App.User.ID, param.langId); result.JM_PageControlT1.Toolbar = DbAccess.QueryList(sql); + #region 特殊处理 if (param.menuName == "F_QuestionBank") { var toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); @@ -288,7 +290,20 @@ public partial class CommonServices : BaseServices>, ICommon if (toolbar != null) { toolbar.fnKey = "TBD2YN"; } toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault(); if (toolbar != null) { toolbar.fnKey = "TBD3YN"; } + + var index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "TBD1YN"); + result.JM_PageControlT1.Toolbar.Insert(index + 1, new Toolbar() + { + display = true, + fnKey = "TBD4YN", + fnTitle = "已发布", + fnType = "table", + icon = "ghr-publish", + position = "left" + }); + } + #endregion #endregion @@ -858,178 +873,6 @@ public partial class CommonServices : BaseServices>, ICommon result.DT_Procedure.EditProcedure = dt.Rows[0]["EditProcedure"].ToString(); result.DT_Procedure.IUDProcedure = dt.Rows[0]["IUDProcedure"].ToString(); } - //if (UserHasSetting == 0) - //{ - // sql = @"SELECT PageSettingQueryId, - // elementType, - // field, - // label, - // Meky, - // multipleSelect, - // dataType, - // required, - // palceholder, - // dataSourceType, - // dbo.FS_GetdataSourceBySet - // (dataSource, APIDataSourceType, Ghrs_PageSettingQuery.APIDataSourceID) - // dataSource, - // sortable, - // sortOrder, - // defaultHidden, - // ConfigIsShow, - // filterable, - // CASE WHEN width = '' THEN '100' ELSE width END width, - // align, - // fixed fixed1, - // editable, - // searchable, - // searchRequired, - // searchColumnSeq, - // multipleSearchValue, - // maxTagCount, - // selfDefine, - // selectUI, - // isPrimaryKey, - // 'false' - // isSorted, - // 'false' - // isHidden, - // CASE - // WHEN searchColumnSeq IS NULL OR searchColumnSeq = '' THEN 'false' - // ELSE 'true' - // END - // isSearched, - // SortNo, - // searchCanOperator, - // '' - // searchColumnDefaultValue, - // '' - // AppColumnType - // FROM Ghrs_PageSettingQuery - // WHERE PageNo = '{0}' - // AND elementType NOT IN ('PageGroup') - // AND IsEnable = 1 - // ORDER BY SortNo"; - // sql = string.Format(sql, param.menuName); - //} - - //else - //{ - // sql = @"SELECT a.PageSettingQueryId, - // elementType, - // field, - // label, - // Meky, - // multipleSelect, - // dataType, - // required, - // palceholder, - // dataSourceType, - // dbo.FS_GetdataSourceBySet - // (dataSource, APIDataSourceType, b.APIDataSourceID) - // dataSource, - // sortable, - // isnull (a.sortOrder, b.sortOrder), - // defaultHidden, - // ConfigIsShow, - // filterable, - // CASE - // WHEN isnull (a.width, b.width) = '' THEN '100' - // ELSE isnull (a.width, b.width) - // END width, - // align, - // a.fixed fixed1, - // editable, - // searchable, - // searchRequired, - // isnull (a.searchColumnSeq, b.searchColumnSeq) searchColumnSeq, - // multipleSearchValue, - // maxTagCount, - // selfDefine, - // selectUI, - // isPrimaryKey, - // a.isSorted - // isSorted, - // isnull (a.isHidden, 'false') - // isHidden, - // CASE - // WHEN a.searchColumnSeq IS NULL OR a.searchColumnSeq = '' - // THEN - // 'false' - // ELSE - // 'true' - // END - // isSearched, - // a.SortNo, - // b.searchCanOperator, - // '' - // searchColumnDefaultValue, - // '' - // AppColumnType - // FROM Ghrs_UserPageSettingQueryColumn a, Ghrs_PageSettingQuery b - // WHERE b.PageNo = '{0}' - // AND b.IsEnable = 1 - // AND b.elementType NOT IN ('PageGroup') - // AND a.UserID = '{1}' - // AND a.IsEnable = 1 - // AND a.PageSettingQueryId = b.PageSettingQueryId - // ORDER BY a.SortNo, b.SortNo"; - // sql = string.Format(sql, param.menuName, App.User.ID); - - // sql = @"SELECT PageSettingQueryId, - // elementType, - // field, - // label, - // Meky, - // multipleSelect, - // dataType, - // required, - // palceholder, - // dataSourceType, - // dbo.FS_GetdataSourceBySet - // (dataSource, APIDataSourceType, Ghrs_PageSettingQuery.APIDataSourceID) - // dataSource, - // sortable, - // sortOrder, - // defaultHidden, - // ConfigIsShow, - // filterable, - // CASE WHEN width = '' THEN '100' ELSE width END width, - // align, - // fixed fixed1, - // editable, - // searchable, - // searchRequired, - // searchColumnSeq, - // multipleSearchValue, - // maxTagCount, - // selfDefine, - // selectUI, - // isPrimaryKey, - // 'false' - // isSorted, - // 'false' - // isHidden, - // CASE - // WHEN searchColumnSeq IS NULL OR searchColumnSeq = '' THEN 'false' - // ELSE 'true' - // END - // isSearched, - // SortNo, - // searchCanOperator, - // '' - // searchColumnDefaultValue, - // '' - // AppColumnType - // FROM Ghrs_PageSettingQuery - // WHERE PageNo = '{0}' - // AND elementType NOT IN ('PageGroup') - // AND IsEnable = 1 - // AND elementtype = 'FnKey' ORDER BY SortNo"; - // sql = string.Format(sql, param.menuName ); - //} - - //result.JM_TableColumnT1 = DbAccess.QueryList(sql); #endregion diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs index 3b9d3d1a..579ad288 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs @@ -1,8 +1,15 @@  using System.Data; +using System.Text.RegularExpressions; using AgileObjects.AgileMapper; +using Microsoft.AspNetCore.Http; using MongoDB.Driver.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using SqlSugar; +using Tiobon.Core.Common; +using Tiobon.Core.Common.Caches; +using Tiobon.Core.Common.UserManager; using Tiobon.Core.IRepository.Base; using Tiobon.Core.IServices; using Tiobon.Core.Model; @@ -16,11 +23,13 @@ namespace Tiobon.Core.Services /// public class Ghre_ExamPaperServices : BaseServices, IGhre_ExamPaperServices { - private IGhre_ExamPaperConfigServices _ghre_ExamPaperConfigServices; - private IGhre_ExamPaperQuestionServices _ghre_ExamPaperQuestionServices; - private IGhre_QuestionServices _ghre_QuestionServices; - readonly IGhrs_UserServices _ghrs_UserServices; - private IGhre_QuestionAnswerServices _ghre_QuestionAnswerServices; + private readonly IGhre_ExamPaperConfigServices _ghre_ExamPaperConfigServices; + private readonly IGhre_ExamPaperQuestionServices _ghre_ExamPaperQuestionServices; + private readonly IGhre_QuestionServices _ghre_QuestionServices; + private readonly IGhrs_UserServices _ghrs_UserServices; + private readonly IGhre_QuestionAnswerServices _ghre_QuestionAnswerServices; + private readonly IGhre_CourseServices _ghre_CourseServices; + private readonly IGhre_CourseSceneServices _ghre_CourseSceneServices; private readonly IBaseRepository _dal; public Ghre_ExamPaperServices(IBaseRepository dal, @@ -28,17 +37,139 @@ namespace Tiobon.Core.Services IGhre_QuestionServices ghre_QuestionServices, IGhre_QuestionAnswerServices ghre_QuestionAnswerServices, IGhre_ExamPaperQuestionServices ghre_ExamPaperQuestionServices, + IGhre_CourseServices ghre_CourseServices, + IGhre_CourseSceneServices ghre_CourseSceneServices, + ICaching caching, IGhrs_UserServices ghrs_UserServices) { this._dal = dal; base.BaseDal = dal; + base._caching = caching; _ghre_ExamPaperConfigServices = ghre_ExamPaperConfigServices; _ghre_ExamPaperQuestionServices = ghre_ExamPaperQuestionServices; _ghre_QuestionServices = ghre_QuestionServices; _ghre_QuestionAnswerServices = ghre_QuestionAnswerServices; _ghrs_UserServices = ghrs_UserServices; + _ghre_CourseServices = ghre_CourseServices; + _ghre_CourseSceneServices = ghre_CourseSceneServices; } + public override async Task> QueryFilterPage(QueryBody body) + { + var data = await BaseDal.QueryFilterPage(body); + var data1 = Mapper.Map(data.result.DT_TableDataT1).ToANew>(); + + var linkIds = data1.Where(x => x.LinkId != null).Select(x => x.LinkId.Value).Distinct().ToList(); + var courses = await _ghre_CourseServices.Query(x => linkIds.Contains(x.Id)); + var courseScenes = await _ghre_CourseSceneServices.Query(x => linkIds.Contains(x.Id)); + + data1.ForEach(async x => + { + try + { + x.ScoreMethodLabel = await GetParaLabel("ScoreMethod", x.ScoreMethod); + x.TotalScore1 = Regex.Replace(x.PassScore.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(x.TotalScore.ToString(), @"\.(0+)$", ""); + x.SetMethodLabel = await GetParaLabel("SetMethod", x.SetMethod); + + if (x.LinkType == "CourseId") + x.CourseName = courses.FirstOrDefault(o => o.Id == x.LinkId)?.CourseName; + else if (x.LinkType == "CourseSceneId") + x.CourseName = courseScenes.FirstOrDefault(o => o.Id == x.LinkId)?.SceneName; + } + catch (Exception) + { + + } + + }); + + return new ServicePageResult(body.pageNum, data.result.DT_TablePageInfoT1.TotalCount, body.pageSize, data1); + } + + public async Task> QueryList(QueryBody body, string status) + { + var data = await QueryFilterPage1(body, status); + var data1 = Mapper.Map(data.result.DT_TableDataT1).ToANew>(); + + var linkIds = data1.Where(x => x.LinkId != null).Select(x => x.LinkId.Value).Distinct().ToList(); + var courses = await _ghre_CourseServices.Query(x => linkIds.Contains(x.Id)); + var courseScenes = await _ghre_CourseSceneServices.Query(x => linkIds.Contains(x.Id)); + + data1.ForEach(async x => + { + try + { + x.ScoreMethodLabel = await GetParaLabel("ScoreMethod", x.ScoreMethod); + x.TotalScore1 = Regex.Replace(x.PassScore.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(x.TotalScore.ToString(), @"\.(0+)$", ""); + x.SetMethodLabel = await GetParaLabel("SetMethod", x.SetMethod); + + if (x.LinkType == "CourseId") + x.CourseName = courses.FirstOrDefault(o => o.Id == x.LinkId)?.CourseName; + else if (x.LinkType == "CourseSceneId") + x.CourseName = courseScenes.FirstOrDefault(o => o.Id == x.LinkId)?.SceneName; + } + catch (Exception) + { + + } + + }); + + return new ServicePageResult(body.pageNum, data.result.DT_TablePageInfoT1.TotalCount, body.pageSize, data1); + } + + public async Task> QueryFilterPage1(QueryBody filter, string status = null) + { + RefAsync totalCount = 0; + var query = Db.Queryable(); + if (!string.IsNullOrWhiteSpace(status)) + query = query.Where(x => x.Status == status); + string conditions = "1=1"; + if (filter.jsonParam != null) + foreach (JProperty jProperty in filter.jsonParam.Properties()) + { + var name = jProperty.Name; + var value = jProperty.Value.ToString(); + if (name == "page" || name == "pageSize") + continue; + if (!string.IsNullOrWhiteSpace(value)) + { + var jsonParam = JsonConvert.DeserializeObject(value); + + switch (jsonParam.operationKey) + { + case "Include": + conditions += $" AND {name} LIKE '%{jsonParam.columnValue}%'"; + break; + case "NotInclude": + conditions += $" AND {name} NOT LIKE '%{jsonParam.columnValue}%'"; + break; + case "IsNull": + conditions += $" AND {name} IS NULL"; + break; + case "NotNull": + conditions += $" AND {name} IS NOT NULL"; + break; + case "Equal": + conditions += $" AND {name} ='{jsonParam.columnValue}'"; + break; + case "NotEqual": + conditions += $" AND {name} !='{jsonParam.columnValue}'"; + break; + default: + break; + } + } + } + if (filter.pageSize == 0) + filter.pageSize = 10000; + query = query.Where(conditions); + var list = await query + .OrderByIF(!string.IsNullOrEmpty(filter.orderBy), filter.orderBy) + .ToPageListAsync(filter.pageNum, filter.pageSize, totalCount); + + return new ServicePageResult(filter.pageNum, totalCount, filter.pageSize, list); + } public async Task> QueryDefault(long Id) { @@ -186,6 +317,7 @@ namespace Tiobon.Core.Services multipleSelect = false, editable = true, displayType=2, + width=80, dataSource = "api/Common/GetSelect/DifficultyLevel?FW=DOTNETCORE" }, new DefaultGhre_ExamPaperColumn() @@ -196,6 +328,7 @@ namespace Tiobon.Core.Services required = true, multipleSelect = false, editable = true, + width=80, displayType=2 }, new DefaultGhre_ExamPaperColumn() @@ -206,6 +339,7 @@ namespace Tiobon.Core.Services required = true, multipleSelect = false, editable = true, + width=80, displayType=2 } }; @@ -252,6 +386,7 @@ namespace Tiobon.Core.Services required = true, multipleSelect = false, editable = true, + width=80, displayType=2 }, new DefaultGhre_ExamPaperColumn() @@ -262,6 +397,7 @@ namespace Tiobon.Core.Services required = true, multipleSelect = false, editable = true, + width=80, displayType=2 } }; @@ -535,20 +671,37 @@ delete from Ghre_ExamPaperQuestion WHERE ExamPaperId='{id}';"); } - public static string ConvertQuestionType(string type) + public async Task UpdateStatus(long[] ids, string status) { - string questionTypeName = string.Empty; - if (type == "Single") - questionTypeName = "单选题"; - else if (type == "Multiple") - questionTypeName = "多选题"; - else if (type == "TrueOrFalse") - questionTypeName = "判断题"; - else if (type == "Completion") - questionTypeName = "填空题"; - else if (type == "ShortAnswer") - questionTypeName = "简答题"; - return questionTypeName; + + HttpRequest request = UserContext.Context.Request; + var api = request.Path.ObjToString().TrimEnd('/').ToLower(); + var ip = GetUserIp(UserContext.Context); + + List entities = new List(); + foreach (var id in ids) + { + if (id == null || !BaseDal.Any(id)) + continue; + + var entity = await BaseDal.QueryById(id); + + BasePoco ent = entity; + ent.UpdateIP = ip; + ent.UpdateProg = api; + if ((status == "Released" && entity.Status == "Draft") || status == "Disabled" && entity.Status == "Released") + { + entity.Status = status; + entities.Add(entity); + } + } + + var result = await BaseDal.Update(entities); + if (status == "Released") + return ServiceResult.OprateSuccess("发布成功！"); + else + return ServiceResult.OprateSuccess("停用成功！"); + } } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs index c1c1dc0f..da168cc8 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SqlSugar; using Tiobon.Core.Common; +using Tiobon.Core.Common.Caches; using Tiobon.Core.IRepository.Base; using Tiobon.Core.IServices; using Tiobon.Core.Model; @@ -25,10 +26,12 @@ public class Ghre_QuestionServices : BaseServices dal, IGhre_QuestionAnswerServices ghre_QuestionAnswerServices, IGhre_CourseServices ghre_CourseServices, + ICaching caching, IGhre_CourseClassServices ghre_CourseClassServices) { this._dal = dal; base.BaseDal = dal; + base._caching = caching; _ghre_QuestionAnswerServices = ghre_QuestionAnswerServices; _ghre_CourseServices = ghre_CourseServices; _ghre_CourseClassServices = ghre_CourseClassServices; @@ -134,10 +137,10 @@ public class Ghre_QuestionServices : BaseServices courseIds.Contains(x.Id)); var classsIds = courses.Select(x => x.CourseClassId).Distinct().ToList(); var classs = await _ghre_CourseClassServices.Query(x => classsIds.Contains(x.Id)); - data.ForEach(x => + data.ForEach(async x => { - x.DifficultyLevelLabel = ConvertDifficultyLevel(x.DifficultyLevel); - x.QuestionTypeLabel = ConvertQuestionType(x.QuestionType); + x.DifficultyLevelLabel = await GetParaLabel("DifficultyLevel", x.DifficultyLevel); + x.QuestionTypeLabel = await GetParaLabel("QuestionType", x.QuestionType); if (x.CourseId != null) { @@ -187,7 +190,7 @@ public class Ghre_QuestionServices : BaseServices { @@ -265,7 +268,7 @@ public class Ghre_QuestionServices : BaseServices(), answer1 = new List { @@ -617,6 +620,7 @@ public class Ghre_QuestionServices : BaseServices + + + Ghrs_ParaDetail (Dto.Base) + + + + + ParaDetailId + + + + + ParaTypeId + + + + + ParaMasterId + + + + + ParaTypeNo + + + + + ParaMasterNo + + + + + ParaDetailNo + + + + + ParaDetailName + + + + + ParaDetailEname + + + + + IsBuildIn + + + + + MKey + + + + + SqlFunction + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + 系统用户 (Dto.Base) @@ -1377,6 +1497,11 @@ 题目答案 (Dto.EditInput) + + + Ghrs_ParaDetail (Dto.EditInput) + + 系统用户 (Dto.EditInput) @@ -1437,6 +1562,11 @@ 题目答案 (Dto.InsertInput) + + + Ghrs_ParaDetail (Dto.InsertInput) + + 系统用户 (Dto.InsertInput) @@ -2896,6 +3026,126 @@ 任务内存中的状态 + + + Ghrs_ParaDetail (Model) + + + + + ParaDetailId + + + + + ParaTypeId + + + + + ParaMasterId + + + + + ParaTypeNo + + + + + ParaMasterNo + + + + + ParaDetailNo + + + + + ParaDetailName + + + + + ParaDetailEname + + + + + IsBuildIn + + + + + MKey + + + + + SqlFunction + + + + + RemarkSz + + + + + SortNo + + + + + IsDefault + + + + + Reverse1 + + + + + Reverse2 + + + + + Reverse3 + + + + + Reverse4 + + + + + Reverse5 + + + + + Reverse6 + + + + + Reverse7 + + + + + Reverse8 + + + + + Reverse9 + + 系统用户 (Model) @@ -3784,6 +4034,11 @@ 试卷(Dto.View) + + + 评分方式 + + 创建信息 @@ -3794,6 +4049,11 @@ 修改信息 + + + 评分方式 + + 试卷配置(Dto.View) @@ -3839,6 +4099,21 @@ 题目答案(Dto.View) + + + Ghrs_ParaDetail(Dto.View) + + + + + 创建信息 + + + + + 修改信息 + + 系统用户(Dto.View) diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index c7a1b9bd..d773c557 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -655,6 +655,14 @@ + + + 根据条件查询数据 + + status + 条件 + + 新增 @@ -714,6 +722,11 @@ + + + Ghrs_ParaDetail(Controller) + + 系统用户(Controller)