|
@@ -342,13 +342,14 @@ namespace TEAMModelOS.Controllers
|
|
}
|
|
}
|
|
dimensionScore.pscore = pdata_score;
|
|
dimensionScore.pscore = pdata_score;
|
|
|
|
|
|
- //态度
|
|
|
|
|
|
+ //态度=》学习态度
|
|
double attitude = 0.1;
|
|
double attitude = 0.1;
|
|
- //合作
|
|
|
|
|
|
+ //合作=》合作能力
|
|
double cooperate = 0.1;
|
|
double cooperate = 0.1;
|
|
- //能力
|
|
|
|
|
|
+ //能力=》 //协作能力 //评价能力
|
|
|
|
+
|
|
double ability = 0.1;
|
|
double ability = 0.1;
|
|
- //水平
|
|
|
|
|
|
+ //水平=》学习成效
|
|
double standard = 0.7;
|
|
double standard = 0.7;
|
|
var attitudeWeight = schoolSetting.overallEducationSetting.intelligenceWeight.Find(x => x.code.Equals("attitude"));
|
|
var attitudeWeight = schoolSetting.overallEducationSetting.intelligenceWeight.Find(x => x.code.Equals("attitude"));
|
|
attitude = attitudeWeight != null ? attitudeWeight.value : attitude;
|
|
attitude = attitudeWeight != null ? attitudeWeight.value : attitude;
|
|
@@ -496,6 +497,7 @@ namespace TEAMModelOS.Controllers
|
|
classDimensionScore.tscore = Math.Round(classData.list.Average(x => x.tscore),2);
|
|
classDimensionScore.tscore = Math.Round(classData.list.Average(x => x.tscore),2);
|
|
classDimensionScore.gscore = Math.Round(classData.list.Average(x => x.gscore),2);
|
|
classDimensionScore.gscore = Math.Round(classData.list.Average(x => x.gscore),2);
|
|
classDimensionScore.exam = Math.Round(classData.list.Average(x => x.exam), 2);
|
|
classDimensionScore.exam = Math.Round(classData.list.Average(x => x.exam), 2);
|
|
|
|
+
|
|
double intelligenceScore = Math.Round(classData.list.Average(x => x.intelligence), 2);
|
|
double intelligenceScore = Math.Round(classData.list.Average(x => x.intelligence), 2);
|
|
schoolSetting.overallEducationSetting.reviewLevel.ForEach(z => {
|
|
schoolSetting.overallEducationSetting.reviewLevel.ForEach(z => {
|
|
if (z.value[0] <= intelligenceScore && z.value[1] > intelligenceScore)
|
|
if (z.value[0] <= intelligenceScore && z.value[1] > intelligenceScore)
|
|
@@ -703,13 +705,18 @@ namespace TEAMModelOS.Controllers
|
|
subject_painting=0,
|
|
subject_painting=0,
|
|
tscore=60,
|
|
tscore=60,
|
|
virtue=60,
|
|
virtue=60,
|
|
|
|
+ crate=60,
|
|
|
|
+ xrate=60,
|
|
|
|
+ grate=60,
|
|
|
|
+ prate=60,
|
|
|
|
+ trate=60,
|
|
};
|
|
};
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
studentDimension.stuExamScores= stuExamScores;
|
|
studentDimension.stuExamScores= stuExamScores;
|
|
}
|
|
}
|
|
var classDimension = classDimensions.Find(z => z.classId.Equals(student.classId));
|
|
var classDimension = classDimensions.Find(z => z.classId.Equals(student.classId));
|
|
- studentStatistics= new { studentDimension, inClass = classDimension, inGrade = new { grade_gscore_avg, grade_pscore_avg, grade_tscore_avg } };
|
|
|
|
|
|
+ studentStatistics= new { studentDimension, inClass = classDimension, inGrade = new { grade_gscore_avg, grade_pscore_avg, grade_tscore_avg , grade_xrate_avg =0, grade_crate_avg = 0 , grade_grate_avg= grade_gscore_avg, grade_prate_avg= grade_pscore_avg, grade_trate_avg = grade_tscore_avg, } };
|
|
studentOverallEducation = overallEducations.FindAll(x => x.studentId.Equals($"{_studentId}")).FirstOrDefault();
|
|
studentOverallEducation = overallEducations.FindAll(x => x.studentId.Equals($"{_studentId}")).FirstOrDefault();
|
|
if (studentOverallEducation==null)
|
|
if (studentOverallEducation==null)
|
|
{
|
|
{
|
|
@@ -737,9 +744,22 @@ namespace TEAMModelOS.Controllers
|
|
grade_pscore_avg,
|
|
grade_pscore_avg,
|
|
grade_tscore_avg,
|
|
grade_tscore_avg,
|
|
grade_gscore_avg,
|
|
grade_gscore_avg,
|
|
|
|
+
|
|
|
|
+ grade_prate_avg= grade_pscore_avg,
|
|
|
|
+ grade_trate_avg= grade_tscore_avg,
|
|
|
|
+ grade_grate_avg= grade_gscore_avg,
|
|
|
|
+ grade_xrate_avg = 60,
|
|
|
|
+ grade_crate_avg = 60,
|
|
|
|
+
|
|
pscore_avg,
|
|
pscore_avg,
|
|
tscore_avg,
|
|
tscore_avg,
|
|
gscore_avg,
|
|
gscore_avg,
|
|
|
|
+
|
|
|
|
+ prate_avg = pscore_avg,
|
|
|
|
+ trate_avg = tscore_avg,
|
|
|
|
+ grate_avg = gscore_avg,
|
|
|
|
+ xrate_avg =60,
|
|
|
|
+ crate_avg=60,
|
|
classDimensions,
|
|
classDimensions,
|
|
dimensions=dimensions.OrderByDescending(x => x.score),
|
|
dimensions=dimensions.OrderByDescending(x => x.score),
|
|
data_count,
|
|
data_count,
|
|
@@ -760,7 +780,8 @@ namespace TEAMModelOS.Controllers
|
|
subject_painting_rate60,
|
|
subject_painting_rate60,
|
|
studentCount = students.Count(),
|
|
studentCount = students.Count(),
|
|
studentOverallEducation,
|
|
studentOverallEducation,
|
|
- studentStatistics
|
|
|
|
|
|
+ studentStatistics,
|
|
|
|
+
|
|
});
|
|
});
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
catch (Exception ex)
|
|
@@ -798,6 +819,11 @@ namespace TEAMModelOS.Controllers
|
|
public double gscore { get; set; }
|
|
public double gscore { get; set; }
|
|
public double pscore { get; set; }
|
|
public double pscore { get; set; }
|
|
public double tscore { get; set; }
|
|
public double tscore { get; set; }
|
|
|
|
+ public double xrate { get; set; } = 60;
|
|
|
|
+ public double crate { get; set; } = 60;
|
|
|
|
+ public double grate { get; set; } = 60;
|
|
|
|
+ public double prate { get; set; } = 60;
|
|
|
|
+ public double trate { get; set; } = 60;
|
|
|
|
|
|
}
|
|
}
|
|
public class ExamDimensionScore
|
|
public class ExamDimensionScore
|
|
@@ -816,6 +842,13 @@ namespace TEAMModelOS.Controllers
|
|
public double gscore { get; set; }
|
|
public double gscore { get; set; }
|
|
public double pscore { get; set; }
|
|
public double pscore { get; set; }
|
|
public double tscore { get; set; }
|
|
public double tscore { get; set; }
|
|
|
|
+
|
|
|
|
+ public double grate { get; set; } = 60;
|
|
|
|
+ public double prate { get; set; } = 60;
|
|
|
|
+ public double trate { get; set; } = 60;
|
|
|
|
+ public double crate { get; set; } = 60;
|
|
|
|
+ public double xrate { get; set; } = 60;
|
|
|
|
+
|
|
public double exam { get; set; }
|
|
public double exam { get; set; }
|
|
public string intelligenceLevel { get; set; }
|
|
public string intelligenceLevel { get; set; }
|
|
|
|
|
|
@@ -845,6 +878,12 @@ namespace TEAMModelOS.Controllers
|
|
public double gscore { get; set; }
|
|
public double gscore { get; set; }
|
|
public double pscore { get; set; }
|
|
public double pscore { get; set; }
|
|
public double tscore { get; set; }
|
|
public double tscore { get; set; }
|
|
|
|
+
|
|
|
|
+ public double grate { get; set; } = 60;
|
|
|
|
+ public double prate { get; set; } = 60;
|
|
|
|
+ public double trate { get; set; } = 60;
|
|
|
|
+ public double crate { get; set; } = 60;
|
|
|
|
+ public double xrate { get; set; } = 60;
|
|
public int classRanking { get; set; }
|
|
public int classRanking { get; set; }
|
|
public int gradeRanking { get; set; }
|
|
public int gradeRanking { get; set; }
|
|
public string level { get; set; }
|
|
public string level { get; set; }
|