update

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

@@ -56,6 +56,11 @@ namespace TEAMModelOS.SDK.Models
         /// 加入人数200人，学生加入已满200 自动关闭加入。可手动解除限制，开启审核时，关闭人数上限设置机制
         /// </summary>
         public int limitCount { get; set; } = 200;
+
+        /// <summary>
+        /// 自选座号 0 不允许，1 允许
+        /// </summary>
+        public int optNo { get; set; }
         /// <summary>
         /// 二维码 天数
         /// </summary>
@@ -124,6 +129,10 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int limitCount { get; set; } = 200;
         /// <summary>
+        /// 自选座号 0 不允许，1 运行
+        /// </summary>
+        public int optNo { get; set; }
+        /// <summary>
         /// 二维码过期时间
         /// </summary>
         public long qrcodeExpire { get; set; }
@@ -283,6 +292,7 @@ namespace TEAMModelOS.SDK.Models
             this.qrcodeDays = groupList.qrcodeDays;
             this.review=groupList.review;
             this.limitCount = groupList.limitCount;
+            this.optNo=groupList.optNo;
             this.grades = groupList.grades;
 
         }
@@ -310,6 +320,7 @@ namespace TEAMModelOS.SDK.Models
             this.qrcodeDays = groupList.qrcodeDays;
             this.review=groupList.review;
             this.limitCount = groupList.limitCount;
+            this.optNo= groupList.optNo;
             this.grades = groupList.grades;
 
         }
@@ -357,6 +368,10 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int limitCount { get; set; } = 200;
         /// <summary>
+        /// 自选座号 0 不允许，1 运行
+        /// </summary>
+        public int optNo { get; set; }
+        /// <summary>
         /// 二维码过期时间
         /// </summary>
         public long qrcodeExpire { get; set; }
@@ -401,6 +416,7 @@ namespace TEAMModelOS.SDK.Models
             this.qrcodeDays = groupList.qrcodeDays;
             this.review=groupList.review;
             this.limitCount = groupList.limitCount;
+            this.optNo= groupList.optNo;
             this.grades = groupList.grades;
             this.graduate = groupList.graduate;
         }
@@ -448,6 +464,10 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int limitCount { get; set; } = 200;
         /// <summary>
+        /// 自选座号 0 不允许，1 运行
+        /// </summary>
+        public int optNo { get; set; }
+        /// <summary>
         /// 二维码过期时间
         /// </summary>
         public long qrcodeExpire { get; set; }
@@ -566,6 +586,10 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public int limitCount { get; set; } = 200;
         /// <summary>
+        /// 自选座号 0 不允许，1 运行
+        /// </summary>
+        public int optNo { get; set; }
+        /// <summary>
         /// 二维码过期时间
         /// </summary>
         public long qrcodeExpire { get; set; }

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -221,6 +221,7 @@ namespace TEAMModelOS.SDK
                                 qrcodeDays = x.qrcodeDays,
                                 review=x.review,
                                 limitCount = x.limitCount,
+                                optNo = x.optNo,
                                 grades = x.grades,
                             });
                         }
@@ -879,6 +880,7 @@ namespace TEAMModelOS.SDK
                         joinLock=z.joinLock,
                         graduate=z.graduate,
                         review=z.review,
+                        optNo=z.optNo,
                         limitCount=z.limitCount,
                         qrcodeDays=z.qrcodeDays,
                         qrcodeExpire=z.qrcodeExpire,
@@ -905,6 +907,7 @@ namespace TEAMModelOS.SDK
                         joinLock=z.joinLock,
                         graduate=z.graduate,
                         review=z.review,
+                        optNo=z.optNo,
                         limitCount=z.limitCount,
                         qrcodeDays=z.qrcodeDays,
                         qrcodeExpire=z.qrcodeExpire,
@@ -1362,6 +1365,7 @@ namespace TEAMModelOS.SDK
                                         froms = x.froms,
                                         joinLock = x.joinLock,
                                         qrcodeExpire = x.qrcodeExpire,
+                                        optNo = x.optNo,
                                         qrcodeDays = x.qrcodeDays,
                                         review=x.review,
                                         limitCount = x.limitCount,

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -654,11 +654,11 @@ namespace TEAMModelOS.Controllers.Client
                     }
 
                     #endregion
-                    groupListWithCourseTaskId = await SaveGroupList(creatorId.GetString(), groupListName.GetString(), courseBase.id, limitCount.GetInt32());
+                    groupListWithCourseTaskId = await SaveGroupList(creatorId.GetString(), groupListName.GetString(), courseBase.id, isOptionalSeat, limitCount.GetInt32() );
                 }
                 else 
                 {
-                    groupListWithCourseTaskId = await SaveGroupList(creatorId.GetString(), groupListName.GetString(), courseId.GetString(), limitCount.GetInt32());
+                    groupListWithCourseTaskId = await SaveGroupList(creatorId.GetString(), groupListName.GetString(), courseId.GetString(), isOptionalSeat, limitCount.GetInt32());
                 }
 
                 string apiUrl = this.Request.GetRequestUrlAddress();
@@ -691,7 +691,7 @@ namespace TEAMModelOS.Controllers.Client
         /// <param name="limitCount"></param>
         /// <param name="joinLock"></param>
         /// <returns></returns>
-        private async Task<GroupListWithCourseTaskId> SaveGroupList(string creatorId, string groupListName, string courseId, int limitCount = 200, int joinLock = 1)
+        private async Task<GroupListWithCourseTaskId> SaveGroupList(string creatorId, string groupListName, string courseId,JsonElement isOptionalSeat, int limitCount = 200, int joinLock = 1)
         {
             try
             {
@@ -700,6 +700,11 @@ namespace TEAMModelOS.Controllers.Client
                 //{
                 //    return BadRequest();
                 //}
+                int optNo = 0;
+                if (isOptionalSeat.ValueKind.Equals(JsonValueKind.True)) {
+                    optNo=1;
+                }
+                
                 GroupListWithCourseTaskId groupListWithCourseTaskId = new();
                 GroupList list = new();
                 list.year = list.year > 0 ? list.year : DateTimeOffset.UtcNow.Year;
@@ -713,6 +718,7 @@ namespace TEAMModelOS.Controllers.Client
                 list.scope = "private";
                 list.joinLock = joinLock;
                 list.limitCount = limitCount;
+                list.optNo=optNo;
                 list.type = "teach";
                 GroupList dblist = null;
                 if (!string.IsNullOrWhiteSpace(list.id))
@@ -1056,6 +1062,11 @@ namespace TEAMModelOS.Controllers.Client
                 //設定需更新的欄位值
                 groupList.limitCount = _limitCount.GetInt32();
                 //groupList.isOptionalSeat = isOptionalSeat.GetString();
+                int optNo = 0;
+                if (_isOptionalSeat.ValueKind.Equals(JsonValueKind.True)) {
+                    optNo=1;
+                }
+                groupList.optNo=optNo;
                 groupList.joinLock = _joinLock.GetInt32();
 
                 //更新

TEAMModelOS/Controllers/XTest/BillController.cs

@@ -429,7 +429,7 @@ namespace TEAMModelOS.Controllers.XTest
                 }
                 return Ok(new {   monthData, dayData, dict, dictCond, code=200});
             } catch (Exception ex) {
-                return Ok(new { code = 500 });
+                return Ok(new { code = 500 ,msg= $"{ex.Message}{ex.StackTrace}"});
             }
            
         }