Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
9874320c
Commit
9874320c
authored
Sep 08, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
53bdf870
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
15 deletions
+25
-15
RB_Examination_StudentDetails.cs
Edu.Model/Entity/Exam/RB_Examination_StudentDetails.cs
+1
-1
RB_Examination_Details_ViewModel.cs
Edu.Model/ViewModel/Exam/RB_Examination_Details_ViewModel.cs
+1
-1
RB_Question_Type_ViewModel.cs
Edu.Model/ViewModel/Question/RB_Question_Type_ViewModel.cs
+10
-0
PaperModule.cs
Edu.Module.Exam/PaperModule.cs
+5
-5
PaperModule2.cs
Edu.Module.Exam/PaperModule2.cs
+7
-7
ExamController.cs
Edu.WebApi/Controllers/Exam/ExamController.cs
+1
-1
No files found.
Edu.Model/Entity/Exam/RB_Examination_StudentDetails.cs
View file @
9874320c
...
@@ -58,7 +58,7 @@ namespace Edu.Model.Entity.Exam
...
@@ -58,7 +58,7 @@ namespace Edu.Model.Entity.Exam
/// <summary>
/// <summary>
/// 题目得分
/// 题目得分
/// </summary>
/// </summary>
public
decimal
Stu
nde
tScore
{
get
;
set
;
}
public
decimal
Stu
den
tScore
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 是否阅卷0-否,1-是
/// 是否阅卷0-否,1-是
...
...
Edu.Model/ViewModel/Exam/RB_Examination_Details_ViewModel.cs
View file @
9874320c
...
@@ -39,7 +39,7 @@ namespace Edu.Model.ViewModel.Exam
...
@@ -39,7 +39,7 @@ namespace Edu.Model.ViewModel.Exam
/// <summary>
/// <summary>
/// 学员得分
/// 学员得分
/// </summary>
/// </summary>
public
decimal
Stu
nde
tScore
{
get
;
set
;
}
public
decimal
Stu
den
tScore
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 学生答案详情id(关联RB_Examination_StudentDetails表中的Id)
/// 学生答案详情id(关联RB_Examination_StudentDetails表中的Id)
...
...
Edu.Model/ViewModel/Question/RB_Question_Type_ViewModel.cs
View file @
9874320c
...
@@ -62,6 +62,11 @@ namespace Edu.Model.ViewModel.Question
...
@@ -62,6 +62,11 @@ namespace Edu.Model.ViewModel.Question
/// </summary>
/// </summary>
public
decimal
SubScore
{
get
;
set
;
}
public
decimal
SubScore
{
get
;
set
;
}
/// <summary>
/// 学生得分
/// </summary>
public
decimal
StudentScore
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 选项列表
/// 选项列表
/// </summary>
/// </summary>
...
@@ -125,6 +130,11 @@ namespace Edu.Model.ViewModel.Question
...
@@ -125,6 +130,11 @@ namespace Edu.Model.ViewModel.Question
/// </summary>
/// </summary>
public
decimal
SubScore
{
get
;
set
;
}
public
decimal
SubScore
{
get
;
set
;
}
/// <summary>
/// 学生得分
/// </summary>
public
decimal
StudentScore
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 题目答案内容
/// 题目答案内容
/// </summary>
/// </summary>
...
...
Edu.Module.Exam/PaperModule.cs
View file @
9874320c
...
@@ -1316,7 +1316,7 @@ namespace Edu.Module.Exam
...
@@ -1316,7 +1316,7 @@ namespace Edu.Module.Exam
sItem
.
StundetAnswer
,
sItem
.
StundetAnswer
,
AnswerList
=
isShowAnswer
?
answerList
:
new
List
<
object
>(),
AnswerList
=
isShowAnswer
?
answerList
:
new
List
<
object
>(),
questionModel
.
AnswerParse
,
questionModel
.
AnswerParse
,
sItem
.
Stu
nde
tScore
,
sItem
.
Stu
den
tScore
,
sItem
.
IsMarking
sItem
.
IsMarking
};
};
questionList
.
Add
(
qObj
);
questionList
.
Add
(
qObj
);
...
@@ -1441,7 +1441,7 @@ namespace Edu.Module.Exam
...
@@ -1441,7 +1441,7 @@ namespace Edu.Module.Exam
CreateTime
=
DateTime
.
Now
,
CreateTime
=
DateTime
.
Now
,
Status
=
DateStateEnum
.
Normal
,
Status
=
DateStateEnum
.
Normal
,
StundetAnswer
=
newAnswer
,
StundetAnswer
=
newAnswer
,
Stu
nde
tScore
=
0
,
Stu
den
tScore
=
0
,
IsMarking
=
0
,
IsMarking
=
0
,
StudentContent
=
item
.
QuestionContent
,
StudentContent
=
item
.
QuestionContent
,
StuPaperGroupId
=
item
.
StuPaperGroupId
,
StuPaperGroupId
=
item
.
StuPaperGroupId
,
...
@@ -1509,17 +1509,17 @@ namespace Edu.Module.Exam
...
@@ -1509,17 +1509,17 @@ namespace Edu.Module.Exam
decimal
totalScore
=
0
;
decimal
totalScore
=
0
;
foreach
(
var
item
in
list
)
foreach
(
var
item
in
list
)
{
{
totalScore
+=
item
.
Stu
nde
tScore
;
totalScore
+=
item
.
Stu
den
tScore
;
RB_Examination_StudentDetails_ViewModel
model
=
new
RB_Examination_StudentDetails_ViewModel
()
RB_Examination_StudentDetails_ViewModel
model
=
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
item
.
StundetDetailsId
,
Id
=
item
.
StundetDetailsId
,
Stu
ndetScore
=
item
.
Stunde
tScore
,
Stu
dentScore
=
item
.
Studen
tScore
,
};
};
if
(
model
.
Id
>
0
)
if
(
model
.
Id
>
0
)
{
{
Dictionary
<
string
,
object
>
stuFileds
=
new
Dictionary
<
string
,
object
>()
Dictionary
<
string
,
object
>
stuFileds
=
new
Dictionary
<
string
,
object
>()
{
{
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Stu
ndetScore
),
model
.
Stunde
tScore
},
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Stu
dentScore
),
model
.
Studen
tScore
},
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
IsMarking
),
1
},
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
IsMarking
),
1
},
};
};
flag
=
examination_StudentDetailsRepository
.
Update
(
stuFileds
,
new
WhereHelper
(
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Id
),
model
.
Id
));
flag
=
examination_StudentDetailsRepository
.
Update
(
stuFileds
,
new
WhereHelper
(
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Id
),
model
.
Id
));
...
...
Edu.Module.Exam/PaperModule2.cs
View file @
9874320c
...
@@ -48,7 +48,7 @@ namespace Edu.Module.Exam
...
@@ -48,7 +48,7 @@ namespace Edu.Module.Exam
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
answerModel
.
Id
,
Id
=
answerModel
.
Id
,
Stu
nde
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
Stu
den
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
});
});
break
;
break
;
//多选题
//多选题
...
@@ -57,7 +57,7 @@ namespace Edu.Module.Exam
...
@@ -57,7 +57,7 @@ namespace Edu.Module.Exam
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
answerModel
.
Id
,
Id
=
answerModel
.
Id
,
Stu
nde
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
Stu
den
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
});
});
break
;
break
;
//填空题
//填空题
...
@@ -69,7 +69,7 @@ namespace Edu.Module.Exam
...
@@ -69,7 +69,7 @@ namespace Edu.Module.Exam
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
answerModel
.
Id
,
Id
=
answerModel
.
Id
,
Stu
nde
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
Stu
den
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
});
});
break
;
break
;
//简答题
//简答题
...
@@ -101,7 +101,7 @@ namespace Edu.Module.Exam
...
@@ -101,7 +101,7 @@ namespace Edu.Module.Exam
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
answerModel
.
Id
,
Id
=
answerModel
.
Id
,
Stu
nde
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
Stu
den
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
});
});
break
;
break
;
//排序题
//排序题
...
@@ -109,7 +109,7 @@ namespace Edu.Module.Exam
...
@@ -109,7 +109,7 @@ namespace Edu.Module.Exam
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
answerModel
.
Id
,
Id
=
answerModel
.
Id
,
Stu
nde
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
Stu
den
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
});
});
break
;
break
;
//完型填空
//完型填空
...
@@ -141,7 +141,7 @@ namespace Edu.Module.Exam
...
@@ -141,7 +141,7 @@ namespace Edu.Module.Exam
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
answerList
.
Add
(
new
RB_Examination_StudentDetails_ViewModel
()
{
{
Id
=
answerModel
.
Id
,
Id
=
answerModel
.
Id
,
Stu
nde
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
Stu
den
tScore
=
(
sItem
.
Answer
==
answerModel
.
StundetAnswer
)
?
sItem
.
Score
:
0
});
});
break
;
break
;
}
}
...
@@ -154,7 +154,7 @@ namespace Edu.Module.Exam
...
@@ -154,7 +154,7 @@ namespace Edu.Module.Exam
{
{
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Stu
ndetScore
),
item
.
Stunde
tScore
},
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Stu
dentScore
),
item
.
Studen
tScore
},
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
IsMarking
),
1
},
{
nameof
(
RB_Examination_StudentDetails_ViewModel
.
IsMarking
),
1
},
};
};
examination_StudentDetailsRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Id
),
item
.
Id
));
examination_StudentDetailsRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Examination_StudentDetails_ViewModel
.
Id
),
item
.
Id
));
...
...
Edu.WebApi/Controllers/Exam/ExamController.cs
View file @
9874320c
...
@@ -857,7 +857,7 @@ namespace Edu.WebApi.Controllers.Exam
...
@@ -857,7 +857,7 @@ namespace Edu.WebApi.Controllers.Exam
{
{
Id
=
sObj
.
GetInt
(
"PaperDetailsId"
),
Id
=
sObj
.
GetInt
(
"PaperDetailsId"
),
StundetDetailsId
=
sObj
.
GetInt
(
"StundetDetailsId"
),
StundetDetailsId
=
sObj
.
GetInt
(
"StundetDetailsId"
),
Stu
ndetScore
=
sObj
.
GetDecimal
(
"StundetScore"
),
Stu
dentScore
=
sObj
.
GetDecimal
(
"StundetScore"
),
};
};
paperDetailsList
.
Add
(
detailModel
);
paperDetailsList
.
Add
(
detailModel
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment