|
@@ -98,7 +98,7 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
}
|
|
|
break;
|
|
|
case "going":
|
|
|
-
|
|
|
+
|
|
|
List<string> classes = ExamService.getClasses(art.classes, art.stuLists);
|
|
|
(List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, art.school, null);
|
|
|
var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
|
|
@@ -115,8 +115,8 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
if (art.subjects.Count > 0)
|
|
|
{
|
|
|
foreach (var course in art.subjects)
|
|
|
- {
|
|
|
- sub.Add(course.id);
|
|
|
+ {
|
|
|
+ sub.Add(course.id);
|
|
|
}
|
|
|
}
|
|
|
if (tmds.IsNotEmpty())
|
|
@@ -124,8 +124,10 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
tmds.ForEach(x =>
|
|
|
{
|
|
|
HashSet<string> classIds = new HashSet<string>();
|
|
|
- classLists.ForEach(z => {
|
|
|
- z.members.ForEach(y => {
|
|
|
+ classLists.ForEach(z =>
|
|
|
+ {
|
|
|
+ z.members.ForEach(y =>
|
|
|
+ {
|
|
|
if (y.id.Equals(x) && y.type == 1)
|
|
|
{
|
|
|
classIds.Add(z.id);
|
|
@@ -159,8 +161,10 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
addStudentsCls.ForEach(x =>
|
|
|
{
|
|
|
HashSet<string> classIds = new HashSet<string>();
|
|
|
- classLists.ForEach(z => {
|
|
|
- z.members.ForEach(y => {
|
|
|
+ classLists.ForEach(z =>
|
|
|
+ {
|
|
|
+ z.members.ForEach(y =>
|
|
|
+ {
|
|
|
if (y.id.Equals(x.id) && y.code.Equals(art.school) && y.type == 2)
|
|
|
{
|
|
|
classIds.Add(z.id);
|
|
@@ -184,6 +188,7 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
blob = null,
|
|
|
owner = art.owner,
|
|
|
createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
|
|
|
+ ext = new Dictionary<string, JsonElement>() {{ "subjects", art.subjects.ToJsonString().ToObject<JsonElement>() } },
|
|
|
taskStatus = -1,
|
|
|
classIds = classIds.ToList()
|
|
|
});
|
|
@@ -191,7 +196,7 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
}
|
|
|
await ActivityService.SaveStuActivity(client, _dingDing, stuActivities, tmdActivities, tchActivities);
|
|
|
//await StatisticsService.SendServiceBus(list, _configuration, _serviceBus, client);
|
|
|
-
|
|
|
+
|
|
|
var messageVoteEnd = new ServiceBusMessage(new { id = tdata.id, progress = "finish", code = tdata.code }.ToJsonString());
|
|
|
messageVoteEnd.ApplicationProperties.Add("name", "Art");
|
|
|
if (voteRecords.Count > 0)
|
|
@@ -223,8 +228,8 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
|
|
|
break;
|
|
|
case "finish":
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
break;
|
|
|
}
|
|
|
}
|