|
|
@@ -349,92 +349,95 @@ namespace TEAMModelOS.SDK
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- //如果不是队长统一上传
|
|
|
- //学段
|
|
|
- var period = enroll.contest?.enrollInfos?.Find(z => z.code.Equals("period"));
|
|
|
- //科目
|
|
|
- var subject = enroll.contest?.enrollInfos?.Find(z => z.code.Equals("subject"));
|
|
|
- string periodSubjectKey = string.Empty;
|
|
|
- string name = enroll.contest?.enrollInfos?.Find(z => z.code.Equals("name"))?.val;
|
|
|
- string uploadId = string.Empty;
|
|
|
- if (!string.IsNullOrEmpty(name))
|
|
|
- {
|
|
|
- name = $"({name})";
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- name = string.Empty;
|
|
|
- }
|
|
|
- int count = 0;
|
|
|
- int available = -1;
|
|
|
-
|
|
|
- var checkResult = ActivityService.CheckPeriodSubject(distribute, period, subject, periodSubjectKeys);
|
|
|
- if (checkResult.available == 0)
|
|
|
+ if (enroll.upload!= null)
|
|
|
{
|
|
|
-
|
|
|
- if (enroll.upload != null && enroll.upload.sokrates.IsNotEmpty())
|
|
|
+ //如果不是队长统一上传
|
|
|
+ //学段
|
|
|
+ var period = enroll.contest?.enrollInfos?.Find(z => z.code.Equals("period"));
|
|
|
+ //科目
|
|
|
+ var subject = enroll.contest?.enrollInfos?.Find(z => z.code.Equals("subject"));
|
|
|
+ string periodSubjectKey = string.Empty;
|
|
|
+ string name = enroll.contest?.enrollInfos?.Find(z => z.code.Equals("name"))?.val;
|
|
|
+ string uploadId = string.Empty;
|
|
|
+ if (!string.IsNullOrEmpty(name))
|
|
|
{
|
|
|
- count += enroll.upload.sokrates.Count;
|
|
|
+ name = $"({name})";
|
|
|
}
|
|
|
- if (enroll.upload != null && enroll.upload.files.IsNotEmpty())
|
|
|
+ else
|
|
|
{
|
|
|
- count += enroll.upload.files.Count;
|
|
|
+ name = string.Empty;
|
|
|
}
|
|
|
- if (enroll.upload != null && enroll.upload.lessons.IsNotEmpty())
|
|
|
+ int count = 0;
|
|
|
+ int available = -1;
|
|
|
+
|
|
|
+ var checkResult = ActivityService.CheckPeriodSubject(distribute, period, subject, periodSubjectKeys);
|
|
|
+ if (checkResult.available == 0)
|
|
|
{
|
|
|
- count += enroll.upload.lessons.Count;
|
|
|
+
|
|
|
+ if (enroll.upload != null && enroll.upload.sokrates.IsNotEmpty())
|
|
|
+ {
|
|
|
+ count += enroll.upload.sokrates.Count;
|
|
|
+ }
|
|
|
+ if (enroll.upload != null && enroll.upload.files.IsNotEmpty())
|
|
|
+ {
|
|
|
+ count += enroll.upload.files.Count;
|
|
|
+ }
|
|
|
+ if (enroll.upload != null && enroll.upload.lessons.IsNotEmpty())
|
|
|
+ {
|
|
|
+ count += enroll.upload.lessons.Count;
|
|
|
+ }
|
|
|
+ if (enroll.upload != null && enroll.upload.complexes.IsNotEmpty())
|
|
|
+ {
|
|
|
+ count+=enroll.upload.complexes.Count();
|
|
|
+ }
|
|
|
+ if (count <= 0)
|
|
|
+ {
|
|
|
+ available = 5;
|
|
|
+ uploadId = enroll.id;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ available = checkResult.available;
|
|
|
+ uploadId = enroll.upload.uploadId;
|
|
|
+ }
|
|
|
}
|
|
|
- if (enroll.upload != null && enroll.upload.complexes.IsNotEmpty())
|
|
|
+ else
|
|
|
{
|
|
|
- count+=enroll.upload.complexes.Count();
|
|
|
+ uploadId = enroll.id;
|
|
|
+ available = checkResult.available;
|
|
|
}
|
|
|
- if (count <= 0)
|
|
|
+ ExpertContestTaskDto expertContestTask = expertContestTasks.Find(z => !string.IsNullOrWhiteSpace(z.uploadId) && z.uploadId.Equals(enroll.upload));
|
|
|
+ if (expertContestTask == null)
|
|
|
{
|
|
|
- available = 5;
|
|
|
- uploadId = enroll.id;
|
|
|
+ expertContestTasks.Add(new ExpertContestTaskDto
|
|
|
+ {
|
|
|
+ uploadId = uploadId,
|
|
|
+ name = $"{enroll.schoolName}-{name}",
|
|
|
+ //uploadTypes = new List<string> { enroll.upload?.type },
|
|
|
+ uploadTypes =enroll.upload.uploadType,
|
|
|
+ count = count,
|
|
|
+ cipher = enroll.contest?.cipher,
|
|
|
+ type = 1,
|
|
|
+ leader = 1,
|
|
|
+ tmdid = enroll.id,
|
|
|
+ status = -1,
|
|
|
+ score = -1,
|
|
|
+ periodSubjectKey = checkResult.periodSubjectKey,
|
|
|
+ period = period?.val,
|
|
|
+ subject = subject?.val,
|
|
|
+ available = available,
|
|
|
+ activityId = contest?.id,
|
|
|
+ });
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- available = checkResult.available;
|
|
|
- uploadId = enroll.upload.uploadId;
|
|
|
+ expertContestTask.available = available;
|
|
|
+ expertContestTask.name = name;
|
|
|
+ expertContestTask.count = count;
|
|
|
+ expertContestTask.periodSubjectKey = checkResult.periodSubjectKey;
|
|
|
+ expertContestTask.activityId=contest?.id;
|
|
|
}
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- uploadId = enroll.id;
|
|
|
- available = checkResult.available;
|
|
|
- }
|
|
|
- ExpertContestTaskDto expertContestTask = expertContestTasks.Find(z => !string.IsNullOrWhiteSpace(z.uploadId) && z.uploadId.Equals(enroll.upload));
|
|
|
- if (expertContestTask == null)
|
|
|
- {
|
|
|
- expertContestTasks.Add(new ExpertContestTaskDto
|
|
|
- {
|
|
|
- uploadId = uploadId,
|
|
|
- name = $"{enroll.schoolName}-{name}",
|
|
|
- //uploadTypes = new List<string> { enroll.upload?.type },
|
|
|
- uploadTypes =enroll.upload.uploadType,
|
|
|
- count = count,
|
|
|
- cipher = enroll.contest?.cipher,
|
|
|
- type = 1,
|
|
|
- leader = 1,
|
|
|
- tmdid = enroll.id,
|
|
|
- status = -1,
|
|
|
- score = -1,
|
|
|
- periodSubjectKey = checkResult.periodSubjectKey,
|
|
|
- period = period?.val,
|
|
|
- subject = subject?.val,
|
|
|
- available = available,
|
|
|
- activityId = contest?.id,
|
|
|
- });
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- expertContestTask.available = available;
|
|
|
- expertContestTask.name = name;
|
|
|
- expertContestTask.count = count;
|
|
|
- expertContestTask.periodSubjectKey = checkResult.periodSubjectKey;
|
|
|
- expertContestTask.activityId=contest?.id;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
List<ExpertContestTaskDto> invalids = expertContestTasks.FindAll(z => z.available!=0);
|
CrazyIter_Bin