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

代码优化

Browse Source
master
xiaochanghai 1 year ago
parent cfdbb23b6c
commit 582d598117
5 changed files with 66 additions and 16 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. 10
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 14
      Tiobon.Core.Model/View/Ghre/Ghre_Attachment.Dto.View.cs
  3. 15
      Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamPaperInput.cs
  4. 25
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
  5. 10
      Tiobon.Core/Tiobon.Core.Model.xml

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

@ -4942,6 +4942,16 @@
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.UpdateDataInfo">
<summary>
修改信息 黄一名 于 2024-05-10 15:02 最后修改
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.CreateDataInfo">
<summary>
创建信息 黄一名 于 2024-05-10 14:57 创建
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.ExamPaperId">
<summary>
试卷ID

14
Tiobon.Core.Model/View/Ghre/Ghre_Attachment.Dto.View.cs
Unescape View File

@ -15,13 +15,21 @@
*└──────────────────────────────────┘
*/
namespace Tiobon.Core.Model.Models
{
namespace Tiobon.Core.Model.Models;
/// <summary>
/// 附件(Dto.View)
/// </summary>
public class Ghre_AttachmentDto : Ghre_Attachment
{
}
/// <summary>
/// 创建信息
/// </summary>
public string CreateDataInfo { get; set; }
/// <summary>
/// 修改信息
/// </summary>
public string UpdateDataInfo { get; set; }
}

15
Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamPaperInput.cs
Unescape View File

@ -1,7 +1,4 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel;
using System.Dynamic;
using Tiobon.Core.Model.Models;
using Tiobon.Core.Model.Models;
namespace Tiobon.Core.Model;
@ -11,6 +8,16 @@ public class DefaultGhre_ExamPaperInput
public List<DefaultGhre_ExamPaperColumn> randomSetColumns { get; set; } = new List<DefaultGhre_ExamPaperColumn>();
public List<DefaultGhre_ExamPaperColumn> manualSetColumns { get; set; } = new List<DefaultGhre_ExamPaperColumn>();
public DefaultGhre_ExamPaperPageData pageData { get; set; } = new DefaultGhre_ExamPaperPageData();
/// <summary>
/// 修改信息 黄一名 于 2024-05-10 15:02 最后修改
/// </summary>
public string UpdateDataInfo { get; set; }
/// <summary>
/// 创建信息 黄一名 于 2024-05-10 14:57 创建
/// </summary>
public string CreateDataInfo { get; set; }
}
public class DefaultGhre_ExamPaperColumn
{

25
Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
Unescape View File

@ -1,10 +1,8 @@

using System.Data;
using System.Dynamic;
using AgileObjects.AgileMapper;
using MongoDB.Driver.Linq;
using SqlSugar;
using Tiobon.Core.Common;
using Tiobon.Core.Common.DB.Dapper.Extensions;
using Tiobon.Core.IRepository.Base;
using Tiobon.Core.IServices;
using Tiobon.Core.Model;
@ -21,6 +19,7 @@ namespace Tiobon.Core.Services
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 IBaseRepository<Ghre_ExamPaper> _dal;
@ -28,7 +27,8 @@ namespace Tiobon.Core.Services
IGhre_ExamPaperConfigServices ghre_ExamPaperConfigServices,
IGhre_QuestionServices ghre_QuestionServices,
IGhre_QuestionAnswerServices ghre_QuestionAnswerServices,
IGhre_ExamPaperQuestionServices ghre_ExamPaperQuestionServices)
IGhre_ExamPaperQuestionServices ghre_ExamPaperQuestionServices,
IGhrs_UserServices ghrs_UserServices)
{
this._dal = dal;
base.BaseDal = dal;
@ -36,6 +36,8 @@ namespace Tiobon.Core.Services
_ghre_ExamPaperQuestionServices = ghre_ExamPaperQuestionServices;
_ghre_QuestionServices = ghre_QuestionServices;
_ghre_QuestionAnswerServices = ghre_QuestionAnswerServices;
_ghrs_UserServices = ghrs_UserServices;
}
public async Task<ServiceResult<DefaultGhre_ExamPaperInput>> QueryDefault(long Id)
@ -302,6 +304,19 @@ namespace Tiobon.Core.Services
baseData.CourseSceneId = exampaper.LinkId;
input.pageData.baseData = baseData;
#region 系统信息
var userIds = new List<int?>();
if (exampaper.CreateBy != null)
userIds.Add(Convert.ToInt32(exampaper.CreateBy.Value));
if (exampaper.UpdateBy != null)
userIds.Add(Convert.ToInt32(exampaper.UpdateBy.Value));
var users = await _ghrs_UserServices.Query(x => userIds.Contains(x.UserId));
if (exampaper.CreateBy != null)
input.CreateDataInfo = $"创建信息 {users.FirstOrDefault(x => x.UserId == exampaper.CreateBy)?.UserName} 于 {(exampaper.CreateTime != null ? exampaper.CreateTime.Value.ToString(@"yyyy\/MM\/dd HH:mm") : null)} 创建";
if (exampaper.UpdateBy != null)
input.CreateDataInfo = $"修改信息 {users.FirstOrDefault(x => x.UserId == exampaper.UpdateBy)?.UserName} 于 {(exampaper.UpdateTime != null ? exampaper.UpdateTime.Value.ToString(@"yyyy\/MM\/dd HH:mm") : null)} 最后修改";
#endregion
input.pageData.styleInfo.coverImage = exampaper.CoverUrl;
input.pageData.styleInfo.paperStyle = exampaper.Style;
@ -392,7 +407,7 @@ namespace Tiobon.Core.Services
sql += $" AND QuestionType='{insert.QuestionType}'";
if (insert.CourseId != null)
sql += $" AND CourseId='{insert.CourseId}'";
if (insert.CourseId != null)
if (insert.QuestionId != null)
sql += $" AND Id='{insert.QuestionId}'";
sql += $" ORDER BY GuidValue ASC";
var questions = await Db.Ado.SqlQueryAsync<Ghre_Question>(sql);

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

@ -4942,6 +4942,16 @@
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.UpdateDataInfo">
<summary>
修改信息 黄一名 于 2024-05-10 15:02 最后修改
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperInput.CreateDataInfo">
<summary>
创建信息 黄一名 于 2024-05-10 14:57 创建
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.ExamPaperId">
<summary>
试卷ID

Write Preview
Loading…
Cancel
Save