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

代码优化

Browse Source
master
xiaochanghai 1 year ago
parent 035f0c562e
commit f6ace28012
7 changed files with 148 additions and 30 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. 14
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  2. 7
      Tiobon.Core.Api/Tiobon.Core.xml
  3. 12
      Tiobon.Core.Model/View/Ghre/Ghre_Question.Dto.View.cs
  4. 107
      Tiobon.Core.Services/CommonServices.cs
  5. 21
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
  6. 7
      Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
  7. 10
      Tiobon.Core/Tiobon.Core.Model.xml

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

@ -721,13 +721,17 @@
试卷配置 (Dto.Base) 试卷配置 (Dto.Base)
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.TaxisNo"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.ExamPaperId">
<summary> <summary>
试卷ID 试卷ID
</summary> </summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.CourseId">
<summary> <summary>
课程ID 课程ID
</summary> </summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.TaxisNo">
<summary> <summary>
排序号 排序号
</summary> </summary>
@ -742,9 +746,9 @@
题目类型 题目类型
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.QuestionContent"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.QuestionId">
<summary> <summary>
题目内容 题目内容ID
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.Quantity"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfigBase.Quantity">
@ -2345,9 +2349,9 @@
题目类型 题目类型
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfig.QuestionContent"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfig.QuestionId">
<summary> <summary>
题目内容 题目内容ID
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfig.Quantity"> <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperConfig.Quantity">

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

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

12
Tiobon.Core.Model/View/Ghre/Ghre_Question.Dto.View.cs
Unescape View File

@ -32,6 +32,18 @@ namespace Tiobon.Core.Model.Models
[Display(Name = "CourseName"), Description("课程名称")] [Display(Name = "CourseName"), Description("课程名称")]
public string CourseName { get; set; } public string CourseName { get; set; }
public long CourseTypeId { get; set; }
public string CourseType { get; set; } public string CourseType { get; set; }
/// <summary>
/// 难易程度
/// </summary>
public string DifficultyLevelLabel { get; set; }
/// <summary>
/// 题目类型
/// </summary>
public string QuestionTypeLabel { get; set; }
} }
} }

107
Tiobon.Core.Services/CommonServices.cs
Unescape View File

@ -1128,22 +1128,18 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
break; break;
case "ScoreMethod": case "ScoreMethod":
searchItem = [ searchItem = [
new JProperty("defaultHidden", true), new JProperty("defaultHidden", true),
new JProperty("field","value"), new JProperty("field","value"),
new JProperty("label","value"), new JProperty("label","value")
]; ];
TableColumn.Add(searchItem); TableColumn.Add(searchItem);
searchItem = [ searchItem = [
new JProperty("field","label"), new JProperty("field","label"),
new JProperty("label","label"), new JProperty("label","label")
]; ];
TableColumn.Add(searchItem); TableColumn.Add(searchItem);
sql = "SELECT Id, CourseNo, CourseName FROM Ghre_Course";
dt = await Db.Ado.GetDataTableAsync(sql);
item = [ item = [
new JProperty("value","Manual"), new JProperty("value","Manual"),
new JProperty("label","人工评分") new JProperty("label","人工评分")
]; ];
DT_TableDataT1.Add(item); DT_TableDataT1.Add(item);
@ -1154,16 +1150,101 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
DT_TableDataT1.Add(item); DT_TableDataT1.Add(item);
item = [ item = [
new JProperty("ListMax",100), new JProperty("ListMax",100),
new JProperty("ListMin",10), new JProperty("ListMin",10),
new JProperty("PageNum",1), new JProperty("PageNum",1),
new JProperty("PageSize",99999), new JProperty("PageSize",99999),
new JProperty("TotalCount",dt.Rows.Count), new JProperty("TotalCount",2),
new JProperty("UIType","Auto")
];
DT_TablePageInfoT1.Add(item);
break;
case "DifficultyLevel":
searchItem = [
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","value")
];
TableColumn.Add(searchItem);
searchItem = [
new JProperty("field","label"),
new JProperty("label","label")
];
TableColumn.Add(searchItem);
item = [
new JProperty("value","Easy"),
new JProperty("label","简单")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("value","Normal"),
new JProperty("label","普通")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("value","Hard"),
new JProperty("label","困难")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",3),
new JProperty("UIType","Auto") new JProperty("UIType","Auto")
]; ];
DT_TablePageInfoT1.Add(item); DT_TablePageInfoT1.Add(item);
break; break;
case "QuestionType":
searchItem = [
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","value")
];
TableColumn.Add(searchItem);
searchItem = [
new JProperty("field","label"),
new JProperty("label","label")
];
TableColumn.Add(searchItem);
item = [
new JProperty("value","Single"),
new JProperty("label","单选题")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("value","Multiple"),
new JProperty("label","多选题")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("value","TrueOrFalse"),
new JProperty("label","判断题")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("value","Completion"),
new JProperty("label","填空题")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("value","ShortAnswer"),
new JProperty("label","简答题")
];
DT_TableDataT1.Add(item);
item = [
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",5),
new JProperty("UIType","Auto")
];
DT_TablePageInfoT1.Add(item);
break;
} }
result.JM_TableColumnT1.TableColumn = TableColumn; result.JM_TableColumnT1.TableColumn = TableColumn;
result.DT_TableDataT1 = DT_TableDataT1; result.DT_TableDataT1 = DT_TableDataT1;

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

