|
|
@@ -216,41 +216,50 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
|
|
|
|
|
|
}*/
|
|
|
- string pkey = string.Format("{0}{1}{2}", art.code, "-", "pending");
|
|
|
- await table.DeleteSingle<ChangeRecord>(pkey, tdata.id);
|
|
|
- var messageVoteEnd = new ServiceBusMessage(new { tdata.id, progress = "finish", tdata.code }.ToJsonString());
|
|
|
- messageVoteEnd.ApplicationProperties.Add("name", "Art");
|
|
|
- if (voteRecords.Count > 0)
|
|
|
+ try
|
|
|
{
|
|
|
- long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageVoteEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.endTime));
|
|
|
- try
|
|
|
+ var messageVoteEnd = new ServiceBusMessage(new { tdata.id, progress = "finish", tdata.code }.ToJsonString());
|
|
|
+ messageVoteEnd.ApplicationProperties.Add("name", "Art");
|
|
|
+ if (voteRecords.Count > 0)
|
|
|
{
|
|
|
- await _serviceBus.GetServiceBusClient().CancelMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), voteRecords[0].sequenceNumber);
|
|
|
+ long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageVoteEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.endTime));
|
|
|
+ try
|
|
|
+ {
|
|
|
+ await _serviceBus.GetServiceBusClient().CancelMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), voteRecords[0].sequenceNumber);
|
|
|
+ }
|
|
|
+ catch (Exception)
|
|
|
+ {
|
|
|
+ }
|
|
|
+ voteRecords[0].sequenceNumber = end;
|
|
|
+ await table.SaveOrUpdate<ChangeRecord>(voteRecords[0]);
|
|
|
}
|
|
|
- catch (Exception)
|
|
|
+ else
|
|
|
{
|
|
|
+ long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageVoteEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.endTime));
|
|
|
+ ChangeRecord changeRecord = new()
|
|
|
+ {
|
|
|
+ RowKey = tdata.id,
|
|
|
+ PartitionKey = PartitionKey,
|
|
|
+ sequenceNumber = end,
|
|
|
+ msgId = messageVoteEnd.MessageId
|
|
|
+ };
|
|
|
+ await table.Save<ChangeRecord>(changeRecord);
|
|
|
}
|
|
|
- voteRecords[0].sequenceNumber = end;
|
|
|
- await table.SaveOrUpdate<ChangeRecord>(voteRecords[0]);
|
|
|
+
|
|
|
}
|
|
|
- else
|
|
|
+ catch (Exception e)
|
|
|
{
|
|
|
- long end = await _serviceBus.GetServiceBusClient().SendScheduleMessageAsync(Environment.GetEnvironmentVariable("Azure:ServiceBus:ActiveTask"), messageVoteEnd, DateTimeOffset.FromUnixTimeMilliseconds(tdata.endTime));
|
|
|
- ChangeRecord changeRecord = new()
|
|
|
- {
|
|
|
- RowKey = tdata.id,
|
|
|
- PartitionKey = PartitionKey,
|
|
|
- sequenceNumber = end,
|
|
|
- msgId = messageVoteEnd.MessageId
|
|
|
- };
|
|
|
- await table.Save<ChangeRecord>(changeRecord);
|
|
|
+ await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-艺术评测going{e.Message}\n{e.StackTrace}", GroupNames.醍摩豆服務運維群組);
|
|
|
}
|
|
|
-
|
|
|
+ /* finally {
|
|
|
+ string pkey = string.Format("{0}{1}{2}", art.code, "-", "pending");
|
|
|
+ await table.DeleteSingle<ChangeRecord>(pkey, tdata.id);
|
|
|
+ }*/
|
|
|
+
|
|
|
|
|
|
break;
|
|
|
case "finish":
|
|
|
- string pk = string.Format("{0}{1}{2}", art.code, "-", "going");
|
|
|
- await table.DeleteSingle<ChangeRecord>(pk, tdata.id);
|
|
|
+
|
|
|
//判定是否是区级创建的活动内容
|
|
|
/* if (art.lost.Count == 0 && art.pass == 0)
|
|
|
{
|
|
|
@@ -343,139 +352,166 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
}
|
|
|
}*/
|
|
|
//根据学校编码去获取区级ID
|
|
|
- School scInfo = new();
|
|
|
- //School scInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{art.school}", partitionKey: new Azure.Cosmos.PartitionKey("Base"));
|
|
|
- var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{art.school}", partitionKey: new Azure.Cosmos.PartitionKey("Base"));
|
|
|
- if (response.Status == 200)
|
|
|
- {
|
|
|
- using var cJson = await JsonDocument.ParseAsync(response.ContentStream);
|
|
|
- scInfo = cJson.ToObject<School>();
|
|
|
- }
|
|
|
- ArtSetting setting = new();
|
|
|
- try
|
|
|
- {
|
|
|
- var artResponse = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{scInfo.areaId}", partitionKey: new Azure.Cosmos.PartitionKey("ArtSetting"));
|
|
|
+ try {
|
|
|
+ School scInfo = new();
|
|
|
+ //School scInfo = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{art.school}", partitionKey: new Azure.Cosmos.PartitionKey("Base"));
|
|
|
+ var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync($"{art.school}", partitionKey: new Azure.Cosmos.PartitionKey("Base"));
|
|
|
if (response.Status == 200)
|
|
|
{
|
|
|
- using var json = await JsonDocument.ParseAsync(artResponse.ContentStream);
|
|
|
- setting = json.ToObject<ArtSetting>();
|
|
|
+ using var cJson = await JsonDocument.ParseAsync(response.ContentStream);
|
|
|
+ scInfo = cJson.ToObject<School>();
|
|
|
}
|
|
|
- }
|
|
|
- catch (Exception e)
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
- if (art.classes.Any())
|
|
|
- {
|
|
|
- //获取该艺术评测的评测Id
|
|
|
- List<(string id, string subjectId)> ids = new();
|
|
|
- List<ExamClassResult> examClassResults = new();
|
|
|
- var examId = art.settings.SelectMany(x => x.task).Where(c => c.type == 1).Select(z => new { z.acId, z.subject }).ToList();
|
|
|
- examId.ForEach(x =>
|
|
|
- {
|
|
|
- ids.Add((x.acId, x.subject));
|
|
|
- });
|
|
|
- List<string> results = new();
|
|
|
- results = ids.Select(x => x.id).ToList();
|
|
|
- await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"select value(c) from c where c.examId in ({string.Join(",", results.Select(x => $"'{x}'"))})", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{art.school}") }))
|
|
|
+ ArtSetting setting = new();
|
|
|
+ try
|
|
|
{
|
|
|
- using var json = await JsonDocument.ParseAsync(item.ContentStream);
|
|
|
- if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
|
|
|
+ var artResponse = await client.GetContainer(Constant.TEAMModelOS, "Normal").ReadItemStreamAsync($"{scInfo.areaId}", partitionKey: new Azure.Cosmos.PartitionKey("ArtSetting"));
|
|
|
+ if (response.Status == 200)
|
|
|
{
|
|
|
- foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
|
|
|
- {
|
|
|
- examClassResults.Add(obj.ToObject<ExamClassResult>());
|
|
|
- }
|
|
|
+ using var json = await JsonDocument.ParseAsync(artResponse.ContentStream);
|
|
|
+ setting = json.ToObject<ArtSetting>();
|
|
|
}
|
|
|
}
|
|
|
- //获取该艺术评测下面的评测活动
|
|
|
- List<ExamInfo> exams = new();
|
|
|
- await foreach (var item in client.GetContainer(Constant.TEAMModelOS, Constant.Common).GetItemQueryIterator<ExamInfo>(queryText: $"select value(c) from c where c.pk = 'Exam' and c.id in ({string.Join(",", results.Select(o => $"'{o}'"))})"))
|
|
|
+ catch (Exception e)
|
|
|
{
|
|
|
- exams.Add(item);
|
|
|
- }
|
|
|
- var sta = examClassResults.SelectMany(x => x.status).ToList();
|
|
|
- var ansCount = sta.Where(x => x == 0).ToList();
|
|
|
- var persent = ansCount.Count * 1.0 / sta.Count * 100;
|
|
|
- var period = scInfo.period.Where(x => x.id.Equals(art.period.id))?.FirstOrDefault();
|
|
|
-
|
|
|
- List<StudentArtResult> studentArtResults = new();
|
|
|
- string sql = $"SELECT value c FROM c where c.pk='ArtResult' ";
|
|
|
- await foreach (var item in client.GetContainer(Constant.TEAMModelOS, Constant.Student)
|
|
|
- .GetItemQueryIterator<StudentArtResult>(queryText: sql, requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey($"ArtResult-{art.id}") }))
|
|
|
- {
|
|
|
- studentArtResults.Add(item);
|
|
|
- }
|
|
|
- List<Task<ItemResponse<StudentArtResult>>> tasks = new List<Task<ItemResponse<StudentArtResult>>>();
|
|
|
- //新增数据推送 obj => Portrait
|
|
|
- Portrait portrait = new()
|
|
|
- {
|
|
|
- schoolCode = art.school,
|
|
|
- periodId = art.period?.id,
|
|
|
- subjectId = "subject_art"
|
|
|
- };
|
|
|
- //var period = scInfo.period.Where(x => x.id.Equals(art.period.id)).FirstOrDefault();
|
|
|
- List<(string ptype, string subId, List<(string name, List<string> kno)> knos)> knoledge = new();
|
|
|
- //List<string> subs = new List<string> { "subject_painting", "subject_music" };
|
|
|
- if (exams.Count == 0) return;
|
|
|
- foreach (var ss in art.subjects)
|
|
|
- {
|
|
|
- if (string.IsNullOrEmpty(exams[0].papers[0].periodId)) {
|
|
|
-
|
|
|
- knoledge.Add(await getKnowledge("university", "hbcn", client, ss.id, "be32942d-97a9-52ba-45d6-2e5b722583f5"));
|
|
|
- } else {
|
|
|
- knoledge.Add(await getKnowledge(art.periodType, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].code, client, ss.id, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].periodId));
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
|
|
|
- List<(string name, double score, double aver, string subject)> blockScore = new();
|
|
|
- List<(List<(string name, double score, double point, string subject)> studentScore, string stuId)> studentScores = new();
|
|
|
- foreach (var exam in exams)
|
|
|
+ }
|
|
|
+ if (art.classes.Any())
|
|
|
{
|
|
|
- HashSet<string> knowledge = new HashSet<string>();
|
|
|
- List<double> point = new List<double>();
|
|
|
- List<List<double>> result = new List<List<double>>();
|
|
|
- List<ClassRange> classes = new List<ClassRange>();
|
|
|
- //求单个知识点所占分数
|
|
|
- List<string> per = new List<string>();
|
|
|
-
|
|
|
- if (exam.papers[0].knowledge != null && exam.papers[0].knowledge.Count > 0)
|
|
|
+ //获取该艺术评测的评测Id
|
|
|
+ List<(string id, string subjectId)> ids = new();
|
|
|
+ List<ExamClassResult> examClassResults = new();
|
|
|
+ var examId = art.settings.SelectMany(x => x.task).Where(c => c.type == 1).Select(z => new { z.acId, z.subject }).ToList();
|
|
|
+ examId.ForEach(x =>
|
|
|
+ {
|
|
|
+ ids.Add((x.acId, x.subject));
|
|
|
+ });
|
|
|
+ List<string> results = new();
|
|
|
+ results = ids.Select(x => x.id).ToList();
|
|
|
+ await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryStreamIterator(queryText: $"select value(c) from c where c.examId in ({string.Join(",", results.Select(x => $"'{x}'"))})", requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"ExamClassResult-{art.school}") }))
|
|
|
{
|
|
|
- exam.papers[0].knowledge.ForEach(k =>
|
|
|
+ using var json = await JsonDocument.ParseAsync(item.ContentStream);
|
|
|
+ if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
|
|
|
{
|
|
|
- k.ForEach(e =>
|
|
|
+ foreach (var obj in json.RootElement.GetProperty("Documents").EnumerateArray())
|
|
|
{
|
|
|
- knowledge.Add(e);
|
|
|
- });
|
|
|
- });
|
|
|
+ examClassResults.Add(obj.ToObject<ExamClassResult>());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- point = exam.papers[0].point;
|
|
|
-
|
|
|
- List<string> knowledgeName = new List<string>();
|
|
|
- foreach (string cla in knowledge)
|
|
|
+ //获取该艺术评测下面的评测活动
|
|
|
+ List<ExamInfo> exams = new();
|
|
|
+ await foreach (var item in client.GetContainer(Constant.TEAMModelOS, Constant.Common).GetItemQueryIterator<ExamInfo>(queryText: $"select value(c) from c where c.pk = 'Exam' and c.id in ({string.Join(",", results.Select(o => $"'{o}'"))})"))
|
|
|
+ {
|
|
|
+ exams.Add(item);
|
|
|
+ }
|
|
|
+ var sta = examClassResults.SelectMany(x => x.status).ToList();
|
|
|
+ var ansCount = sta.Where(x => x == 0).ToList();
|
|
|
+ var persent = ansCount.Count * 1.0 / sta.Count * 100;
|
|
|
+ var period = scInfo.period.Where(x => x.id.Equals(art.period.id))?.FirstOrDefault();
|
|
|
+
|
|
|
+ List<StudentArtResult> studentArtResults = new();
|
|
|
+ string sql = $"SELECT value c FROM c where c.pk='ArtResult' ";
|
|
|
+ await foreach (var item in client.GetContainer(Constant.TEAMModelOS, Constant.Student)
|
|
|
+ .GetItemQueryIterator<StudentArtResult>(queryText: sql, requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey($"ArtResult-{art.id}") }))
|
|
|
{
|
|
|
- knowledgeName.Add(cla);
|
|
|
+ studentArtResults.Add(item);
|
|
|
}
|
|
|
- for (int k = 0; k < knowledgeName.Count; k++)
|
|
|
+ List<Task<ItemResponse<StudentArtResult>>> tasks = new List<Task<ItemResponse<StudentArtResult>>>();
|
|
|
+ //新增数据推送 obj => Portrait
|
|
|
+ Portrait portrait = new()
|
|
|
+ {
|
|
|
+ schoolCode = art.school,
|
|
|
+ periodId = art.period?.id,
|
|
|
+ subjectId = "subject_art"
|
|
|
+ };
|
|
|
+ //var period = scInfo.period.Where(x => x.id.Equals(art.period.id)).FirstOrDefault();
|
|
|
+ List<(string ptype, string subId, List<(string name, List<string> kno)> knos)> knoledge = new();
|
|
|
+ //List<string> subs = new List<string> { "subject_painting", "subject_music" };
|
|
|
+ if (exams.Count == 0) return;
|
|
|
+ foreach (var ss in art.subjects)
|
|
|
{
|
|
|
- if (null == knowledgeName[k])
|
|
|
+ if (string.IsNullOrEmpty(exams[0].papers[0].periodId))
|
|
|
{
|
|
|
- knowledgeName.Remove(knowledgeName[k]);
|
|
|
+
|
|
|
+ knoledge.Add(await getKnowledge("university", "hbcn", client, ss.id, "be32942d-97a9-52ba-45d6-2e5b722583f5"));
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ knoledge.Add(await getKnowledge(art.periodType, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].code, client, ss.id, exams.Where(c => c.subjects[0].id.Equals(ss.id))?.FirstOrDefault().papers[0].periodId));
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
- List<double> Score = new List<double>();
|
|
|
- //List<(string name, double score, string subject)> pointScore = new();
|
|
|
- List<string> stus = examClassResults.Where(c => c.examId.Equals(exam.id)).SelectMany(z => z.studentIds).ToList();
|
|
|
- List<List<double>> stuScores = examClassResults.Where(c => c.examId.Equals(exam.id)).SelectMany(z => z.studentScores).ToList();
|
|
|
- foreach (string id in stus)
|
|
|
+
|
|
|
+ List<(string name, double score, double aver, string subject)> blockScore = new();
|
|
|
+ List<(List<(string name, double score, double point, string subject)> studentScore, string stuId)> studentScores = new();
|
|
|
+ foreach (var exam in exams)
|
|
|
{
|
|
|
- //double scores = 0;
|
|
|
- List<(string name, double score, double point, string subject)> studentScore = new();
|
|
|
+ HashSet<string> knowledge = new HashSet<string>();
|
|
|
+ List<double> point = new List<double>();
|
|
|
+ List<List<double>> result = new List<List<double>>();
|
|
|
+ List<ClassRange> classes = new List<ClassRange>();
|
|
|
+ //求单个知识点所占分数
|
|
|
+ List<string> per = new List<string>();
|
|
|
+
|
|
|
+ if (exam.papers[0].knowledge != null && exam.papers[0].knowledge.Count > 0)
|
|
|
+ {
|
|
|
+ exam.papers[0].knowledge.ForEach(k =>
|
|
|
+ {
|
|
|
+ k.ForEach(e =>
|
|
|
+ {
|
|
|
+ knowledge.Add(e);
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
+ point = exam.papers[0].point;
|
|
|
+
|
|
|
+ List<string> knowledgeName = new List<string>();
|
|
|
+ foreach (string cla in knowledge)
|
|
|
+ {
|
|
|
+ knowledgeName.Add(cla);
|
|
|
+ }
|
|
|
+ for (int k = 0; k < knowledgeName.Count; k++)
|
|
|
+ {
|
|
|
+ if (null == knowledgeName[k])
|
|
|
+ {
|
|
|
+ knowledgeName.Remove(knowledgeName[k]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<double> Score = new List<double>();
|
|
|
+ //List<(string name, double score, string subject)> pointScore = new();
|
|
|
+ List<string> stus = examClassResults.Where(c => c.examId.Equals(exam.id)).SelectMany(z => z.studentIds).ToList();
|
|
|
+ List<List<double>> stuScores = examClassResults.Where(c => c.examId.Equals(exam.id)).SelectMany(z => z.studentScores).ToList();
|
|
|
+ foreach (string id in stus)
|
|
|
+ {
|
|
|
+ //double scores = 0;
|
|
|
+ List<(string name, double score, double point, string subject)> studentScore = new();
|
|
|
+ for (int k = 0; k < knowledgeName.Count; k++)
|
|
|
+ {
|
|
|
+ int n = 0;
|
|
|
+ double OnePoint = 0;
|
|
|
+ double scores = 0;
|
|
|
+ exam.papers[0].knowledge.ForEach(kno =>
|
|
|
+ {
|
|
|
+ if (kno.Contains(knowledgeName[k]))
|
|
|
+ {
|
|
|
+ var itemPersent = kno.Count > 0 ? 1 / Convert.ToDouble(kno.Count) : 0;
|
|
|
+ OnePoint += point[n] * itemPersent;
|
|
|
+ int index = stus.IndexOf(id);
|
|
|
+ if (stuScores[index][n] > 0)
|
|
|
+ {
|
|
|
+ scores += stuScores[index][n] * itemPersent;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ n++;
|
|
|
+ });
|
|
|
+ studentScore.Add((knowledgeName[k], Math.Round(scores, 2), OnePoint, exam.subjects[0].id));
|
|
|
+ }
|
|
|
+ studentScores.Add((studentScore, id));
|
|
|
+ }
|
|
|
for (int k = 0; k < knowledgeName.Count; k++)
|
|
|
{
|
|
|
- int n = 0;
|
|
|
double OnePoint = 0;
|
|
|
+ int n = 0;
|
|
|
double scores = 0;
|
|
|
exam.papers[0].knowledge.ForEach(kno =>
|
|
|
{
|
|
|
@@ -483,302 +519,290 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
{
|
|
|
var itemPersent = kno.Count > 0 ? 1 / Convert.ToDouble(kno.Count) : 0;
|
|
|
OnePoint += point[n] * itemPersent;
|
|
|
- int index = stus.IndexOf(id);
|
|
|
- if (stuScores[index][n] > 0)
|
|
|
+ foreach (string id in stus)
|
|
|
{
|
|
|
- scores += stuScores[index][n] * itemPersent;
|
|
|
+ int index = stus.IndexOf(id);
|
|
|
+ if (stuScores[index][n] > 0)
|
|
|
+ {
|
|
|
+ scores += stuScores[index][n] * itemPersent;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
n++;
|
|
|
});
|
|
|
- studentScore.Add((knowledgeName[k], Math.Round(scores, 2), OnePoint, exam.subjects[0].id));
|
|
|
+ double sc = stus.Count > 0 ? Math.Round(scores * 1.0 / stus.Count, 2) : 0;
|
|
|
+ blockScore.Add((knowledgeName[k], OnePoint, sc, exam.subjects[0].id));
|
|
|
+ //blockScore.AddRange(pointScore);
|
|
|
}
|
|
|
- studentScores.Add((studentScore, id));
|
|
|
}
|
|
|
- for (int k = 0; k < knowledgeName.Count; k++)
|
|
|
+ var bls = blockScore.GroupBy(x => x.subject).Select(v => new
|
|
|
{
|
|
|
- double OnePoint = 0;
|
|
|
- int n = 0;
|
|
|
- double scores = 0;
|
|
|
- exam.papers[0].knowledge.ForEach(kno =>
|
|
|
+ subjectId = v.Key,
|
|
|
+ knoScore = v.ToList().GroupBy(k => k.name).Select(z => new
|
|
|
{
|
|
|
- if (kno.Contains(knowledgeName[k]))
|
|
|
+ knoName = z.Key,
|
|
|
+ score = z.ToList().Sum(j => j.score),
|
|
|
+ aver = z.ToList().Sum(j => j.aver)
|
|
|
+ })
|
|
|
+ });
|
|
|
+ //List<(string subId,List<(string name, List<string> kno)>)> subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ //var subjectKnow;
|
|
|
+ var subjectKnow = string.IsNullOrEmpty(exams[0].papers[0].periodId) ? knoledge.Select(x => new { x.subId, x.knos }).ToList() : knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ /*if (string.IsNullOrEmpty(exams[0].papers[0].periodId))
|
|
|
+ {
|
|
|
+ var subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ var subjectKnow = knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
+ }*/
|
|
|
+ List<(string subjectId, List<(string name, double score, double persent, double aver, List<string> dim)> bks)> bs = new();
|
|
|
+ List<(string subjectId, List<(string stuId, List<(string name, double score, double point, List<string> dim)> values)> stuBks)> sbs = new();
|
|
|
+ List<(string name, double score, double av, string sId)> stuBlockScore = new();
|
|
|
+ foreach (var bb in subjectKnow)
|
|
|
+ {
|
|
|
+ var kno1 = bls.Where(c => c.subjectId.Equals(bb.subId)).SelectMany(x => x.knoScore).ToList();
|
|
|
+ var stuInfo = studentScores.Select(c => new
|
|
|
+ {
|
|
|
+ c.stuId,
|
|
|
+ subInfo = c.studentScore.Where(x => x.subject.Equals(bb.subId)).ToList()
|
|
|
+ }).Where(z => z.subInfo.Count > 0).ToList();
|
|
|
+ //var kno2 = dimensions.Where(c => c.subjectBind.Equals(bb.subId)).Select(x => new { x.dimension,x.blocks}).ToList();
|
|
|
+ List<(string name, double score, double aver)> blockScores = new();
|
|
|
+ foreach (var k2 in bb.knos)
|
|
|
+ {
|
|
|
+ double bsc = 0;
|
|
|
+ double avs = 0;
|
|
|
+ foreach (var k3 in kno1)
|
|
|
{
|
|
|
- var itemPersent = kno.Count > 0 ? 1 / Convert.ToDouble(kno.Count) : 0;
|
|
|
- OnePoint += point[n] * itemPersent;
|
|
|
- foreach (string id in stus)
|
|
|
+ if (null != k2.kno && k2.kno.Contains(k3.knoName))
|
|
|
{
|
|
|
- int index = stus.IndexOf(id);
|
|
|
- if (stuScores[index][n] > 0)
|
|
|
+ bsc += k3.score;
|
|
|
+ avs += k3.aver;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ foreach (var stu in stuInfo)
|
|
|
+ {
|
|
|
+ double realScore = 0;
|
|
|
+ double realPoint = 0;
|
|
|
+ foreach (var subScore in stu.subInfo)
|
|
|
+ {
|
|
|
+ if (null != k2.kno && k2.kno.Contains(subScore.name))
|
|
|
{
|
|
|
- scores += stuScores[index][n] * itemPersent;
|
|
|
+ realScore = subScore.score;
|
|
|
+ realPoint = subScore.point;
|
|
|
}
|
|
|
}
|
|
|
+ stuBlockScore.Add((k2.name, realScore, realPoint, stu.stuId));
|
|
|
}
|
|
|
- n++;
|
|
|
- });
|
|
|
- double sc = stus.Count > 0 ? Math.Round(scores * 1.0 / stus.Count, 2) : 0;
|
|
|
- blockScore.Add((knowledgeName[k], OnePoint, sc, exam.subjects[0].id));
|
|
|
- //blockScore.AddRange(pointScore);
|
|
|
- }
|
|
|
- }
|
|
|
- var bls = blockScore.GroupBy(x => x.subject).Select(v => new
|
|
|
- {
|
|
|
- subjectId = v.Key,
|
|
|
- knoScore = v.ToList().GroupBy(k => k.name).Select(z => new
|
|
|
- {
|
|
|
- knoName = z.Key,
|
|
|
- score = z.ToList().Sum(j => j.score),
|
|
|
- aver = z.ToList().Sum(j => j.aver)
|
|
|
- })
|
|
|
- });
|
|
|
- //List<(string subId,List<(string name, List<string> kno)>)> subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
|
|
|
- //var subjectKnow;
|
|
|
- var subjectKnow = string.IsNullOrEmpty(exams[0].papers[0].periodId) ? knoledge.Select(x => new { x.subId, x.knos }).ToList() : knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
- /*if (string.IsNullOrEmpty(exams[0].papers[0].periodId))
|
|
|
- {
|
|
|
- var subjectKnow = knoledge.Select(x => new { x.subId, x.knos }).ToList();
|
|
|
- }
|
|
|
- else {
|
|
|
- var subjectKnow = knoledge.Where(c => c.ptype.Equals(art.periodType)).Select(x => new { x.subId, x.knos }).ToList();
|
|
|
- }*/
|
|
|
- List<(string subjectId, List<(string name, double score, double persent, double aver, List<string> dim)> bks)> bs = new();
|
|
|
- List<(string subjectId, List<(string stuId, List<(string name, double score, double point, List<string> dim)> values)> stuBks)> sbs = new();
|
|
|
- List<(string name, double score, double av, string sId)> stuBlockScore = new();
|
|
|
- foreach (var bb in subjectKnow)
|
|
|
- {
|
|
|
- var kno1 = bls.Where(c => c.subjectId.Equals(bb.subId)).SelectMany(x => x.knoScore).ToList();
|
|
|
- var stuInfo = studentScores.Select(c => new
|
|
|
- {
|
|
|
- c.stuId,
|
|
|
- subInfo = c.studentScore.Where(x => x.subject.Equals(bb.subId)).ToList()
|
|
|
- }).Where(z => z.subInfo.Count > 0).ToList();
|
|
|
- //var kno2 = dimensions.Where(c => c.subjectBind.Equals(bb.subId)).Select(x => new { x.dimension,x.blocks}).ToList();
|
|
|
- List<(string name, double score, double aver)> blockScores = new();
|
|
|
- foreach (var k2 in bb.knos)
|
|
|
- {
|
|
|
- double bsc = 0;
|
|
|
- double avs = 0;
|
|
|
- foreach (var k3 in kno1)
|
|
|
+ blockScores.Add((k2.name, bsc, avs));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ var stuBlock = stuBlockScore.GroupBy(x => (x.sId)).Select(c => new
|
|
|
{
|
|
|
- if (null != k2.kno && k2.kno.Contains(k3.knoName))
|
|
|
+ stuId = c.Key,
|
|
|
+ block = c.ToList().GroupBy(b => b.name).Select(q => new
|
|
|
{
|
|
|
- bsc += k3.score;
|
|
|
- avs += k3.aver;
|
|
|
- }
|
|
|
+ name = q.Key,
|
|
|
+ score = q.ToList().Sum(q => q.score),
|
|
|
+ point = q.ToList().Sum(q => q.av),
|
|
|
+ dimension = setting.dimensions.Where(s => s.blocks.Contains(q.Key)).Select(x => x.dimension).ToList()
|
|
|
+ })
|
|
|
+ }).ToList();
|
|
|
+ var blk = blockScores.Select(x => new
|
|
|
+ {
|
|
|
+ x.name,
|
|
|
+ x.score,
|
|
|
+ persent = Math.Round(x.aver > 0 ? x.aver / x.score : 0, 2),
|
|
|
+ x.aver,
|
|
|
+ dimension = setting.dimensions.Where(s => s.blocks.Contains(x.name)).Select(x => x.dimension)
|
|
|
+ });
|
|
|
+ List<(string name, double score, double persent, double aver, List<string> dim)> bks = new();
|
|
|
+ List<(string stuId, List<(string name, double score, double point, List<string> dim)> values)> stuBks = new();
|
|
|
+ foreach (var bk in blk)
|
|
|
+ {
|
|
|
+ bks.Add((bk.name, bk.score, bk.persent, bk.aver, bk.dimension.ToList()));
|
|
|
}
|
|
|
- foreach (var stu in stuInfo)
|
|
|
+ foreach (var stuBlk in stuBlock)
|
|
|
{
|
|
|
- double realScore = 0;
|
|
|
- double realPoint = 0;
|
|
|
- foreach (var subScore in stu.subInfo)
|
|
|
+ List<(string name, double score, double point, List<string> dim)> values = new();
|
|
|
+ foreach (var lk in stuBlk.block)
|
|
|
{
|
|
|
- if (null != k2.kno && k2.kno.Contains(subScore.name))
|
|
|
- {
|
|
|
- realScore = subScore.score;
|
|
|
- realPoint = subScore.point;
|
|
|
- }
|
|
|
+ values.Add((lk.name, lk.score, lk.point, lk.dimension));
|
|
|
}
|
|
|
- stuBlockScore.Add((k2.name, realScore, realPoint, stu.stuId));
|
|
|
+ stuBks.Add((stuBlk.stuId, values));
|
|
|
}
|
|
|
- blockScores.Add((k2.name, bsc, avs));
|
|
|
+ bs.Add((bb.subId, bks));
|
|
|
+ sbs.Add((bb.subId, stuBks));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- var stuBlock = stuBlockScore.GroupBy(x => (x.sId)).Select(c => new
|
|
|
+ var blocks = bs.Select(x => new
|
|
|
{
|
|
|
- stuId = c.Key,
|
|
|
- block = c.ToList().GroupBy(b => b.name).Select(q => new
|
|
|
+ x.subjectId,
|
|
|
+ dim = x.bks.Select(z => new
|
|
|
{
|
|
|
- name = q.Key,
|
|
|
- score = q.ToList().Sum(q => q.score),
|
|
|
- point = q.ToList().Sum(q => q.av),
|
|
|
- dimension = setting.dimensions.Where(s => s.blocks.Contains(q.Key)).Select(x => x.dimension).ToList()
|
|
|
+ z.name,
|
|
|
+ z.score,
|
|
|
+ z.persent,
|
|
|
+ z.aver,
|
|
|
+ z.dim
|
|
|
})
|
|
|
- }).ToList() ;
|
|
|
- var blk = blockScores.Select(x => new
|
|
|
- {
|
|
|
- x.name,
|
|
|
- x.score,
|
|
|
- persent = Math.Round(x.aver > 0 ? x.aver / x.score : 0, 2),
|
|
|
- x.aver,
|
|
|
- dimension = setting.dimensions.Where(s => s.blocks.Contains(x.name)).Select(x => x.dimension)
|
|
|
});
|
|
|
- List<(string name, double score, double persent, double aver, List<string> dim)> bks = new();
|
|
|
- List<(string stuId, List<(string name, double score, double point, List<string> dim)> values)> stuBks = new();
|
|
|
- foreach (var bk in blk)
|
|
|
- {
|
|
|
- bks.Add((bk.name, bk.score, bk.persent, bk.aver, bk.dimension.ToList()));
|
|
|
- }
|
|
|
- foreach (var stuBlk in stuBlock) {
|
|
|
- List<(string name, double score, double point, List<string> dim)> values = new();
|
|
|
- foreach (var lk in stuBlk.block) {
|
|
|
- values.Add((lk.name,lk.score,lk.point,lk.dimension));
|
|
|
- }
|
|
|
- stuBks.Add((stuBlk.stuId, values));
|
|
|
- }
|
|
|
- bs.Add((bb.subId, bks));
|
|
|
- sbs.Add((bb.subId, stuBks));
|
|
|
- }
|
|
|
-
|
|
|
- var blocks = bs.Select(x => new
|
|
|
- {
|
|
|
- x.subjectId,
|
|
|
- dim = x.bks.Select(z => new
|
|
|
- {
|
|
|
- z.name,
|
|
|
- z.score,
|
|
|
- z.persent,
|
|
|
- z.aver,
|
|
|
- z.dim
|
|
|
- })
|
|
|
- });
|
|
|
- var stuBlocks = sbs.Select(x => new {
|
|
|
- x.subjectId,
|
|
|
- dim = x.stuBks.Select(z => new {
|
|
|
- z.stuId,
|
|
|
- blk = z.values.Select(c => new {
|
|
|
- c.name,
|
|
|
- c.score,
|
|
|
- c.point,
|
|
|
- c.dim
|
|
|
+ var stuBlocks = sbs.Select(x => new {
|
|
|
+ x.subjectId,
|
|
|
+ dim = x.stuBks.Select(z => new {
|
|
|
+ z.stuId,
|
|
|
+ blk = z.values.Select(c => new {
|
|
|
+ c.name,
|
|
|
+ c.score,
|
|
|
+ c.point,
|
|
|
+ c.dim
|
|
|
+ })
|
|
|
})
|
|
|
- })
|
|
|
- });
|
|
|
- //获取维度得分率
|
|
|
- var dim = setting.dimensions.GroupBy(a => a.subjectBind).Select(x => new
|
|
|
- {
|
|
|
- x.Key,
|
|
|
- dim = x.ToList().Select(c => new
|
|
|
+ });
|
|
|
+ //获取维度得分率
|
|
|
+ var dim = setting.dimensions.GroupBy(a => a.subjectBind).Select(x => new
|
|
|
{
|
|
|
- c.dimension,
|
|
|
- persent = Math.Round(c.blocks.Select(z => new
|
|
|
+ x.Key,
|
|
|
+ dim = x.ToList().Select(c => new
|
|
|
{
|
|
|
- persent = Math.Round(bs.Where(z => z.subjectId.Equals(x.Key)).SelectMany(k => k.bks).Where(q => q.name.Equals(z)).Sum(h => h.score) > 0 ?
|
|
|
- bs.Where(z => z.subjectId.Equals(x.Key)).SelectMany(k => k.bks).Where(q => q.name.Equals(z)).Sum(h => h.aver) /
|
|
|
- bs.Where(z => z.subjectId.Equals(x.Key)).SelectMany(k => k.bks).Where(q => q.name.Equals(z)).Sum(h => h.score) : 0, 2)
|
|
|
- }).Sum(o => o.persent) / c.blocks.Count, 2)
|
|
|
- })
|
|
|
- });
|
|
|
+ c.dimension,
|
|
|
+ persent = Math.Round(c.blocks.Select(z => new
|
|
|
+ {
|
|
|
+ persent = Math.Round(bs.Where(z => z.subjectId.Equals(x.Key)).SelectMany(k => k.bks).Where(q => q.name.Equals(z)).Sum(h => h.score) > 0 ?
|
|
|
+ bs.Where(z => z.subjectId.Equals(x.Key)).SelectMany(k => k.bks).Where(q => q.name.Equals(z)).Sum(h => h.aver) /
|
|
|
+ bs.Where(z => z.subjectId.Equals(x.Key)).SelectMany(k => k.bks).Where(q => q.name.Equals(z)).Sum(h => h.score) : 0, 2)
|
|
|
+ }).Sum(o => o.persent) / c.blocks.Count, 2)
|
|
|
+ })
|
|
|
+ });
|
|
|
|
|
|
- //获取学期信息
|
|
|
+ //获取学期信息
|
|
|
|
|
|
- var (currSemester, studyYear, currSemesterDate, date, nextSemester) = SchoolService.GetSemester(period, art.startTime);
|
|
|
- //总分的占比情况
|
|
|
+ var (currSemester, studyYear, currSemesterDate, date, nextSemester) = SchoolService.GetSemester(period, art.startTime);
|
|
|
+ //总分的占比情况
|
|
|
|
|
|
- foreach (var rs in studentArtResults)
|
|
|
- {
|
|
|
- foreach (var res in rs.results)
|
|
|
+ foreach (var rs in studentArtResults)
|
|
|
{
|
|
|
- if (res.quotaId.Equals("quota_21") && res.score > -1 && res.score < 95)
|
|
|
+ foreach (var res in rs.results)
|
|
|
{
|
|
|
- /*res.score *= 1.5;
|
|
|
- if (res.score >= 95) {
|
|
|
- res.score = new Random().Next(90, 99);
|
|
|
- }*/
|
|
|
- //res.score = Math.Round(res.score);
|
|
|
+ if (res.quotaId.Equals("quota_21") && res.score > -1 && res.score < 95)
|
|
|
+ {
|
|
|
+ /*res.score *= 1.5;
|
|
|
+ if (res.score >= 95) {
|
|
|
+ res.score = new Random().Next(90, 99);
|
|
|
+ }*/
|
|
|
+ //res.score = Math.Round(res.score);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- //if (rs.totalScore == 0)
|
|
|
- //{
|
|
|
- foreach (var sc in rs.subjectScores)
|
|
|
- {
|
|
|
- //if (sc.score == 0)
|
|
|
+ //if (rs.totalScore == 0)
|
|
|
//{
|
|
|
- /* var subjectMore = rs.results.GroupBy(x => x.subjectId).Select(c => new { subject = c.Key, list = c.ToList().Select(m => new { m.quotaId,m.score}) });
|
|
|
- var totalScore = subjectMore.Select(x => new {
|
|
|
- x.subject,
|
|
|
- quotaScroe = x.list.Select(c => new {
|
|
|
- c.quotaId,
|
|
|
- c.score
|
|
|
- }),
|
|
|
- });*/
|
|
|
- var quotaPercent = setting.quotas.Select(x => new
|
|
|
+ foreach (var sc in rs.subjectScores)
|
|
|
{
|
|
|
- x.id,
|
|
|
- x.percent,
|
|
|
- score = x.children.Select(c => new
|
|
|
+ //if (sc.score == 0)
|
|
|
+ //{
|
|
|
+ /* var subjectMore = rs.results.GroupBy(x => x.subjectId).Select(c => new { subject = c.Key, list = c.ToList().Select(m => new { m.quotaId,m.score}) });
|
|
|
+ var totalScore = subjectMore.Select(x => new {
|
|
|
+ x.subject,
|
|
|
+ quotaScroe = x.list.Select(c => new {
|
|
|
+ c.quotaId,
|
|
|
+ c.score
|
|
|
+ }),
|
|
|
+ });*/
|
|
|
+ var quotaPercent = setting.quotas.Select(x => new
|
|
|
{
|
|
|
- real = rs.results.Where(r => r.quotaId.Equals(c.id) && r.subjectId.Equals(sc.subjectId) && r.score > -1).FirstOrDefault()?.score * c.percent * 0.01,
|
|
|
- score = c.children.Select(s => new
|
|
|
+ x.id,
|
|
|
+ x.percent,
|
|
|
+ score = x.children.Select(c => new
|
|
|
{
|
|
|
- real = rs.results.Where(r => r.quotaId.Equals(s.id) && r.subjectId.Equals(sc.subjectId) && r.score > -1).FirstOrDefault()?.score * s.percent * 0.01
|
|
|
- }).Sum(n => n.real) * c.percent * 0.01
|
|
|
- }).Sum(n => n.real + n.score) * x.percent * 0.01
|
|
|
- });
|
|
|
- double realScore = Math.Round((double)quotaPercent.Sum(c => c.score), 2);
|
|
|
- sc.score = realScore;
|
|
|
- //}
|
|
|
- }
|
|
|
- rs.totalScore = Math.Round(rs.subjectScores.Where(m => m.score >= 0).Sum(z => z.score), 2);
|
|
|
- tasks.Add(client.GetContainer(Constant.TEAMModelOS, Constant.Student).ReplaceItemAsync(rs, rs.id, new PartitionKey(rs.code)));
|
|
|
+ real = rs.results.Where(r => r.quotaId.Equals(c.id) && r.subjectId.Equals(sc.subjectId) && r.score > -1).FirstOrDefault()?.score * c.percent * 0.01,
|
|
|
+ score = c.children.Select(s => new
|
|
|
+ {
|
|
|
+ real = rs.results.Where(r => r.quotaId.Equals(s.id) && r.subjectId.Equals(sc.subjectId) && r.score > -1).FirstOrDefault()?.score * s.percent * 0.01
|
|
|
+ }).Sum(n => n.real) * c.percent * 0.01
|
|
|
+ }).Sum(n => n.real + n.score) * x.percent * 0.01
|
|
|
+ });
|
|
|
+ double realScore = Math.Round((double)quotaPercent.Sum(c => c.score), 2);
|
|
|
+ sc.score = realScore;
|
|
|
+ //}
|
|
|
+ }
|
|
|
+ rs.totalScore = Math.Round(rs.subjectScores.Where(m => m.score >= 0).Sum(z => z.score), 2);
|
|
|
+ tasks.Add(client.GetContainer(Constant.TEAMModelOS, Constant.Student).ReplaceItemAsync(rs, rs.id, new PartitionKey(rs.code)));
|
|
|
|
|
|
- PortraitStudent student = new()
|
|
|
- {
|
|
|
- studentId = rs.studentId,
|
|
|
- name = rs.studentName,
|
|
|
- classId = rs.classIds[0]
|
|
|
- };
|
|
|
- SemesterData semesterData = new()
|
|
|
- {
|
|
|
- examName = art.name,
|
|
|
- examId = art.id,
|
|
|
- examDate = art.startTime,
|
|
|
- examType = "",
|
|
|
- year = studyYear,
|
|
|
- semesterId = currSemester.id,
|
|
|
- totalScore = 200,
|
|
|
- sumScore = rs.totalScore,
|
|
|
- excellenceRate = 0,
|
|
|
- passRate = 0,
|
|
|
- };
|
|
|
- int index = 0;
|
|
|
- foreach (var sj in art.subjects)
|
|
|
- {
|
|
|
- ItemScore item = new()
|
|
|
+ PortraitStudent student = new()
|
|
|
{
|
|
|
- name = sj.name,
|
|
|
- score = rs.subjectScores.Where(x => x.subjectId.Equals(sj.id)).FirstOrDefault().score,
|
|
|
- time = art.startTime,
|
|
|
- totalScore = 100,
|
|
|
- id = sj.id,
|
|
|
- type = sj.id,
|
|
|
- block = stuBlocks.Where(c => c.subjectId.Equals(sj.id)).SelectMany(x => x.dim).Where(z => z.stuId.Equals(rs.studentId))?.FirstOrDefault().blk,
|
|
|
- kno = studentScores.Where(c => c.stuId.Equals(rs.studentId)).SelectMany(c => c.studentScore).Where(
|
|
|
- p => p.subject.Equals(sj.id)).Select(z => new
|
|
|
- {
|
|
|
- z.name,
|
|
|
- z.score,
|
|
|
- z.point,
|
|
|
- block = subjectKnow.Where(v => v.subId.Equals(sj.id)).SelectMany(k => k.knos).Where(c => null != c.kno && c.kno.Contains(z.name)).Select(x => x.name)
|
|
|
- }),
|
|
|
- dim = dim.Where(c => c.Key.Equals(sj.id))?.FirstOrDefault().dim
|
|
|
+ studentId = rs.studentId,
|
|
|
+ name = rs.studentName,
|
|
|
+ classId = rs.classIds[0]
|
|
|
};
|
|
|
- index++;
|
|
|
- semesterData.itemScore.Add(item);
|
|
|
- }
|
|
|
- student.semesterData.Add(semesterData);
|
|
|
+ SemesterData semesterData = new()
|
|
|
+ {
|
|
|
+ examName = art.name,
|
|
|
+ examId = art.id,
|
|
|
+ examDate = art.startTime,
|
|
|
+ examType = "",
|
|
|
+ year = studyYear,
|
|
|
+ semesterId = currSemester.id,
|
|
|
+ totalScore = 200,
|
|
|
+ sumScore = rs.totalScore,
|
|
|
+ excellenceRate = 0,
|
|
|
+ passRate = 0,
|
|
|
+ };
|
|
|
+ int index = 0;
|
|
|
+ foreach (var sj in art.subjects)
|
|
|
+ {
|
|
|
+ ItemScore item = new()
|
|
|
+ {
|
|
|
+ name = sj.name,
|
|
|
+ score = rs.subjectScores.Where(x => x.subjectId.Equals(sj.id)).FirstOrDefault().score,
|
|
|
+ time = art.startTime,
|
|
|
+ totalScore = 100,
|
|
|
+ id = sj.id,
|
|
|
+ type = sj.id,
|
|
|
+ block = stuBlocks.Where(c => c.subjectId.Equals(sj.id)).SelectMany(x => x.dim).Where(z => z.stuId.Equals(rs.studentId))?.FirstOrDefault().blk,
|
|
|
+ kno = studentScores.Where(c => c.stuId.Equals(rs.studentId)).SelectMany(c => c.studentScore).Where(
|
|
|
+ p => p.subject.Equals(sj.id)).Select(z => new
|
|
|
+ {
|
|
|
+ z.name,
|
|
|
+ z.score,
|
|
|
+ z.point,
|
|
|
+ block = subjectKnow.Where(v => v.subId.Equals(sj.id)).SelectMany(k => k.knos).Where(c => null != c.kno && c.kno.Contains(z.name)).Select(x => x.name)
|
|
|
+ }),
|
|
|
+ dim = dim.Where(c => c.Key.Equals(sj.id))?.FirstOrDefault().dim
|
|
|
+ };
|
|
|
+ index++;
|
|
|
+ semesterData.itemScore.Add(item);
|
|
|
+ }
|
|
|
+ student.semesterData.Add(semesterData);
|
|
|
|
|
|
- portrait.students.Add(student);
|
|
|
- //}
|
|
|
- }
|
|
|
- if (tasks.Count > 0)
|
|
|
- {
|
|
|
- await Task.WhenAll(tasks);
|
|
|
- }
|
|
|
- //获取学生信息
|
|
|
- //(List<RMember> rmembers, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, art.classes, art.school);
|
|
|
- /* foreach (var member in studentArtResults)
|
|
|
- {
|
|
|
+ portrait.students.Add(student);
|
|
|
+ //}
|
|
|
+ }
|
|
|
+ if (tasks.Count > 0)
|
|
|
+ {
|
|
|
+ await Task.WhenAll(tasks);
|
|
|
+ }
|
|
|
+ //获取学生信息
|
|
|
+ //(List<RMember> rmembers, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, art.classes, art.school);
|
|
|
+ /* foreach (var member in studentArtResults)
|
|
|
+ {
|
|
|
|
|
|
- }*/
|
|
|
- if (null != period && persent >= 60)
|
|
|
- {
|
|
|
- string location = $"{Environment.GetEnvironmentVariable("Option:Location")}";
|
|
|
- var responseData = await _httpTrigger.RequestHttpTrigger(portrait, location, "upsert-student-portrait");
|
|
|
+ }*/
|
|
|
+ if (null != period && persent >= 60)
|
|
|
+ {
|
|
|
+ string location = $"{Environment.GetEnvironmentVariable("Option:Location")}";
|
|
|
+ var responseData = await _httpTrigger.RequestHttpTrigger(portrait, location, "upsert-student-portrait");
|
|
|
+ }
|
|
|
}
|
|
|
+ } catch (Exception e) {
|
|
|
+ await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-艺术评测finish{e.Message}\n{e.StackTrace}", GroupNames.醍摩豆服務運維群組);
|
|
|
}
|
|
|
+ /* finally
|
|
|
+ {
|
|
|
+ string pk = string.Format("{0}{1}{2}", art.code, "-", "going");
|
|
|
+ await table.DeleteSingle<ChangeRecord>(pk, tdata.id);
|
|
|
+ }*/
|
|
|
+
|
|
|
|
|
|
break;
|
|
|
}
|
