调整计数逻辑

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -20,14 +20,16 @@ namespace TEAMModelOS.SDK.Models.Service
         /// <param name="_dingDing"></param>
         /// <param name="data"></param>
         /// <returns></returns>
-        public static LessonDis DisLessonCount( LessonRecord oldRecord, LessonRecord newRecord, LessonDis lessonDis) {
+        public static LessonDis DisLessonCount(LessonRecord oldRecord, LessonRecord newRecord, LessonDis lessonDis)
+        {
             //创建课堂的情况
             if (oldRecord == null && newRecord != null)
             {
                 lessonDis.record = 1;
             }
             //删除数据的情况
-            else if (oldRecord != null && newRecord == null){
+            else if (oldRecord != null && newRecord == null)
+            {
                 lessonDis.record = -1;
                 //P分数量加减
                 if (oldRecord.pScore >= 70)
@@ -39,14 +41,18 @@ namespace TEAMModelOS.SDK.Models.Service
                 {
                     lessonDis.disTCount = -1;
                 }
-                if (oldRecord.tScore >= 70 && oldRecord.pScore >= 70) {
+                if (oldRecord.tScore >= 70 && oldRecord.pScore >= 70)
+                {
                     lessonDis.disTCount = -1;
                 }
             }
             //无效操作
-            else if (oldRecord == null && newRecord == null){
-            //前后操作都有值，则表示更新
-            }else {
+            else if (oldRecord == null && newRecord == null)
+            {
+                //前后操作都有值，则表示更新
+            }
+            else
+            {
                 //P分数量加减
                 if (oldRecord.pScore >= 70)
                 {
@@ -123,18 +129,18 @@ namespace TEAMModelOS.SDK.Models.Service
                 {
                     using var json = await JsonDocument.ParseAsync(response.ContentStream);
                     LessonCount count = json.ToObject<LessonCount>();
-                    if (count.courseIds.Count > 0)
+
+                    count.tCount[day] += lessonDis.disTCount;
+                    count.pCount[day] += lessonDis.disPCount;
+                    count.ptCount[day] += lessonDis.disDCount;
+                    count.beginCount[day] += lessonDis.record;
+                    /*if (!count.courseIds.Contains(data.courseId))
                     {
-                        count.tCount[day] += lessonDis.disTCount;
-                        count.pCount[day] += lessonDis.disPCount;
-                        count.ptCount[day] += lessonDis.disDCount;
-                        if (!count.courseIds.Contains(data.courseId))
-                        {
-                            count.courseIds.Add(data.courseId);
-                            count.beginCount[day] += 1;
-                        }
+                        count.courseIds.Add(data.courseId);
+                        count.beginCount[day] += 1;
+                    }*/
+
 
-                    }
                     await client.GetContainer("TEAMModelOS", tbname).ReplaceItemAsync(count, count.id, new PartitionKey(code));
                 }
                 else
@@ -150,9 +156,9 @@ namespace TEAMModelOS.SDK.Models.Service
                     List<double> listT = new List<double>(da);
                     List<double> listP = new List<double>(da);
                     List<double> listPT = new List<double>(da);
-                    list[day] += 1;
+                    list[day] += lessonDis.record;
                     listT[day] += lessonDis.disTCount;
-                    listP[day] +=lessonDis.disPCount;
+                    listP[day] += lessonDis.disPCount;
                     listPT[day] += lessonDis.disDCount;
                     count.beginCount.AddRange(list);
                     count.tCount.AddRange(listT);