update .

TEAMModelBI/Controllers/OpenApi/GroupListController.cs

@@ -57,13 +57,13 @@ namespace TEAMModelAPI.Controllers
             "periodId":"学段（选填）"
          */
         /// <summary>
-        ///  获取学校的行政班，教学班，教研组，研修名单
+        ///  名单列表信息 获取学校的行政班，教学班，教研组，研修名单
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-group-list")]
-        [ApiToken(Auth = "1201", Name = "学校名单列表", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1201", Name = "名单列表信息", RWN = "R", Limit = false)]
         public async Task<IActionResult> GetGroupList(JsonElement json)
         {
             var client = _azureCosmos.GetCosmosClient();
@@ -157,9 +157,14 @@ namespace TEAMModelAPI.Controllers
                 groupLists = groupLists.Select(x => new { x.id, x.type, x.name, x.periodId, x.school, x.scope, x.year })
             });
         }
+        /// <summary>
+        /// 名单成员信息,学生成员信息，包含（学生，成员）基本信息，分组等信息
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-group-members")]
-        [ApiToken(Auth = "1202", Name = "获取名单详细信息和成员信息", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1202", Name = "名单成员信息", RWN = "R", Limit = false)]
         public async Task<IActionResult> GetGroupMembers(JsonElement json)
         {
             var client = _azureCosmos.GetCosmosClient();
@@ -314,7 +319,7 @@ namespace TEAMModelAPI.Controllers
                             scope = "school",
                             school = school,
                             type = "teach",
-                            year = list.year,
+                            year = list.year > 2000 ?DateTimeOffset.UtcNow.Year: groupList.year,
                             froms = 3
                         };
                         groupList = await GroupListService.CheckListNo(groupList, _azureCosmos, _dingDing, _option);
@@ -332,6 +337,7 @@ namespace TEAMModelAPI.Controllers
                             groupList.school = school;
                             groupList.scope = "school";
                             groupList.froms = 3;
+                            groupList.year = list.year > 2000 ? list.year : groupList.year;
                             await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).ReplaceItemAsync(groupList, groupList.id, new PartitionKey(groupList.code));
                         }
                         else
@@ -345,7 +351,7 @@ namespace TEAMModelAPI.Controllers
                                 scope = "school",
                                 school = school,
                                 type = "teach",
-                                year = list.year,
+                                year = list.year > 2000 ? DateTimeOffset.UtcNow.Year : groupList.year,
                                 froms = 3
                             };
                             groupList = await GroupListService.CheckListNo(groupList, _azureCosmos, _dingDing, _option);
@@ -363,7 +369,7 @@ namespace TEAMModelAPI.Controllers
                 }
             }
              
-            return Ok(new { groupLists, errorData });
+            return Ok(new { groupLists=groupLists.Select(x=>new { x.name,x.no,x.periodId,x.school,x.type,x.year,x.tcount,x.scount,x.id}), errorData });
         }
 
         public class MemberImpt {
@@ -397,7 +403,7 @@ namespace TEAMModelAPI.Controllers
             }
             catch (Exception ex)
             {
-                await _dingDing.SendBotMsg($"{_coreAPIHttpService.options.Get("Default").location}用户转换失败：{_coreAPIHttpService.options.Get("Default").url}{tmdstr}\n {ex.Message}\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
+                await _dingDing.SendBotMsg($"开放平台导入教学班 import-teach-members：{_coreAPIHttpService.options.Get("Default").location}用户转换失败：{_coreAPIHttpService.options.Get("Default").url}{tmdstr}\n {ex.Message}\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
                 //return Ok(new { error =3, msg = "醍摩豆ID验证错误！" });
             }
             var unexist_student = stus.Select(x => x.id).Except(students.Select(y => y.id));
@@ -436,7 +442,7 @@ namespace TEAMModelAPI.Controllers
             }
             else
             {
-                return Ok(new { error = 2, msg = "名单错误！" });
+                return Ok(new { error = 2, msg = "名单不存在！" });
             }
         }
 
@@ -494,7 +500,7 @@ namespace TEAMModelAPI.Controllers
                     return Ok(new { remove_stuids, remove_tmdids, list });
                 }
                 else {
-                    return Ok(new { error = 2, msg = "名单错误！" });
+                    return Ok(new { error = 2, msg = "名单不存在！" });
                 }
             }
             else 

TEAMModelBI/Controllers/OpenApi/RoomController.cs

@@ -51,13 +51,13 @@ namespace TEAMModelAPI.Controllers
             _azureStorage = azureStorage;
         }
         /// <summary>
-        /// 获取物理教室列表
+        /// 物理教室列表
         /// </summary>
         /// <param name="json"></param>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-room-list")]
