|
@@ -216,8 +216,10 @@ namespace TEAMModelBI.Controllers.BISchool
|
|
|
period = PresetSchoolPeriod(bischool.period, foundSchools.lang, campusId),
|
|
|
scale = bischool.size >= 300 ? 500 : 0,
|
|
|
isinit = true,
|
|
|
+ modules=bischool.modules,
|
|
|
openLessonRecord = (_option.Location.Contains("Global")) ? false : true,
|
|
|
- createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
|
|
|
+ createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
|
|
|
+
|
|
|
};
|
|
|
scInfos.Add(createSchoolInfo);
|
|
|
vsSql.Append($"{upSchool.name}【{upSchool.id}】,");
|
|
@@ -1044,6 +1046,15 @@ namespace TEAMModelBI.Controllers.BISchool
|
|
|
jsonElement.TryGetProperty("address", out JsonElement address);
|
|
|
string code = (jsonElement.TryGetProperty("code", out JsonElement _code))? _code.GetString() : string.Empty;
|
|
|
jsonElement.TryGetProperty("assist", out JsonElement assist);
|
|
|
+ List<string> modules = null ;
|
|
|
+ if (!jsonElement.TryGetProperty("modules ", out JsonElement _modules))
|
|
|
+ {
|
|
|
+ return BadRequest();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ modules= _modules.ToObject<List<string>>();
|
|
|
+ }
|
|
|
+
|
|
|
List<IdInfo> idInfos = assist.ToObject<List<IdInfo>>();
|
|
|
//jsonElement.TryGetProperty("site", out JsonElement site);//分开部署,就不需要,一站多用时,取消注释
|
|
|
|
|
@@ -1074,6 +1085,9 @@ namespace TEAMModelBI.Controllers.BISchool
|
|
|
//});
|
|
|
|
|
|
//tempShool.period = periods;
|
|
|
+ if (modules!=null) {
|
|
|
+ tempShool.modules=modules;
|
|
|
+ }
|
|
|
tempShool.size = !string.IsNullOrEmpty($"{size}") ? int.Parse($"{size}") : tempShool.size;
|
|
|
tempShool.scale = !string.IsNullOrEmpty($"{scale}") ? int.Parse($"{scale}") : tempShool.scale;
|
|
|
tempShool.picture = $"{picture}";
|
|
@@ -1956,6 +1970,10 @@ namespace TEAMModelBI.Controllers.BISchool
|
|
|
/// 区域标准
|
|
|
/// </summary>
|
|
|
public string standard { get; set; }
|
|
|
+ /// <summary>
|
|
|
+ /// 手动增加的模块 ["art"]
|
|
|
+ /// </summary>
|
|
|
+ public List<string> modules { get; set; } = new List<string>();
|
|
|
}
|
|
|
|
|
|
/// <summary>
|