CrazyIter_Bin 1 year ago
parent
commit
3ff8b40ee2

+ 9 - 1
TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -115,6 +115,10 @@ namespace TEAMModelOS.SDK
                         {
                             count += leader.upload.files.Count;
                         }
+                        if (leader?.upload != null && leader.upload.lessons.IsNotEmpty())
+                        {
+                            count += leader.upload.lessons.Count;
+                        }
                         if (count <= 0)
                         {
                             uploadId = enroll.contest.cipher;
@@ -198,6 +202,10 @@ namespace TEAMModelOS.SDK
                         {
                             count += enroll.upload.files.Count;
                         }
+                        if (enroll.upload != null && enroll.upload.lessons.IsNotEmpty())
+                        {
+                            count += enroll.upload.lessons.Count;
+                        }
                         if (count <= 0)
                         {
                             available = 5;
@@ -675,7 +683,7 @@ namespace TEAMModelOS.SDK
                             activityDto.contestType=enroll.contest.type;
 
                         }
-                        if (enroll.upload!=null  && (enroll.upload.files.IsNotEmpty()  ||  enroll.upload.sokrates.IsNotEmpty()))
+                        if (enroll.upload!=null  && (enroll.upload.files.IsNotEmpty()  ||  enroll.upload.sokrates.IsNotEmpty() ||  enroll.upload.lessons.IsNotEmpty())  )
                         {
                             activityDto.contestUpload=1;
                             activityDto.uploadTime=enroll.upload.uploadTime;

+ 8 - 0
TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -2211,6 +2211,10 @@ namespace TEAMModelOS.Controllers
                                         {
                                             count += leader.upload.files.Count;
                                         }
+                                        if (leader?.upload != null && leader.upload.lessons.IsNotEmpty())
+                                        {
+                                            count += leader.upload.lessons.Count;
+                                        }
                                         List<IdNameCode> members = result.list.Select(z => new IdNameCode { id = z.id, code = z.schoolId, picture = z.tmdPicture, nickname = z.tmdName, name = z.contest?.enrollInfos?.Find(e => e.code.Equals("name")).val }).ToList();
                                         var period = leader?.contest?.enrollInfos?.Find(z => z.code.Equals("period"));
                                         var subject = leader?.contest?.enrollInfos?.Find(z => z.code.Equals("subject"));
@@ -2243,6 +2247,10 @@ namespace TEAMModelOS.Controllers
                                     {
                                         count += leader.upload.files.Count;
                                     }
+                                    if (leader?.upload != null && leader.upload.lessons.IsNotEmpty())
+                                    {
+                                        count += leader.upload.lessons.Count;
+                                    }
                                     var period = leader?.contest?.enrollInfos?.Find(z => z.code.Equals("period"));
                                     var subject = leader?.contest?.enrollInfos?.Find(z => z.code.Equals("subject"));
                                     contestTask.name= $"{leader?.schoolName}-{name}";