|
@@ -105,7 +105,7 @@ namespace TEAMModelOS.SDK
|
|
|
//stujoin新加入名单的
|
|
|
foreach (Member member in groupChange.stujoin)
|
|
|
{
|
|
|
- ExamInfo info = await updateClassResulte(client, classResults, standerAnswers, member, groupChange);
|
|
|
+ ExamInfo info = await updateClassResulte(client, classResults, standerAnswers, member, groupChange,activity);
|
|
|
var stucourse = new StuActivity
|
|
|
{
|
|
|
id = activity.id,
|
|
@@ -134,7 +134,7 @@ namespace TEAMModelOS.SDK
|
|
|
//tmdjoin新加入的
|
|
|
foreach (Member member in groupChange.tmdjoin)
|
|
|
{
|
|
|
- ExamInfo info = await updateClassResulte(client, classResults, standerAnswers, member, groupChange);
|
|
|
+ ExamInfo info = await updateClassResulte(client, classResults, standerAnswers, member, groupChange,activity);
|
|
|
var stucourse = new StuActivity
|
|
|
{
|
|
|
id = activity.id,
|
|
@@ -189,7 +189,7 @@ namespace TEAMModelOS.SDK
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- await updateClassResulte(client, classResults, standerAnswers, member, groupChange);
|
|
|
+ await updateClassResulte(client, classResults, standerAnswers, member, groupChange,activity);
|
|
|
StuActivity stuActivity = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(activity.id, new PartitionKey($"Activity-{member.code.Replace("Base-", "")}-{member.id}"));
|
|
|
stuActivity.classIds.Remove(groupChange.listid);
|
|
|
if (stuActivity.classIds.IsNotEmpty())
|
|
@@ -212,7 +212,7 @@ namespace TEAMModelOS.SDK
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- await updateClassResulte(client, classResults, standerAnswers, member, groupChange);
|
|
|
+ await updateClassResulte(client, classResults, standerAnswers, member, groupChange,activity);
|
|
|
StuActivity stuActivity = await client.GetContainer(Constant.TEAMModelOS, "Student").ReadItemAsync<StuActivity>(activity.id, new PartitionKey($"Activity-{member.id}"));
|
|
|
stuActivity.classIds.Remove(groupChange.listid);
|
|
|
if (stuActivity.classIds.IsNotEmpty())
|
|
@@ -447,22 +447,14 @@ namespace TEAMModelOS.SDK
|
|
|
await Task.WhenAll(tasks);
|
|
|
}
|
|
|
}
|
|
|
- public static async Task<ExamInfo> updateClassResulte(CosmosClient client, List<ExamClassResult> classResults, List<PaperSimple> standerAnswers, Member member ,GroupChange change)
|
|
|
+ public static async Task<ExamInfo> updateClassResulte(CosmosClient client, List<ExamClassResult> classResults, List<PaperSimple> standerAnswers, Member member ,GroupChange change,MQActivity activity)
|
|
|
{
|
|
|
ExamInfo info = new();
|
|
|
try
|
|
|
{
|
|
|
if (classResults.Count > 0)
|
|
|
{
|
|
|
- if (classResults[0].scope.Equals("school"))
|
|
|
- {
|
|
|
- info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(classResults[0].examId, new PartitionKey($"Exam-{classResults[0].school}"));
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- string code = classResults[0].code.Replace("ExamClassResult-", "");
|
|
|
- info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(classResults[0].examId, new PartitionKey($"Exam-{code}"));
|
|
|
- }
|
|
|
+ info = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamInfo>(classResults[0].examId, new PartitionKey($"{activity.code}"));
|
|
|
foreach (var item in classResults)
|
|
|
{
|
|
|
if (item.info.id.Equals(change.listid))
|