@ -78,7 +78,7 @@ namespace Tiobon.Core.Services
required = true, required = true,
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
dataSource = "api/Common/GetSelect/ScoreMethod" dataSource = "api/Common/GetSelect/ScoreMethod?FW=DOTNETCORE"
}, },
new DefaultGhre_ExamPaperColumn() new DefaultGhre_ExamPaperColumn()
{ {
@ -130,20 +130,20 @@ namespace Tiobon.Core.Services
label = "课程名称", label = "课程名称",
field = "CourseId", field = "CourseId",
elementType = "ApiSelect", elementType = "ApiSelect",
required = false, required = true,
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
dataSource = "api/Common/GetSelect/Ghre_Course" dataSource = "api/Common/GetSelect/Ghre_Course?FW=DOTNETCORE"
}, },
new DefaultGhre_ExamPaperColumn() new DefaultGhre_ExamPaperColumn()
{ {
label = "课程场景", label = "课程场景",
field = "CourseSceneId", field = "CourseSceneId",
elementType = "ApiSelect", elementType = "ApiSelect",
required = false, required = true,
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
dataSource = "api/Common/GetSelect/Ghre_CourseScene" dataSource = "api/Common/GetSelect/Ghre_CourseScene?FW=DOTNETCORE"
} }
}; };
#endregion #endregion
@ -159,7 +159,8 @@ namespace Tiobon.Core.Services
required = true, required = true,
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
displayType=1 displayType=1,
dataSource = "api/Common/GetSelect/Ghre_Course?FW=DOTNETCORE"
}, },
new DefaultGhre_ExamPaperColumn() new DefaultGhre_ExamPaperColumn()
{ {
@ -169,7 +170,8 @@ namespace Tiobon.Core.Services
required = true, required = true,
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
displayType=2 displayType=2,
dataSource = "api/Common/GetSelect/QuestionType?FW=DOTNETCORE"
}, },
new DefaultGhre_ExamPaperColumn() new DefaultGhre_ExamPaperColumn()
{ {
@ -179,7 +181,8 @@ namespace Tiobon.Core.Services
required = true, required = true,
multipleSelect = false, multipleSelect = false,
editable = true, editable = true,
displayType=2 displayType=2,
dataSource = "api/Common/GetSelect/DifficultyLevel?FW=DOTNETCORE"
}, },
new DefaultGhre_ExamPaperColumn() new DefaultGhre_ExamPaperColumn()
{ {
@ -272,7 +275,7 @@ namespace Tiobon.Core.Services
baseData.PassScore = null; baseData.PassScore = null;
baseData.RetakeTimes = null; baseData.RetakeTimes = null;
baseData.RemarkSz = null; baseData.RemarkSz = null;
baseData.LinkType = null; baseData.LinkType = "CourseId";
baseData.CourseId = null; baseData.CourseId = null;
baseData.CourseSceneId = null; baseData.CourseSceneId = null;
input.pageData.baseData = baseData; input.pageData.baseData = baseData;

7
Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
Unescape View File

@ -133,8 +133,8 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
var classs = await _ghre_CourseClassServices.Query(x => classsIds.Contains(x.Id)); var classs = await _ghre_CourseClassServices.Query(x => classsIds.Contains(x.Id));
data.ForEach(x => data.ForEach(x =>
{ {
x.DifficultyLevel = ConvertDifficultyLevel(x.DifficultyLevel); x.DifficultyLevelLabel = ConvertDifficultyLevel(x.DifficultyLevel);
x.QuestionType = ConvertQuestionType(x.QuestionType); x.QuestionTypeLabel = ConvertQuestionType(x.QuestionType);
if (x.CourseId != null) if (x.CourseId != null)
{ {
@ -142,6 +142,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
x.CourseName = course?.CourseName; x.CourseName = course?.CourseName;
var courseClass = classs.Where(a => a.Id == course.CourseClassId).FirstOrDefault(); var courseClass = classs.Where(a => a.Id == course.CourseClassId).FirstOrDefault();
x.CourseType = courseClass.ClassName; x.CourseType = courseClass.ClassName;
x.CourseTypeId = courseClass.Id;
} }
}); });
@ -166,7 +167,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
required = true, required = true,
multipleSelect = true, multipleSelect = true,
editable = true, editable = true,
dataSource = "api/Common/GetSelect/Ghre_Course" dataSource = "api/Common/GetSelect/Ghre_Course?FW=DOTNETCORE"
}); });
data.Column.Add(new FromGhre_QuestionColumn() data.Column.Add(new FromGhre_QuestionColumn()
{ {

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

@ -3782,6 +3782,16 @@
课程名称 课程名称
</summary> </summary>
</member> </member>
<member name="P:Tiobon.Core.Model.Models.Ghre_QuestionDto.DifficultyLevelLabel">
<summary>
难易程度
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_QuestionDto.QuestionTypeLabel">
<summary>
题目类型
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_QuestionAnswerDto"> <member name="T:Tiobon.Core.Model.Models.Ghre_QuestionAnswerDto">
<summary> <summary>
题目答案(Dto.View) 题目答案(Dto.View)

Write Preview
Loading…
Cancel
Save