追加欄位 學習型態: 無

TEAMModelOS.SDK/Models/Cosmos/School/ProductAnalysis.cs

@@ -127,6 +127,7 @@ namespace TEAMModelOS.SDK.Models
         public int lTypeMis { get; set; } //學習型態: 任務
         public int lTypeTst { get; set; } //學習型態: 測驗
         public int lTypeDif { get; set; } //學習型態: 差異化
+        public int lTypeNone { get; set; } //學習型態: 無
         public int lessonCnt928 { get; set; } //使用928授權課堂數
         public int lessonCntId { get; set; } //僅使用ID授權課堂數
         public int lessonCntDevice { get; set; } //僅使用機器授權課堂數

TEAMModelOS.SDK/Models/Service/BI/BIProdAnalysis.cs

@@ -39,7 +39,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 var redisClinet8 = _azureRedis.GetRedisClient(8);
                 var datetime = DateTimeOffset.UtcNow;
                 var ynow = datetime.Year;
-                List<string> calPropList = new List<string>() { "lessonRecord", "useIES", "useIES5Resource", "useWebIrs", "useDeviceIrs", "useHaboard", "useHita", "lessonLengMin", "stuShow", "stuLessonLengMin", "tGreen", "lTypeCoop", "lTypeIact", "lTypeMis", "lTypeTst", "lTypeDif", "lessonCnt928", "lessonCntId", "lessonCntDevice", "lessonCntIdDevice", "mission", "missionFin", "item", "interact" }; //要計算的ProdAnalysis欄位列表
+                List<string> calPropList = new List<string>() { "lessonRecord", "useIES", "useIES5Resource", "useWebIrs", "useDeviceIrs", "useHaboard", "useHita", "lessonLengMin", "stuShow", "stuLessonLengMin", "tGreen", "lTypeCoop", "lTypeIact", "lTypeMis", "lTypeTst", "lTypeDif", "lTypeNone", "lessonCnt928", "lessonCntId", "lessonCntDevice", "lessonCntIdDevice", "mission", "missionFin", "item", "interact" }; //要計算的ProdAnalysis欄位列表
                 //取得CS Redis TeachingData (IOT紀錄只有三個月分)
                 List<IotTeachingData> IotTeachingDataList = new List<IotTeachingData>();
                 if (y.Equals(ynow.ToString()))
@@ -168,6 +168,7 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                             if (IotTeachingDatRow.lTypeMis.Equals("1")) prodAnalysisRow.lTypeMis++;
                             if (IotTeachingDatRow.lTypeTst.Equals("1")) prodAnalysisRow.lTypeTst++;
                             if (IotTeachingDatRow.lTypeDif.Equals("1")) prodAnalysisRow.lTypeDif++;
+                            if (IotTeachingDatRow.lTypeCoop.Equals("0") && IotTeachingDatRow.lTypeIact.Equals("0") && IotTeachingDatRow.lTypeMis.Equals("0") && IotTeachingDatRow.lTypeTst.Equals("0") && IotTeachingDatRow.lTypeDif.Equals("0")) prodAnalysisRow.lTypeNone++;
                             prodAnalysisRow.mission += IotTeachingDatRow.mission;
                             prodAnalysisRow.missionFin += IotTeachingDatRow.missionFin;
                             prodAnalysisRow.item += IotTeachingDatRow.item;