Browse Source

新增名单架构类型。、

CrazyIter_Bin 3 years ago
parent
commit
a95fbc625f

+ 2 - 2
TEAMModelOS.SDK/Models/Cosmos/Common/GroupList.cs

@@ -93,7 +93,7 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public string irs { get; set; }
         public string tag { get; set; }
-        public string groupId { get; set; }
+        // public string groupId { get; set; }
         public string groupName { get; set; }
     }
     public class RMember
@@ -132,7 +132,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 名单分组id
         /// </summary>
-        public string groupId { get; set; }
+        //public string groupId { get; set; }
         /// <summary>
         /// 名单分组名称
         /// </summary>

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Teacher/StudyRecord.cs

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

+ 1 - 1
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -541,7 +541,7 @@ namespace TEAMModelOS.SDK.Models
                                 picture = y.picture,
                                 no = y.no,
                                 classId=y.classId,
-                                groupId=y.groupId,
+                                //groupId=y.groupId,
                                 groupName=y.groupName ,
                                 irs=y.irs,
                             }).ToList();

+ 0 - 2
TEAMModelOS/Controllers/Common/AreaController.cs

@@ -18,8 +18,6 @@ using TEAMModelOS.SDK.DI;
 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.Teacher;
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers

+ 0 - 1
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.Teacher;
 
 namespace TEAMModelOS.Controllers.Common
 {

+ 2 - 0
TEAMModelOS/Controllers/Research/AbilityStatisticsController.cs

@@ -175,6 +175,8 @@ namespace TEAMModelOS.Controllers
                     });
                 }
             }
+              
+
             //owner:  school  area
             //ÏßÏ ѧУÑÐÐ޻
             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher")

+ 1 - 1
TEAMModelOS/Controllers/School/GroupListController.cs

@@ -589,7 +589,7 @@ namespace TEAMModelOS.Controllers
                                 students.Add(item);
                             }     
                             ///行政班(学生搜寻classId动态返回)class
-                            List<RMember> smembers = students.Where(x => x.classId.Equals(clazz.id)).Select(y => new RMember { id = y.id, code = $"{_code}", name = y.name, type = 2, picture = y.picture, no = y.no,classId=y.classId, groupId = y.groupId, groupName = y.groupName }).ToList();
+                            List<RMember> smembers = students.Where(x => x.classId.Equals(clazz.id)).Select(y => new RMember { id = y.id, code = $"{_code}", name = y.name, type = 2, picture = y.picture, no = y.no,classId=y.classId, /*groupId = y.groupId,*/ groupName = y.groupName }).ToList();
                             groupList = new RGroupList
                             {
                                 id=clazz.id,