Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -309,7 +309,7 @@ namespace TEAMModelOS.SDK
                     //状态=5 ,人数已满
                     return (5, item, null);
                 }
-                data = JoinList(item, userid, type, school,year);
+                data = JoinList(item, userid, type, school,year,seatNo);
                 //TODO 需要考虑已经通过别的途径加入名单，但是缓存数据仍记录数据的问题。 还要考虑手动加入过的。或者在获取名未加入名单成员的临时缓存数据的时候过滤已经加入的。
                 break;
             }

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -140,8 +140,10 @@ namespace TEAMModelOS.Controllers
             json.TryGetProperty("school", out JsonElement school);
             json.TryGetProperty("courseId", out JsonElement _courseId);
             int seatNo = 0;
-            if (json.TryGetProperty("seatNo", out JsonElement _seatNo)  &&  int.TryParse($"{_seatNo}", out seatNo)) { 
-
+            if (json.TryGetProperty("seatNo", out JsonElement _seatNo)  ) {
+                if (int.TryParse($"{_seatNo}", out int __seatNo)) {
+                    seatNo=__seatNo;
+                }
             }
             var client = _azureCosmos.GetCosmosClient();
             json.TryGetProperty("id_token", out JsonElement id_token);

TEAMModelOS/Controllers/Teacher/TeacherCommonController.cs

@@ -4,6 +4,7 @@ using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -323,13 +324,14 @@ namespace TEAMModelOS.Controllers
             {
                 stuListsSql = $" and    {andSqlStulist }  ";
             }
-            string joinSubject = "join A2 in c.subjects";
+            //string joinSubject = "join A2 in c.subjects";
             string subjectSql = string.Empty;
-            if (request.TryGetProperty("subjectId", out JsonElement sub)) {
-                subjectSql = $" and   A2.id = '{sub})'";
+            if (request.TryGetProperty("subjectId", out JsonElement sub) && type.Equals("Exam"))
+            {
+                 subjectSql = $" and  c.subjects[0].id = '{sub}'";
             }
 
-                List<JsonElement> datas = new List<JsonElement>();
+            List<JsonElement> datas = new List<JsonElement>();
             var client = _azureCosmos.GetCosmosClient();
             //班主任 ，任课教师只需要查询两种校园活动 和班级活动 ，  不查询私人教室创建的活动。  
             if (!string.IsNullOrWhiteSpace(school) && classes.IsNotEmpty())
@@ -351,12 +353,12 @@ namespace TEAMModelOS.Controllers
                 if (classes.IsNotEmpty())
                 {
                     string queryTeacherClass = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime ,c.source,c.type" +
-                        $" FROM c  {joinSqlClasses} {joinSubject}    where    {pksql}     {stuListsSql} {subjectSql} and   (c.status<>404 or IS_DEFINED(c.status) = false )     ";
+                        $" FROM c  {joinSqlClasses}    where    {pksql}     {stuListsSql} {subjectSql}  and   (c.status<>404 or IS_DEFINED(c.status) = false )     ";
                     var resultC = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<JsonElement>(queryTeacherClass, $"{type}-{id}");
                     datas.AddRange(resultC.list);
 
                     string queryTeacherStulist = $" SELECT distinct c.owner,c.sStatus, c.id,c.code, c.classes,c.stuLists,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime ,c.source,c.type" +
-                        $" FROM c  {joinSqlStulist}  {joinSubject}  where    {pksql}     {classesSql} {subjectSql}  and   (c.status<>404 or IS_DEFINED(c.status) = false )     ";
+                        $" FROM c  {joinSqlStulist}   where    {pksql}     {classesSql} {subjectSql} and   (c.status<>404 or IS_DEFINED(c.status) = false )     ";
                     var resultD = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<JsonElement>(queryTeacherStulist, $"{type}-{id}");
                     datas.AddRange(resultD.list);
                 }

TEAMModelOS/TEAMModelOS.csproj

@@ -110,7 +110,7 @@
     <!-- Build Target: Restore NPM packages using npm -->
     <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
 
-    <Exec WorkingDirectory="$(SpaRoot)" Command="cnpm install" />
+    <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
   </Target>
 
   <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">