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 199dfabb92
commit 7c5a0f2b87
6 changed files with 671 additions and 617 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. 1157
      Model/Tiobon.Web.pdm
  2. 9
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 7
      Tiobon.Core.Api/Tiobon.Core.xml
  4. 16
      Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamPaperInput.cs
  5. 85
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
  6. 14
      Tiobon.Core/Tiobon.Core.Model.xml

1157
Model/Tiobon.Web.pdm
View File

File diff suppressed because it is too large Load Diff

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

@ -618,10 +618,12 @@
关联类型
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkId">
<summary>
关联ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
<summary>
关联次数
</summary>
@ -4950,6 +4952,11 @@
题目ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.QuestionType">
<summary>
题目类型
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.ConfigId">
<summary>
试卷配置ID

7
Tiobon.Core.Api/Tiobon.Core.xml
Unescape View File

@ -655,6 +655,13 @@
<param name="Id"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamPaperController.Insert1(Tiobon.Core.Model.DefaultGhre_ExamPaperPageData)">
<summary>
新增
</summary>
<param name="insert"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamPaperController.InsertConfig(Tiobon.Core.Model.Models.InsertGhre_ExamPaperConfigInput)">
<summary>
新增配置数据

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

@ -1,4 +1,6 @@
using System.Dynamic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel;
using System.Dynamic;
using Tiobon.Core.Model.Models;
namespace Tiobon.Core.Model;
@ -58,11 +60,21 @@ public class DefaultGhre_ExamPaperPreview
/// </summary>
public long QuestionId { get; set; }
/// <summary>
/// 题目类型
/// </summary>
public string QuestionType { get; set; }
/// <summary>
/// 题目内容
/// </summary>
public string QuestionContent { get; set; }
/// <summary>
/// 试卷配置ID
/// </summary>
public long? ConfigId { get; set; }
public List<FromGhre_QuestionQuestionTypeDetail> detail { get; set; } = new List<FromGhre_QuestionQuestionTypeDetail> { };
public FromGhre_QuestionQuestionTypeDetail detail { get; set; } = new FromGhre_QuestionQuestionTypeDetail();
}
public class InsertExamPaperConfigInput
{

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

@ -326,27 +326,41 @@ namespace Tiobon.Core.Services
previews.ForEach(x =>
{
var answers1 = answers.Where(y => y.QuestionId == x.QuestionId).ToList();
var detail = questions1.Select(o =>
new FromGhre_QuestionQuestionTypeDetail()
//var detail = questions1.Select(o =>
//new FromGhre_QuestionQuestionTypeDetail()
//{
// Id = o.Id,
// difficulty = o.DifficultyLevel,
// RemarkSz = o.QuestionAnalysis,
// content = o.QuestionContent,
//}).ToList();
//detail.ForEach(y =>
//{
// y.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
// y.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
// y.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
// {
// No = x.QuestionNo,
// label = x.AnswerContent,
// imageUrl = x.ImageUrl,
// imgWidthPc = x.ImageWidthPc,
// imgWidthApp = x.ImageWidthApp,
// }).ToList();
//});
var detail = new FromGhre_QuestionQuestionTypeDetail();
detail.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
detail.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
detail.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
{
Id = o.Id,
difficulty = o.DifficultyLevel,
RemarkSz = o.QuestionAnalysis,
content = o.QuestionContent,
No = x.QuestionNo,
label = x.AnswerContent,
imageUrl = x.ImageUrl,
imgWidthPc = x.ImageWidthPc,
imgWidthApp = x.ImageWidthApp,
}).ToList();
detail.ForEach(y =>
{
y.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
y.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
y.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
{
No = x.QuestionNo,
label = x.AnswerContent,
imageUrl = x.ImageUrl,
imgWidthPc = x.ImageWidthPc,
imgWidthApp = x.ImageWidthApp,
}).ToList();
});
x.detail = detail;
});
@ -383,6 +397,8 @@ namespace Tiobon.Core.Services
Id = x.Id,
parentId = parentId,
QuestionId = x.Id,
QuestionType = x.QuestionType,
QuestionContent = x.QuestionContent,
}).ToList();
var questionIds = previews.Select(x => x.QuestionId).Distinct().ToList();
var questions1 = await _ghre_QuestionServices.Query(x => questionIds.Contains(x.Id));
@ -391,29 +407,18 @@ namespace Tiobon.Core.Services
previews.ForEach(x =>
{
var answers1 = answers.Where(y => y.QuestionId == x.QuestionId).ToList();
var detail = questions1.Select(o =>
new FromGhre_QuestionQuestionTypeDetail()
var detail = new FromGhre_QuestionQuestionTypeDetail();
detail.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
detail.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
detail.answerList = answers1.Select(x => new FromGhre_QuestionQuestionAnswerList()
{
Id = o.Id,
difficulty = o.DifficultyLevel,
RemarkSz = o.QuestionAnalysis,
content = o.QuestionContent,
No = x.QuestionNo,
label = x.AnswerContent,
imageUrl = x.ImageUrl,
imgWidthPc = x.ImageWidthPc,
imgWidthApp = x.ImageWidthApp,
}).ToList();
detail.ForEach(y =>
{
y.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
y.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
y.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
{
No = x.QuestionNo,
label = x.AnswerContent,
imageUrl = x.ImageUrl,
imgWidthPc = x.ImageWidthPc,
imgWidthApp = x.ImageWidthApp,
}).ToList();
});
detail.content = x.QuestionContent;
x.detail = detail;
});
input.previewList = previews;

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

@ -618,10 +618,12 @@
关联类型
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkId">
<summary>
关联ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
<summary>
关联次数
</summary>
@ -4950,6 +4952,16 @@
题目ID
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.QuestionType">
<summary>
题目类型
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.QuestionContent">
<summary>
题目内容
</summary>
</member>
<member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.ConfigId">
<summary>
试卷配置ID

Write Preview
Loading…
Cancel
Save