|
@@ -67,22 +67,39 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
if (clientSummaryList != null)
|
|
|
{
|
|
|
//排查重复课例的数据。》》》》》》》》》》》》》》》》》》》》》
|
|
|
- record.lessonRecords.Add(
|
|
|
- new StudentLessonRecord
|
|
|
- {
|
|
|
- gscore = clientSummaryList.groupScore,
|
|
|
- pscore = clientSummaryList.score,
|
|
|
- tscore = clientSummaryList.tnteractScore,
|
|
|
- tmdid = teacher.id,
|
|
|
- school = school,
|
|
|
- scope = lessonRecord.scope,
|
|
|
- lessonId = lessonRecord.id,
|
|
|
- courseId = lessonRecord.courseId,
|
|
|
- periodId = lessonRecord.periodId,
|
|
|
- subjectId = lessonRecord.subjectId,
|
|
|
- time = lessonRecord.startTime
|
|
|
- }
|
|
|
- );
|
|
|
+ var hasrecord= record.lessonRecords.Find(x => x.lessonId.Equals(lessonRecord.id));
|
|
|
+ if (hasrecord != null)
|
|
|
+ {
|
|
|
+ hasrecord.gscore = clientSummaryList.groupScore;
|
|
|
+ hasrecord.pscore = clientSummaryList.score;
|
|
|
+ hasrecord.tscore = clientSummaryList.tnteractScore;
|
|
|
+ hasrecord.tmdid = teacher.id;
|
|
|
+ hasrecord.school = school;
|
|
|
+ hasrecord.scope = lessonRecord.scope;
|
|
|
+ hasrecord.lessonId = lessonRecord.id;
|
|
|
+ hasrecord.courseId = lessonRecord.courseId;
|
|
|
+ hasrecord.periodId = lessonRecord.periodId;
|
|
|
+ hasrecord.subjectId = lessonRecord.subjectId;
|
|
|
+ hasrecord.time = lessonRecord.startTime;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ record.lessonRecords.Add(
|
|
|
+ new StudentLessonRecord
|
|
|
+ {
|
|
|
+ gscore = clientSummaryList.groupScore,
|
|
|
+ pscore = clientSummaryList.score,
|
|
|
+ tscore = clientSummaryList.tnteractScore,
|
|
|
+ tmdid = teacher.id,
|
|
|
+ school = school,
|
|
|
+ scope = lessonRecord.scope,
|
|
|
+ lessonId = lessonRecord.id,
|
|
|
+ courseId = lessonRecord.courseId,
|
|
|
+ periodId = lessonRecord.periodId,
|
|
|
+ subjectId = lessonRecord.subjectId,
|
|
|
+ time = lessonRecord.startTime
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else
|
|
@@ -110,6 +127,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
courseId = lessonRecord.courseId,
|
|
|
periodId = lessonRecord.periodId,
|
|
|
subjectId = lessonRecord.subjectId,
|
|
|
+ time= lessonRecord.startTime
|
|
|
}}
|
|
|
};
|
|
|
|
|
@@ -127,20 +145,41 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
{
|
|
|
if (clientSummaryList != null)
|
|
|
{ //排查重复课例的数据。》》》》》》》》》》》》》》》》》》》》》
|
|
|
- record.lessonRecords.Add(
|
|
|
- new StudentLessonRecord
|
|
|
+
|
|
|
+ var hasrecord = record.lessonRecords.Find(x => x.lessonId.Equals(lessonRecord.id));
|
|
|
+ if (hasrecord != null)
|
|
|
{
|
|
|
- gscore = clientSummaryList.groupScore,
|
|
|
- pscore = clientSummaryList.score,
|
|
|
- tscore = clientSummaryList.tnteractScore,
|
|
|
- tmdid = teacher.id,
|
|
|
- school = school,
|
|
|
- scope = lessonRecord.scope,
|
|
|
- lessonId = lessonRecord.id,
|
|
|
- courseId = lessonRecord.courseId,
|
|
|
- periodId = lessonRecord.periodId,
|
|
|
- subjectId = lessonRecord.subjectId,
|
|
|
- });
|
|
|
+ hasrecord.gscore = clientSummaryList.groupScore;
|
|
|
+ hasrecord.pscore = clientSummaryList.score;
|
|
|
+ hasrecord.tscore = clientSummaryList.tnteractScore;
|
|
|
+ hasrecord.tmdid = teacher.id;
|
|
|
+ hasrecord.school = school;
|
|
|
+ hasrecord.scope = lessonRecord.scope;
|
|
|
+ hasrecord.lessonId = lessonRecord.id;
|
|
|
+ hasrecord.courseId = lessonRecord.courseId;
|
|
|
+ hasrecord.periodId = lessonRecord.periodId;
|
|
|
+ hasrecord.subjectId = lessonRecord.subjectId;
|
|
|
+ hasrecord.time = lessonRecord.startTime;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ record.lessonRecords.Add(
|
|
|
+ new StudentLessonRecord
|
|
|
+ {
|
|
|
+ gscore = clientSummaryList.groupScore,
|
|
|
+ pscore = clientSummaryList.score,
|
|
|
+ tscore = clientSummaryList.tnteractScore,
|
|
|
+ tmdid = teacher.id,
|
|
|
+ school = school,
|
|
|
+ scope = lessonRecord.scope,
|
|
|
+ lessonId = lessonRecord.id,
|
|
|
+ courseId = lessonRecord.courseId,
|
|
|
+ periodId = lessonRecord.periodId,
|
|
|
+ subjectId = lessonRecord.subjectId,
|
|
|
+ time = lessonRecord.startTime
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else
|
|
@@ -168,6 +207,7 @@ namespace TEAMModelOS.SDK.Models.Service
|
|
|
courseId = lessonRecord.courseId,
|
|
|
periodId = lessonRecord.periodId,
|
|
|
subjectId = lessonRecord.subjectId,
|
|
|
+ time=lessonRecord.startTime
|
|
|
}
|
|
|
}
|
|
|
};
|