调整包名

TEAMModelFunction/TriggerExamLite.cs

@@ -8,7 +8,6 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.School;
 
 namespace TEAMModelFunction
 {

TEAMModelFunction/TriggerStudy.cs

@@ -8,7 +8,6 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.School;
 
 namespace TEAMModelFunction
 {

TEAMModelOS.SDK/Models/Cosmos/Common/ExamLite.cs

@@ -4,7 +4,7 @@ using System.Text;
 using System.Text.Json;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.School
+namespace TEAMModelOS.SDK.Models
 {
     public class ExamLite : CosmosEntity
     {

TEAMModelOS.SDK/Models/Cosmos/Common/Study.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
 
-namespace TEAMModelOS.SDK.Models.Cosmos.School
+namespace TEAMModelOS.SDK.Models
 {
     public class Study : CosmosEntity
     {

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

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos
+namespace TEAMModelOS.SDK.Models
 {
     public class ClassAnalysis
     {

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

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Models.Cosmos
+namespace TEAMModelOS.SDK.Models
 {
     public class GradeAnalysis
     {

TEAMModelOS.SDK/Models/Service/ExamService.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Models.Cosmos.School;
 
 namespace TEAMModelOS.SDK.Models.Service
 {

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -20,8 +20,6 @@ using Azure.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
 using static TEAMModelOS.SDK.Models.Cosmos.Student.StudentAnalysis;
 using TEAMModelOS.SDK.Models.Cosmos;
-using static TEAMModelOS.SDK.Models.Cosmos.ClassAnalysis;
-using static TEAMModelOS.SDK.Models.Cosmos.GradeAnalysis;
 using System.Text;
 
 namespace TEAMModelOS.Controllers.Analysis

TEAMModelOS/Controllers/Common/AreaController.cs

@@ -19,7 +19,6 @@ using TEAMModelOS.SDK.DI.AzureCosmos.Inner;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.School;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/Common/ExamLiteController.cs

@@ -16,7 +16,6 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.School;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers.Common

TEAMModelOS/Controllers/Common/StudyController.cs

@@ -15,7 +15,6 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.School;
 
 namespace TEAMModelOS.Controllers.Common
 {

TEAMModelOS/Controllers/Research/AbilityStatisticsController.cs

@@ -125,34 +125,34 @@ namespace TEAMModelOS.Controllers.Research
             //线下 学校研修活动
 
 
-            //await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Common")
-            //.GetItemQueryIterator<Study>(queryText: $"select c.owner, c.teachers,c.targets  from c  join A0 in c.teachers  where   A0.id='{_tmdid}' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Study-{_school}") }))
-            //{
+            await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Common")
+            .GetItemQueryIterator<Study>(queryText: $"select c.owner, c.teachers,c.targets  from c  join A0 in c.teachers  where   A0.id='{_tmdid}' ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Study-{_school}") }))
+            {
 
-            //    if (!string.IsNullOrEmpty(item.owner))
-            //    {
-            //        if (item.owner.Equals("school"))
-            //        {
-            //            offlineSchoolJoinCount += 1;
-            //            var tech = item.teachers.Find(x => x.id.Equals($"{_tmdid}"));
-            //            if (tech != null && tech.signTime > 0)
-            //            {
-            //                offlinelTime += item.hour;
-            //                offlineSchoolDoneCount += 1;
-            //            }
-            //        }
-            //        else if (item.owner.Equals("area"))
-            //        {
-            //            offlineAreaJoinCount += 1;
-            //            var tech = item.teachers.Find(x => x.id.Equals($"{_tmdid}"));
-            //            if (tech != null && tech.signTime > 0)
-            //            {
-            //                offlinelTime += item.hour;
-            //                offlineAreaDoneCount += 1;
-            //            }
-            //        }
-            //    }
-            //}
+                if (!string.IsNullOrEmpty(item.owner))
+                {
+                    if (item.owner.Equals("school"))
+                    {
+                        offlineSchoolJoinCount += 1;
+                        var tech = item.teachers.Find(x => x.id.Equals($"{_tmdid}"));
+                        if (tech != null && tech.signTime > 0)
+                        {
+                            offlinelTime += item.hour;
+                            offlineSchoolDoneCount += 1;
+                        }
+                    }
+                    else if (item.owner.Equals("area"))
+                    {
+                        offlineAreaJoinCount += 1;
+                        var tech = item.teachers.Find(x => x.id.Equals($"{_tmdid}"));
+                        if (tech != null && tech.signTime > 0)
+                        {
+                            offlinelTime += item.hour;
+                            offlineAreaDoneCount += 1;
+                        }
+                    }
+                }
+            }
 
 
 

TEAMModelOS/MSBuild_Logs/MSBuild_pid-10400_21a57e9d9a3747d1a0a1fffd1d5363ac.failure.txt

@@ -0,0 +1,15 @@
+UNHANDLED EXCEPTIONS FROM PROCESS 10400:
+=====================
+2021/9/10 11:25:43
+System.UnauthorizedAccessException: 对路径“C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\MSBuild_Logs”的访问被拒绝。
+   在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath)
+   在 System.IO.Directory.InternalCreateDirectory(String fullPath, String path, Object dirSecurityObj, Boolean checkHost)
+   在 System.IO.Directory.InternalCreateDirectoryHelper(String path, Boolean checkHost)
+   在 Microsoft.Build.Shared.ExceptionHandling.DumpExceptionToFile(Exception ex)
+   在 Microsoft.Build.BackEnd.NodeEndpointOutOfProcBase.RunReadLoop(Stream localReadPipe, Stream localWritePipe, ConcurrentQueue`1 localPacketQueue, AutoResetEvent localPacketAvailable, AutoResetEvent localTerminatePacketPump)
+   在 Microsoft.Build.BackEnd.NodeEndpointOutOfProcBase.PacketPumpProc()
+   在 System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state, Boolean preserveSyncCtx)
+   在 System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state, Boolean preserveSyncCtx)
+   在 System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state)
+   在 System.Threading.ThreadHelper.ThreadStart()
+===================