已通过自测的能力点成长值 exerciseAbility

TEAMModelOS.SDK/Models/Cosmos/Research/TeacherTrain.cs

@@ -159,13 +159,14 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public List<TeacherAility> teacherAilities { get; set; } = new List<TeacherAility>();
         /// <summary>
-        /// 已学能力点， 是勾选了，还是有观看视频的，还是
+        /// 已学能力点，视频观看达标，并且上传了认证材料，并且能力点自测通过才能获得
         /// </summary>
         public int learnAbility { get; set; }
         /// <summary>
-        /// 已通过自测的能力点数量
+        /// 已通过自测的能力点成长值,  与J哥 ，郭杰确认。只计算通过能力点自测就能获得的成长值。
         /// </summary>
         public int exerciseAbility { get; set; }
+
         /// <summary>
         /// 需要上传的总数
         /// </summary>

TEAMModelOS.SDK/Models/Service/StatisticsService.cs

@@ -603,21 +603,21 @@ namespace TEAMModelOS.SDK
                     if (item.exerciseScore > 0)
                     {
                         if (currencyInt == 1)
-                        {
-                            currency.exerciseAbility += 1;
+                        {// 与J哥 ，郭杰确认。只计算通过能力点自测就能获得的成长值。 并取消已学能力点  learnAbility
+                            currency.exerciseAbility += ability.abilityCount;
                             //并且完全看完视频和文档。
-                            if (item.allDone) {
-                                currency.learnAbility += ability.abilityCount;
+                            if (item.allDone)
+                            {
+                                currency.learnAbility += 1;
                             }
-                            
+
                         }
                         //并且完全看完视频和文档。
                         if (item.allDone)
                         {
-                            currencyAll.learnAbility += ability.abilityCount;
+                            currencyAll.learnAbility += 1;
                         }
-                        currencyAll.exerciseAbility += 1;
-                        
+                        currencyAll.exerciseAbility += ability.abilityCount;
                     }
 
                     List<TeacherHprecord> hprecords = new List<TeacherHprecord>();