|
@@ -418,7 +418,7 @@ namespace TEAMModelOS.FunctionV4
|
|
|
fno++;
|
|
|
}
|
|
|
//判断均分是否发生变化,便于实时的更新评测基本信息
|
|
|
- if (info.sRate != settlement.rate || info.average != settlement.score || info.sStatus != newStatus)
|
|
|
+ if (info.sRate != settlement.rate || info.average != settlement.score || info.sStatus != newStatus || info.qRate != settlement.qrate)
|
|
|
{
|
|
|
info.sRate = settlement.rate;
|
|
|
info.average = settlement.score;
|
|
@@ -474,7 +474,8 @@ namespace TEAMModelOS.FunctionV4
|
|
|
int index = 0;
|
|
|
if (classResult.status.Count > 0)
|
|
|
{
|
|
|
- foreach (var sta in classResult.status) {
|
|
|
+ foreach (var sta in classResult.status)
|
|
|
+ {
|
|
|
if (sta == 1)
|
|
|
{
|
|
|
for (int i = 0; i < classResult.studentScores[index].Count; i++)
|
|
@@ -485,27 +486,28 @@ namespace TEAMModelOS.FunctionV4
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- else if (sta == 0) {
|
|
|
- foreach (var ans in classResult.studentAnswers)
|
|
|
+ else if (sta == 0)
|
|
|
+ {
|
|
|
+ var ans = classResult.studentScores[index];
|
|
|
+ //该学生缺考,历史数据的判定
|
|
|
+ if (ans.Count == 0)
|
|
|
{
|
|
|
- //该学生缺考,历史数据的判定
|
|
|
- if (ans.Count == 0)
|
|
|
+ for (int i = 0; i < classResult.studentScores[index].Count; i++)
|
|
|
{
|
|
|
- for (int i = 0; i < classResult.studentScores[index].Count; i++)
|
|
|
+ if (classResult.studentScores[index][i] == -1)
|
|
|
{
|
|
|
- if (classResult.studentScores[index][i] == -1)
|
|
|
- {
|
|
|
- classResult.studentScores[index][i] = 0;
|
|
|
- }
|
|
|
+ classResult.studentScores[index][i] = 0;
|
|
|
}
|
|
|
- classResult.status[index] = 1;
|
|
|
}
|
|
|
+ classResult.status[index] = 1;
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
index++;
|
|
|
}
|
|
|
}
|
|
|
- else {
|
|
|
+ else
|
|
|
+ {
|
|
|
foreach (var ans in classResult.studentAnswers)
|
|
|
{
|
|
|
//该学生缺考,历史数据的判定
|
|
@@ -522,7 +524,7 @@ namespace TEAMModelOS.FunctionV4
|
|
|
}
|
|
|
index++;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
foreach (List<double> sc in classResult.studentScores)
|
|
|
{
|
|
|
List<double> newSc = new List<double>();
|
|
@@ -589,15 +591,18 @@ namespace TEAMModelOS.FunctionV4
|
|
|
foreach (string id in examResults[0].studentIds)
|
|
|
{
|
|
|
//计算整体缺考人数
|
|
|
- foreach (var ec in examClassResults) {
|
|
|
+ foreach (var ec in examClassResults)
|
|
|
+ {
|
|
|
int index = ec.studentIds.IndexOf(id);
|
|
|
- if (index > -1) {
|
|
|
- if (ec.status[index] == 1) {
|
|
|
+ if (index > -1)
|
|
|
+ {
|
|
|
+ if (ec.status[index] == 1)
|
|
|
+ {
|
|
|
qk++;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
double sc = 0;
|
|
|
foreach (ExamResult result in examResults)
|
|
|
{
|
|
@@ -640,8 +645,8 @@ namespace TEAMModelOS.FunctionV4
|
|
|
List<string> plId = new List<string>();
|
|
|
List<List<List<string>>> opth = new List<List<List<string>>>();
|
|
|
List<List<List<string>>> optl = new List<List<List<string>>>();
|
|
|
- List<double> akp = await knowledgeCount(info, subject, _dingDing, no, classResults, rhwCount, rhw, rhlCount, rhl, _azureCosmos);
|
|
|
- List<double> afp = await fieldCount(info, subject, _dingDing, no, classResults, rhwCount, rhw, rhlCount, rhl, _azureCosmos);
|
|
|
+ List<double> akp = await knowledgeCount(info, subject, _dingDing, no, classResults, rhwCount, rhw, rhlCount, rhl, _azureCosmos);
|
|
|
+ List<double> afp = await fieldCount(info, subject, _dingDing, no, classResults, rhwCount, rhw, rhlCount, rhl, _azureCosmos);
|
|
|
int PHCount = 0;
|
|
|
int PLCount = 0;
|
|
|
foreach (ExamClassResult classResult in classResults)
|
|
@@ -930,7 +935,7 @@ namespace TEAMModelOS.FunctionV4
|
|
|
{
|
|
|
if (classResult.studentScores[index].Count > 0)
|
|
|
{
|
|
|
- score += classResult.studentScores[index][n] == -1 ? 0 : classResult.studentScores[index][n]* itemPersent;
|
|
|
+ score += classResult.studentScores[index][n] == -1 ? 0 : classResult.studentScores[index][n] * itemPersent;
|
|
|
if (classResult.studentScores[index].Sum() >= rhw && phcount < rhwCount)
|
|
|
{
|
|
|
if (classResult.studentScores[index][n] <= 0)
|
|
@@ -1114,7 +1119,7 @@ namespace TEAMModelOS.FunctionV4
|
|
|
{
|
|
|
double score = 0;
|
|
|
double allScore = 0;
|
|
|
-
|
|
|
+
|
|
|
int count = 0;
|
|
|
foreach (ExamClassResult result in classResults)
|
|
|
{
|