成績統計增加子項目時間欄位

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

@@ -140,11 +140,11 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     public class ScoreCalcActivity : ScoreCalcActivityBase
     {
         public ScoreCalcActivity()
-        {            
+        {
             stuActScores = new List<List<double>>();
             stuActScoresOrg = new List<List<double>>();
-        }        
-       
+        }
+
         /// <summary>
         /// 各活動所屬學生成績
         /// </summary>
@@ -184,7 +184,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// <summary>
         /// 互動加權數
         /// </summary>
-        public double itactRate { get; set; }              
+        public double itactRate { get; set; }
 
         #region ==========出席==========
         /// <summary>
@@ -375,6 +375,11 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// 評量分數列表
         /// </summary>
         public List<double> sum { get; set; }
+        /// <summary>
+        /// 開始時間
+        /// </summary>
+        public long startTime { get; set; }
+
     }
     /// <summary>
     /// 取作業活動Id
@@ -405,6 +410,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// school id
         /// </summary>
         public string school { get; set; }
+        /// <summary>
+        /// 開始時間
+        /// </summary>
+        public long startTime { get; set; }
     }
 
     #region （四）更新成績統計首頁表資料用
@@ -522,7 +531,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// <summary>
     /// 更新公式資料用的 細項參數
     /// </summary>
-    public class ScoreCalcFuncRq: ScoreCalcFunc
+    public class ScoreCalcFuncRq : ScoreCalcFunc
     {
         /// <summary>
         /// 是否為使用中的公式
@@ -551,7 +560,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// </summary>
         public double rate { get; set; }
     }
-    
+
     public class UpdateActivityActRq : UpdateScoreCalcActRqBase
     {
         public UpdateActivityActRq()
@@ -563,13 +572,13 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// </summary>
         public List<SubActActivity> items { get; set; }
     }
-   
+
     public class UpdateLsRecordActRq : UpdateScoreCalcActRqBase
     {
         public UpdateLsRecordActRq()
         {
             items = new List<SubActLsRecord>();
-        }             
+        }
         /// <summary>
         /// 子項目資料列表
         /// </summary>
@@ -582,7 +591,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// 原始成績Base
     /// </summary>
     public class ExportOrgDataBase
-    {       
+    {
         /// <summary>
         /// 名稱
         /// </summary>
@@ -605,7 +614,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// <summary>
     /// 課堂成績大項
     /// </summary>
-    public class ExportOrgLsRecordData  : ExportOrgDataBase
+    public class ExportOrgLsRecordData : ExportOrgDataBase
     {
         public ExportOrgLsRecordData()
         {
@@ -694,7 +703,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     /// <summary>
     /// 更新課堂子項目成績 參數
     /// </summary>
-    public class UpdateScoreLessonRq: UpdateScoreBase
+    public class UpdateScoreLessonRq : UpdateScoreBase
     {
         public UpdateScoreLessonRq()
         {
@@ -734,6 +743,32 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
     #endregion
 
 
+
+    #region （十七）查詢項目屬性資料
+    public class ItemProps
+    {
+        /// <summary>
+        /// 項目id
+        /// </summary>
+        public string id { get; set; }
+        /// <summary>
+        /// 項目名稱
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 時間
+        /// </summary>
+        public long startTime { get; set; }
+        /// <summary>
+        /// 項目類別
+        /// </summary>
+        public string type { get; set; }        
+
+    }
+
+    #endregion
+
+
     #region API回傳資料用
 
     #region （二）查詢成績統計首頁表資料用
@@ -890,6 +925,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// 是否為自訂子項目
         /// </summary>
         public bool custom { get; set; }
+        /// <summary>
+        /// 開始時間
+        /// </summary>
+        public long startTime { get; set; }
 
     }
     /// <summary>
@@ -958,10 +997,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.School
         /// <summary>
         /// 總評分
         /// </summary>
-        public List<double> editScores { get; set; }        
+        public List<double> editScores { get; set; }
     }
 
-    
+
 
     #region （十四）更新成績統計順序 （十五）更新活動項目順序 （十六）更新活動子項目順序
     /// <summary>

TEAMModelOS/Controllers/Both/ScoreCalcController.cs

@@ -2403,7 +2403,7 @@ namespace TEAMModelOS.Controllers
                         }
                         break;
                     case "exam":
-                        sql = $"SELECT c.id, c.name, c.startTime, c.source FROM c where c.id in ({idssb}) and c.pk = 'Exam'";
+                        sql = $"SELECT c.id, c.name, c.startTime, c.source as type FROM c where c.id in ({idssb}) and c.pk = 'Exam'";
                         await foreach (var item in clientCommon.GetItemQueryIterator<ItemProps>(queryText: sql))
                         {
                             ItemPropsList.Add(item);