|
@@ -30,6 +30,7 @@ using static TEAMModelOS.Controllers.FixDataController;
|
|
|
using static TEAMModelOS.SDK.SchoolService;
|
|
|
using Microsoft.AspNetCore.Hosting;
|
|
|
using static TEAMModelOS.Controllers.ScController;
|
|
|
+using OpenXmlPowerTools;
|
|
|
|
|
|
namespace TEAMModelOS.Controllers.Third
|
|
|
{
|
|
@@ -220,10 +221,34 @@ namespace TEAMModelOS.Controllers.Third
|
|
|
var teachers = json.ToObject<List<ScTeacher>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });
|
|
|
// 处理省平台后补的教师,教师的学校不在当前区的学校列表中。
|
|
|
teachers.RemoveAll(x => !ScSchools.Select(z => z.schoolid).Contains(x.SchoolID));
|
|
|
+ string json_teachers = teachers.ToJsonString();
|
|
|
var a = teachers.Select(x => $"{x.TID}").ToList();
|
|
|
- var s = ScTeachers.Select(y => $"{ y.TID}").ToList();
|
|
|
+ string json_a=a.ToJsonString();
|
|
|
+ var s = ScTeachers.Where(z=>!string.IsNullOrWhiteSpace(z.tmdid)).Select(y => $"{ y.TID}").ToList();
|
|
|
//未保存在数据库的。
|
|
|
var asin = a.Except(s).ToList();
|
|
|
+ string json_asin = asin.ToJsonString();
|
|
|
+ var aa =a.Except(asin);
|
|
|
+ if (aa.Any()) {
|
|
|
+ List<ScTeacher> newTeachers = new List<ScTeacher>();
|
|
|
+ var allScteacher = json.ToObject<List<ScTeacher>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });
|
|
|
+ aa.ToList().ForEach(a => {
|
|
|
+ var newTeacher = allScteacher.Find(x => $"{x.TID}".Equals(a));
|
|
|
+ if (newTeacher != null) {
|
|
|
+ var schoolInfo = ScSchools.Find(x => x.schoolid == newTeacher.SchoolID);
|
|
|
+ if (schoolInfo != null) {
|
|
|
+ newTeacher.status = 1;
|
|
|
+ newTeacher.areaId = $"{areaId}";
|
|
|
+ newTeacher.PartitionKey = "ScTeacher";
|
|
|
+ newTeacher.tmdid = null;
|
|
|
+ newTeacher.schoolCode = schoolInfo?.schoolCode;
|
|
|
+ newTeacher.RowKey = $"{newTeacher.PXID}";
|
|
|
+ newTeachers.Add(newTeacher);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ await table.SaveOrUpdateAll(newTeachers);
|
|
|
+ }
|
|
|
#region 省平台获取到最新的教师,并添加到Table中。
|
|
|
var adds = teachers.FindAll(x => asin.Contains($"{x.TID}"));
|
|
|
|