-        [ApiToken(Auth = "1401", Name = "获取物理教室列表", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1401", Name = "物理教室列表", RWN = "R", Limit = false)]
         public async Task<IActionResult> GetRoomList(JsonElement json)
         {
             var client = _azureCosmos.GetCosmosClient();
@@ -82,13 +82,13 @@ namespace TEAMModelAPI.Controllers
             return Ok(new { rooms = rooms.Select(x => new { x.id, x.name, x.x, x.y, x.openType, x.style, x.area, x.address, school = school }) });
         }
         /// <summary>
-        /// 获取物理教室详细信息
+        /// 物理教室详细
         /// </summary>
         /// <param name="json"></param>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-room-info")]
-        [ApiToken(Auth = "1402", Name = "获取物理教室详细信息", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1402", Name = "物理教室详细", RWN = "R", Limit = false)]
         public async Task<IActionResult> GetRoomInfo(JsonElement json)
         {
             var (id, school) = HttpContext.GetApiTokenInfo();
@@ -114,13 +114,13 @@ namespace TEAMModelAPI.Controllers
         }
 
         /// <summary>
-        /// 创建更新物理教室
+        /// 教室批量创建更新
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-room-infos")]
-        [ApiToken(Auth = "1403", Name = "创建更新物理教室", RWN = "W", Limit = false)]
+        [ApiToken(Auth = "1403", Name = "教室批量创建更新", RWN = "W", Limit = false)]
         public async Task<IActionResult> UpsertRoomInfo(RoomsDto json)
         {
             var (id, school) = HttpContext.GetApiTokenInfo();

TEAMModelBI/Controllers/OpenApi/SchoolController.cs

@@ -53,7 +53,7 @@ namespace TEAMModelAPI.Controllers
             _coreAPIHttpService=coreAPIHttpService;
         }
         /// <summary>
-        ///  学校基础信息
+        ///  第三方获取学校列表
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -67,13 +67,13 @@ namespace TEAMModelAPI.Controllers
             return Ok(new { schools = schools.Select(x => new {id =x.RowKey,x.name,x.picture })});
         }
         /// <summary>
-        ///  学校基础信息
+        ///  学校基本信息
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-school-info")]
-        [ApiToken(Auth = "1001",Name = "学校基础信息", RWN = "R", Limit =false)]
+        [ApiToken(Auth = "1001",Name = "学校基本信息", RWN = "R", Limit =false)]
         public async Task<IActionResult> GetSchoolInfo()
         {
             var (id, school) = HttpContext.GetApiTokenInfo();

TEAMModelBI/Controllers/OpenApi/TeacherController.cs

@@ -57,13 +57,13 @@ namespace TEAMModelAPI.Controllers
         }
 
         /// <summary>
-        ///  获取学校教师列表
+        ///  教师列表信息
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-teacher-list")]
-        [ApiToken(Auth = "1501", Name = "学校教师列表", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1501", Name = "教师列表信息", RWN = "R", Limit = false)]
         public async Task<IActionResult> GetTeacherList(JsonElement json)
         {
 
@@ -122,12 +122,12 @@ namespace TEAMModelAPI.Controllers
             });
         }
         /// <summary>
-        /// 获取学校教师信息
+        /// 教师详细信息
         /// </summary>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("get-teacher-info")]
-        [ApiToken(Auth = "1502", Name = "学校教师信息", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1502", Name = "教师详细信息", RWN = "R", Limit = false)]
         public async Task<IActionResult> GetTeacherInfo(JsonElement json)
         {
             json.TryGetProperty("tmdid", out JsonElement _tmdid);
@@ -161,12 +161,12 @@ namespace TEAMModelAPI.Controllers
 
 
         /// <summary>
-        /// 批量导入教师信息，并加入学校。可以导入学科，但需要填写学段id
+        /// 教师批量导入，并加入学校。可以导入学科，但需要填写学段id
         /// </summary>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("import-school-teacher")]
-        [ApiToken(Auth = "1503", Name = "批量导入教师", RWN = "R", Limit = false)]
+        [ApiToken(Auth = "1503", Name = "教师批量导入", RWN = "R", Limit = false)]
         public async Task<IActionResult> ImportSchoolTeacher(ImportTechDto json)
         {
             //如果需要同时导入学科，则需要填写学段

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -203,7 +203,7 @@ namespace TEAMModelOS.SDK
             }
             return data;
         }
-        public static (int status, GroupList stuList) JoinList(GroupList stuList, string userid, int type, string school)
+        public static (int status, GroupList stuList) JoinList(GroupList stuList, string userid, int type, string school,Member member=null)
         {
             int status = -1;
             if (!string.IsNullOrWhiteSpace(stuList.school) && !string.IsNullOrWhiteSpace(school))