update 学段类型设置。

TEAMModelOS.FunctionV4/HttpTrigger/IESHttpTrigger.cs

@@ -105,44 +105,45 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                 foreach (var school in schools)
                 {
                     List<Period> periods = new List<Period>();
-                    var hastype_period = school.period.Where(p => p.type.IsNotEmpty());
+                    var hastype_period = school.period.Where(p => !string.IsNullOrWhiteSpace(p.periodType));
                     if (hastype_period.Any())
                     {
                         periods.AddRange(hastype_period);
                     }
-                    var nottype_period = school.period.Where(p => p.type.IsEmpty());
+                    var nottype_period = school.period.Where(p => string.IsNullOrWhiteSpace(p.periodType));
                     if (nottype_period.Any())
                     {
                         foreach (var period in nottype_period)
                         {
                             if (period.name.Contains("小学"))
                             {
-                                period.type.Add("primary");
+                                period.periodType= "primary";
                             }
                             if (period.name.Contains("初中"))
                             {
-                                period.type.Add("junior");
+                                period.periodType = "junior";
                             }
                             if (period.name.Contains("高中"))
                             {
-                                period.type.Add("senior");
+                                period.periodType = "senior";
                             }
-                            if (period.type.IsEmpty() && school.period.Count == 1)
+                            if (string.IsNullOrWhiteSpace(period.periodType) && school.period.Count == 1)
                             {
                                 if (school.name.Contains("小学"))
                                 {
-                                    period.type.Add("primary");
+                                    period.periodType = "primary";
+                              
                                 }
                                 if (school.name.Contains("初中"))
                                 {
-                                    period.type.Add("junior");
+                                    period.periodType = "junior";
                                 }
                                 if (school.name.Contains("高中"))
                                 {
-                                    period.type.Add("senior");
+                                    period.periodType = "senior";
                                 }
                             }
-                            if (period.type.IsNotEmpty())
+                            if (!string.IsNullOrWhiteSpace(period.periodType))
                             {
                                 periods.Add(period);
                             }
@@ -150,7 +151,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                     }
                     foreach (var period in periods)
                     {
-                        var dimension = artSetting.dimensions.FindAll(x => x.type.Intersect(period.type).Any());
+                        var dimension = artSetting.dimensions.FindAll(x => x.type.Intersect(new List<string> { period.periodType }).Any());
                         var bindIds = period.subjects.Where(s => !string.IsNullOrWhiteSpace(s.bindId)).Select(x => x.bindId);
                         //该学段未同步学科的。
                         var unBindIds = dimension.Where(z => !string.IsNullOrWhiteSpace(z.subjectBind)).Select(x => x.subjectBind).ToHashSet().Except(bindIds);

TEAMModelOS.SDK/Models/Cosmos/School/Inner/Period.cs

@@ -46,6 +46,7 @@ namespace TEAMModelOS.SDK.Models
         //{ "edu-bureau","教育局"},
         //{ "elecedu-dept","电教部门"},
         public List<string> type { get; set; }= new List<string>();
+        public string periodType { get; set; }
     }
 
     /// <summary>

TEAMModelOS/Controllers/Normal/ArtSettingController.cs

@@ -113,7 +113,7 @@ namespace TEAMModelOS.Controllers
                                         count = x.scoring.Count,
                                         x.periodId,
                                         periodName = period.name,
-                                        periodTypes = period.type,
+                                        periodTypes = new List<string> { period.periodType },
                                         x.subjectId,
                                         subjectBindId = subject.First().bindId,
                                         subjectName = subject.First().name,