update

TEAMModelOS.FunctionV4/CosmosDB/CommonTrigger.cs

@@ -44,7 +44,7 @@ namespace TEAMModelOS.FunctionV4
             LeaseContainerPrefix = "TEAMModelOS",
             CreateLeaseContainerIfNotExists =true)]JsonElement json, FunctionContext context)
         {   //string  JsonElement  
-
+            //await _dingDing.SendBotMsg($"CosmosBD变化：\n{json.ToJsonString()}\n",GroupNames.成都开发測試群組);
             if (json.ValueKind.Equals(JsonValueKind.Array)) {
                 IReadOnlyList<JsonElement> elements = json.ToObject<List<JsonElement>>();
 
@@ -52,8 +52,9 @@ namespace TEAMModelOS.FunctionV4
                     var client = _azureCosmos.GetCosmosClient();
                     var log = context.GetLogger<CommonTrigger>();
                     log.LogInformation("Documents modified " + elements.Count);
-                    log.LogInformation("First document Id " + elements[0]);
+                   
                     foreach (var element in elements) {
+                        log.LogInformation("变化参数 " + element);
                         element.TryGetProperty("pk", out JsonElement jsond);
                         if (!string.IsNullOrWhiteSpace($"{jsond}"))
                         {

TEAMModelOS.FunctionV4/CosmosDB/TriggerCorrect.cs

@@ -23,7 +23,7 @@ namespace TEAMModelOS.FunctionV4
         public static async Task Trigger(CoreAPIHttpService _coreAPIHttpService, AzureServiceBusFactory _serviceBus, AzureStorageFactory _azureStorage, DingDing _dingDing,
            CosmosClient client, JsonElement input, TriggerData tdata, AzureRedisFactory _azureRedis)
         {
-            if ((tdata.status != null && tdata.status.Value == 404) || tdata.ttl > 0)
+            if ((tdata.status != null && tdata.status.Value == 404))
             {
                 ActivityList data = input.ToObject<ActivityList>();
                 await ActivityService.DeleteActivity(_coreAPIHttpService, client, _dingDing, data);

TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -26,7 +26,7 @@ namespace TEAMModelOS.FunctionV4
             List<ExamSubject> examSubjects = new List<ExamSubject>();
             try
             {
-                if ((data.status != null && data.status.Value == 404) || data.ttl > 0)
+                if ((data.status != null && data.status.Value == 404))
                 {
                     ActivityList activity = input.ToObject<ActivityList>();
                     await ActivityService.DeleteActivity(_coreAPIHttpService, client, _dingDing, activity);

TEAMModelOS.FunctionV4/CosmosDB/TriggerExamLite.cs

@@ -25,7 +25,7 @@ namespace TEAMModelOS.FunctionV4
         {
             try
             {
-                if ((tdata.status != null && tdata.status.Value == 404) || tdata.ttl > 0)
+                if ((tdata.status != null && tdata.status.Value == 404))
                 {
                     ActivityList data = input.ToObject<ActivityList>();
                     await ActivityService.DeleteActivity(_coreAPIHttpService, client, _dingDing, data);

TEAMModelOS.FunctionV4/CosmosDB/TriggerHomework.cs

@@ -25,7 +25,7 @@ namespace TEAMModelOS.FunctionV4
         {
             try
             {
-                if ((tdata.status != null && tdata.status.Value == 404) || tdata.ttl > 0)
+                if ((tdata.status != null && tdata.status.Value == 404) )
                 {
                     ActivityList data = input.ToObject<ActivityList>();
                     await ActivityService.DeleteActivity(_coreAPIHttpService, client, _dingDing, data);

TEAMModelOS.FunctionV4/CosmosDB/TriggerStudy.cs

@@ -25,7 +25,7 @@ namespace TEAMModelOS.FunctionV4
         {
             try
             {
-                if ((tdata.status != null && tdata.status.Value == 404) || tdata.ttl > 0 || tdata.publish == 1)
+                if ((tdata.status != null && tdata.status.Value == 404)  || tdata.publish == 1)
                 {
                     ActivityList data = input.ToObject<ActivityList>();
                     await ActivityService.DeleteActivity(_coreAPIHttpService, client, _dingDing, data);

TEAMModelOS.FunctionV4/CosmosDB/TriggerSurvey.cs

@@ -31,7 +31,7 @@ namespace TEAMModelOS.FunctionV4
         {
             try
             {
-                if ((tdata.status != null && tdata.status.Value == 404) || tdata.ttl > 0)
+                if ((tdata.status != null && tdata.status.Value == 404) )
                 {
                     ActivityList data = input.ToObject<ActivityList>();
                     await ActivityService.DeleteActivity(_coreAPIHttpService, client, _dingDing, data);

TEAMModelOS.FunctionV4/CosmosDB/TriggerVote.cs

@@ -28,7 +28,7 @@ namespace TEAMModelOS.FunctionV4
         {
             try
             {
-                if ((tdata.status != null && tdata.status.Value == 404) || tdata.ttl > 0)
+                if ((tdata.status != null && tdata.status.Value == 404) )
                 {
                     ActivityList data = input.ToObject<ActivityList>();
                     await ActivityService. DeleteActivity(_coreAPIHttpService, client, _dingDing, data);

TEAMModelOS.FunctionV4/HttpTrigger/ScsYxptApis.cs

@@ -480,6 +480,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
             JsonElement accessConfig = data.ToObject<JsonElement>().GetProperty("accessConfig");
             ScAccessConfig config = $"{accessConfig}".ToObject<ScAccessConfig>();
             JsonElement school = data.ToObject<JsonElement>().GetProperty("school");
+            List<string> pushTeachers = data.ToObject<JsonElement>().GetProperty("pushTeachers").ToObject<List<string>>();
             StringBuilder queryText = new StringBuilder($"SELECT distinct value(c) FROM c where c.type='yxtrain'");
             List<GroupList> yxtrain = new List<GroupList>();
             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<GroupList>(queryText: queryText.ToString(),
@@ -489,6 +490,10 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
             }
             List<TeacherTrain> trains = new List<TeacherTrain>();
             var members = yxtrain.SelectMany(x => x.members).ToList();
+            //指定推送一部分的教师 
+            if (pushTeachers.IsNotEmpty()) {
+                members= members.FindAll(x => pushTeachers.Contains(x.id));
+            }
             if (members.IsNotEmpty())
             {
                 queryText = new StringBuilder($"SELECT distinct value(c) FROM c where " +
@@ -510,222 +515,260 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
 
             List<ScTeacher> scTeachers= await  _azureStorage.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" },{ "schoolCode",$"{school}" } });
             List<ScTeacherDiagnosis> scTeacherDiagnoses = await _azureStorage.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" }, { "schoolCode", $"{school}" } });
-           
-
             
             List<KeyValuePair<TeacherTrain, string>> trainsNO = new List<KeyValuePair<TeacherTrain, string>>();
             List<PushFail> fails = new List<PushFail>();
-            //5.3.1.12学员培训基本情况批量回写-UpdateTeacherListSituation
-            List<TeacherTrain> trains53112OK = new List<TeacherTrain>();
-            ScsResult UpdateTeacherListSituation = null;
-            Dictionary<string, object> parameterContent53112 = new Dictionary<string, object>();
-            List<Dictionary<string, object>> list53112 = new List<Dictionary<string, object>>();
-            parameterContent53112.Add("TrainComID", config.trainComID);
-            parameterContent53112.Add("List", list53112);
-             
-            //5.3.1.13学员能力点测评结果批量回写-UpdateTeacherListDiagnosis  300条限制 
-            List<TeacherTrain> trains53113OK = new List<TeacherTrain>();
-            ScsResult UpdateTeacherListDiagnosis = null;
-            Dictionary<string, object> parameterContent53113 = new Dictionary<string, object>();
-            List<Dictionary<string, object>> list53113 = new List<Dictionary<string, object>>();
-            parameterContent53113.Add("TrainComID", config.trainComID);
-            parameterContent53113.Add("List", list53113);
+            
+            int pages = (trains.Count + 19) / 20; //pages = (total + max -1) / max;
+            for (int i = 0; i < pages; i++) {
+                List<TeacherTrain> lists = trains.Skip((i) * 20).Take(20).ToList();
+                //5.3.1.12学员培训基本情况批量回写-UpdateTeacherListSituation
+                List<TeacherTrain> trains53112OK = new List<TeacherTrain>();
+                ScsResult UpdateTeacherListSituation = null;
+                Dictionary<string, object> parameterContent53112 = new Dictionary<string, object>();
+                List<Dictionary<string, object>> list53112 = new List<Dictionary<string, object>>();
+                parameterContent53112.Add("TrainComID", config.trainComID);
+                parameterContent53112.Add("List", list53112);
 
-            //5.3.1.17学员课堂实录批量回写-UploadKTSLList     300条限制 
-            List<TeacherTrain> trains53117OK = new List<TeacherTrain>();
-            ScsResult UploadKTSLList = null;
-            Dictionary<string, object> parameterContent53117 = new Dictionary<string, object>();
-            List<Dictionary<string, object>> list53117 = new List<Dictionary<string, object>>();
-            parameterContent53117.Add("TrainComID", config.trainComID);
-            parameterContent53117.Add("List", list53117);
+                //5.3.1.13学员能力点测评结果批量回写-UpdateTeacherListDiagnosis  300条限制 
+                List<TeacherTrain> trains53113OK = new List<TeacherTrain>();
+                ScsResult UpdateTeacherListDiagnosis = null;
+                Dictionary<string, object> parameterContent53113 = new Dictionary<string, object>();
+                List<Dictionary<string, object>> list53113 = new List<Dictionary<string, object>>();
+                parameterContent53113.Add("TrainComID", config.trainComID);
+                parameterContent53113.Add("List", list53113);
 
-            //5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写-UploadSBTARPDFListV2   100条限制
-            List<TeacherTrain> trains53122OK = new List<TeacherTrain>();
-            ScsResult UploadSBTARPDFListV2 = null;
-            Dictionary<string, object> parameterContent53122 = new Dictionary<string, object>();
-            List<Dictionary<string, object>> list53122 = new List<Dictionary<string, object>>();
-            parameterContent53122.Add("TrainComID", config.trainComID);
-            parameterContent53122.Add("List", list53122);
-            foreach (var x in trains) {
-                List<KeyValuePair<string, string>> msgs = new List<KeyValuePair<string, string>>();
-                List<ScTeacher> teacher = scTeachers.FindAll(t => t.tmdid.Equals(x.id));
-                foreach (var t in teacher) {
-                    ScTeacherDiagnosis diagnosis = scTeacherDiagnoses.Find(x => x.RowKey.Equals(t.PXID));
+                //5.3.1.17学员课堂实录批量回写-UploadKTSLList     300条限制 
+                List<TeacherTrain> trains53117OK = new List<TeacherTrain>();
+                ScsResult UploadKTSLList = null;
+                Dictionary<string, object> parameterContent53117 = new Dictionary<string, object>();
+                List<Dictionary<string, object>> list53117 = new List<Dictionary<string, object>>();
+                parameterContent53117.Add("TrainComID", config.trainComID);
+                parameterContent53117.Add("List", list53117);
 
-                    (int t53112OK, List<KeyValuePair<string, string>> msgs53112) = check53112(x, msgs);
-                    (int t53113OK, List<KeyValuePair<string, string>> msgs53113, List<AbilitySub> abilitySubs) = await check53113(x, diagnosis, msgs);
-                    (int t53117OK, List<KeyValuePair<string, string>> msgs53117) = check53117(x, msgs);
-                    (int t53122OK, List<KeyValuePair<string, string>> msgs53122) = check53122(x, msgs);
-                    //5.3.1.12学员培训基本情况批量回写-UpdateTeacherListSituation
-                    if (t53112OK == 1)
+                //5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写-UploadSBTARPDFListV2   100条限制
+                List<TeacherTrain> trains53122OK = new List<TeacherTrain>();
+                ScsResult UploadSBTARPDFListV2 = null;
+                Dictionary<string, object> parameterContent53122 = new Dictionary<string, object>();
+                List<Dictionary<string, object>> list53122 = new List<Dictionary<string, object>>();
+                parameterContent53122.Add("TrainComID", config.trainComID);
+                parameterContent53122.Add("List", list53122);
+                //装载数据
+                foreach (var x in lists) {
+                    List<KeyValuePair<string, string>> msgs = new List<KeyValuePair<string, string>>();
+                    List<ScTeacher> teacher = scTeachers.FindAll(t => t.tmdid.Equals(x.id));
+                    foreach (var t in teacher)
                     {
-                        Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-                        parameterMapData.Add("PXID", $"{t.PXID}");
-                        parameterMapData.Add("TID", $"{t.TID}");
-                        parameterMapData.Add("TeacherName", $"{t.TeacherName}");
-                        parameterMapData.Add("CourseHour", $"{x.totalTime}");
-                        parameterMapData.Add("ResearchText", $"{x.summary}");
-                        /// <summary>
-                        ///省上标准  最终结果 0未认定，1合格，2优秀，3不合格，4其他
-                        ///系统标准 -2 其他 -1 未认定，0不合格，1合格，2优秀
-                        /// </summary>
-                        string ComPassed = "0";
-                        switch (x.finalScore)
-                        {
-                            case -2:
-                                ComPassed = "4";
-                                break;
-                            case -1:
-                                ComPassed = "0";
-                                break;
-                            case 0:
-                                ComPassed = "3";
-                                break;
-                            case 1:
-                                ComPassed = "1";
-                                break;
-                            case 2:
-                                ComPassed = "2";
-                                break;
-                            default:
-                                ComPassed = "4";
-                                break;
-                        }
-                        parameterMapData.Add("ComPassed", ComPassed);//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-                        list53112.Add(parameterMapData);
+                        ScTeacherDiagnosis diagnosis = scTeacherDiagnoses.Find(x => x.RowKey.Equals(t.PXID));
 
-                    }
-                    //5.3.1.13学员能力点测评结果批量回写-UpdateTeacherListDiagnosis
-                    if (t53113OK == 1)
-                    {
-                        x.currency.teacherAilities.ForEach(a => {
+                        (int t53112OK, List<KeyValuePair<string, string>> msgs53112) = check53112(x, msgs);
+                        (int t53113OK, List<KeyValuePair<string, string>> msgs53113, List<AbilitySub> abilitySubs) = await check53113(x, diagnosis, msgs);
+                        (int t53117OK, List<KeyValuePair<string, string>> msgs53117) = check53117(x, msgs);
+                        (int t53122OK, List<KeyValuePair<string, string>> msgs53122) = check53122(x, msgs);
+
+                        //5.3.1.12学员培训基本情况批量回写-UpdateTeacherListSituation
+                        if (t53112OK == 1)
+                        {
                             Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
                             parameterMapData.Add("PXID", $"{t.PXID}");
                             parameterMapData.Add("TID", $"{t.TID}");
-                            parameterMapData.Add("DiagnosisNum", $"{a.no}");
-                            //0"未认定", 1"合格", 2"优秀", 3"不合格"
-                            //系统 -1 未认定，0 不合格，1 合格，2 优秀
-                            string zpscore = "0";
-                            switch (a.zpscore)
+                            parameterMapData.Add("TeacherName", $"{t.TeacherName}");
+                            parameterMapData.Add("CourseHour", $"{x.totalTime}");
+                            parameterMapData.Add("ResearchText", $"{x.summary}");
+                            /// <summary>
+                            ///省上标准  最终结果 0未认定，1合格，2优秀，3不合格，4其他
+                            ///系统标准 -2 其他 -1 未认定，0不合格，1合格，2优秀
+                            /// </summary>
+                            string ComPassed = "0";
+                            switch (x.finalScore)
                             {
-                                case -1:
-                                    zpscore = "0";
-                                    break;
-                                case 0:
-                                    zpscore = "3";
-                                    break;
-                                case 1:
-                                    zpscore = "1";
-                                    break;
-                                case 2:
-                                    zpscore = "2";
+                                case -2:
+                                    ComPassed = "4";
                                     break;
-                                default:
-                                    zpscore = "0";
-                                    break;
-                            }
-                            string hpscore = "0";
-                            switch (a.hpscore)
-                            {
                                 case -1:
-                                    hpscore = "0";
+                                    ComPassed = "0";
                                     break;
                                 case 0:
-                                    hpscore = "3";
+                                    ComPassed = "3";
                                     break;
                                 case 1:
-                                    hpscore = "1";
+                                    ComPassed = "1";
                                     break;
                                 case 2:
-                                    hpscore = "2";
+                                    ComPassed = "2";
                                     break;
                                 default:
-                                    hpscore = "0";
+                                    ComPassed = "4";
                                     break;
                             }
-                            string xzpresult = "0";
-                            switch (a.xzscore)
-                            {
-                                case -1:
-                                    xzpresult = "0";
-                                    break;
-                                case 0:
-                                    xzpresult = "3";
-                                    break;
-                                case 1:
-                                    xzpresult = "1";
-                                    break;
-                                case 2:
-                                    xzpresult = "2";
-                                    break;
-                                default:
-                                    xzpresult = "0";
-                                    break;
-                            }
-                            parameterMapData.Add("zpresult", zpscore);
-                            parameterMapData.Add("hpresult", hpscore);
-                            parameterMapData.Add("xzpresult", xzpresult);
-                            List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
-                            parameterMapData.Add("pfiles", pfiles);
+                            parameterMapData.Add("ComPassed", ComPassed);//0、未认定  1、合格  2、优秀  3、不合格  4、其他
+                            list53112.Add(parameterMapData);
+                        }
+                        else
+                        {
+                            fails.Add(new PushFail { tmdid = t.tmdid, name = t.TeacherName, msgs = msgs53112 });
+                        }
+                        //5.3.1.13学员能力点测评结果批量回写-UpdateTeacherListDiagnosis
+                        if (t53113OK == 1)
+                        {
+                            x.currency.teacherAilities.ForEach(a => {
+                                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+                                parameterMapData.Add("PXID", $"{t.PXID}");
+                                parameterMapData.Add("TID", $"{t.TID}");
+                                parameterMapData.Add("DiagnosisNum", $"{a.no}");
+                                //0"未认定", 1"合格", 2"优秀", 3"不合格"
+                                //系统 -1 未认定，0 不合格，1 合格，2 优秀
+                                string zpscore = "0";
+                                switch (a.zpscore)
+                                {
+                                    case -1:
+                                        zpscore = "0";
+                                        break;
+                                    case 0:
+                                        zpscore = "3";
+                                        break;
+                                    case 1:
+                                        zpscore = "1";
+                                        break;
+                                    case 2:
+                                        zpscore = "2";
+                                        break;
+                                    default:
+                                        zpscore = "0";
+                                        break;
+                                }
+                                string hpscore = "0";
+                                switch (a.hpscore)
+                                {
+                                    case -1:
+                                        hpscore = "0";
+                                        break;
+                                    case 0:
+                                        hpscore = "3";
+                                        break;
+                                    case 1:
+                                        hpscore = "1";
+                                        break;
+                                    case 2:
+                                        hpscore = "2";
+                                        break;
+                                    default:
+                                        hpscore = "0";
+                                        break;
+                                }
+                                string xzpresult = "0";
+                                switch (a.xzscore)
+                                {
+                                    case -1:
+                                        xzpresult = "0";
+                                        break;
+                                    case 0:
+                                        xzpresult = "3";
+                                        break;
+                                    case 1:
+                                        xzpresult = "1";
+                                        break;
+                                    case 2:
+                                        xzpresult = "2";
+                                        break;
+                                    default:
+                                        xzpresult = "0";
+                                        break;
+                                }
+                                parameterMapData.Add("zpresult", zpscore);
+                                parameterMapData.Add("hpresult", hpscore);
+                                parameterMapData.Add("xzpresult", xzpresult);
+                                List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
+                                parameterMapData.Add("pfiles", pfiles);
 
-                            AbilitySub abilitySub = abilitySubs.Find(sub => sub.id.Equals(a.id));
-                            if (abilitySub != null)
-                            {
-                                abilitySub.uploads.ForEach(upload => {
-                                    upload.urls.ForEach(url => {
-                                        Dictionary<string, object> pfileMap = new Dictionary<string, object>();
-                                        pfileMap.Add("url", url.url);
-                                        pfileMap.Add("fileName", url.name);
-                                        pfileMap.Add("fileSize", url.size);
-                                        pfileMap.Add("md5", url.hash);
-                                        string fileext = url.url.Substring(url.url.LastIndexOf(".") > 0 ? url.url.LastIndexOf(".") + 1 : 0);
-                                        pfileMap.Add("fileType", fileext);
-                                        pfiles.Add(pfileMap);
+                                AbilitySub abilitySub = abilitySubs.Find(sub => sub.id.Equals(a.id));
+                                if (abilitySub != null)
+                                {
+                                    abilitySub.uploads.ForEach(upload => {
+                                        upload.urls.ForEach(url => {
+                                            Dictionary<string, object> pfileMap = new Dictionary<string, object>();
+                                            pfileMap.Add("url", url.url);
+                                            pfileMap.Add("fileName", url.name);
+                                            pfileMap.Add("fileSize", url.size);
+                                            pfileMap.Add("md5", url.hash);
+                                            string fileext = url.url.Substring(url.url.LastIndexOf(".") > 0 ? url.url.LastIndexOf(".") + 1 : 0);
+                                            pfileMap.Add("fileType", fileext);
+                                            pfiles.Add(pfileMap);
+                                        });
                                     });
-                                });
-                            }
-                            list53113.Add(parameterMapData);
-                        });
-                    }
-                    //5.3.1.17学员课堂实录批量回写-UploadKTSLList
-                    if (t53117OK == 1)
-                    {
-                        x.teacherClasses.ForEach(clss =>
+                                }
+                                list53113.Add(parameterMapData);
+                            });
+                        }
+                        else
+                        {
+                            fails.Add(new PushFail { tmdid = t.tmdid, name = t.TeacherName, msgs = msgs53113 });
+                        }
+                        //5.3.1.17学员课堂实录批量回写-UploadKTSLList
+                        if (t53117OK == 1)
+                        {
+                            x.teacherClasses.ForEach(clss =>
+                            {
+                                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+                                parameterMapData.Add("PXID", $"{t.PXID}");
+                                parameterMapData.Add("TID", $"{t.TID}");
+                                parameterMapData.Add("url", clss.url);//添加访问授权
+                                parameterMapData.Add("url2", clss.url);
+                                parameterMapData.Add("fileName", clss.name);
+                                parameterMapData.Add("fileSize", clss.size);
+                                parameterMapData.Add("md5", clss.hash);
+                                string fileext = clss.url.Substring(clss.url.LastIndexOf(".") > 0 ? clss.url.LastIndexOf(".") + 1 : 0);
+                                parameterMapData.Add("fileType", fileext);
+                                list53117.Add(parameterMapData);
+                            });
+                        }
+                        else
+                        {
+                            fails.Add(new PushFail { tmdid = t.tmdid, name = t.TeacherName, msgs = msgs53117 });
+                        }
+                        //5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写-UploadSBTARPDFListV2
+                        if (t53122OK == 1)
                         {
                             Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
                             parameterMapData.Add("PXID", $"{t.PXID}");
                             parameterMapData.Add("TID", $"{t.TID}");
-                            parameterMapData.Add("url", clss.url);//添加访问授权
-                            parameterMapData.Add("url2", clss.url);
-                            parameterMapData.Add("fileName", clss.name);
-                            parameterMapData.Add("fileSize", clss.size);
-                            parameterMapData.Add("md5", clss.hash);
-                            string fileext = clss.url.Substring(clss.url.LastIndexOf(".") > 0 ? clss.url.LastIndexOf(".") + 1 : 0);
-                            parameterMapData.Add("fileType", fileext);
-                            list53117.Add(parameterMapData);
-                        });
-                    }
-                    //5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写-UploadSBTARPDFListV2
-                    if (t53122OK == 1)
-                    {
-                        Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-                        parameterMapData.Add("PXID", $"{t.PXID}");
-                        parameterMapData.Add("TID", $"{t.TID}");
-                        List<Dictionary<string, object>> files = new List<Dictionary<string, object>>();
-                        x.offlineRecords.ForEach(record => {
-                            Dictionary<string, object> fileMap = new Dictionary<string, object>();
-                            fileMap.Add("url", record.url);
-                            fileMap.Add("fileName", record.name);
-                            fileMap.Add("fileSize", record.size);
-                            fileMap.Add("md5", record.hash);
-                            string fileext = record.url.Substring(record.url.LastIndexOf(".") > 0 ? record.url.LastIndexOf(".") + 1 : 0);
-                            fileMap.Add("fileType", fileext);
-                            files.Add(fileMap);
-                        });
-                        parameterMapData.Add("files", files);
-                        list53122.Add(parameterMapData);
+                            List<Dictionary<string, object>> files = new List<Dictionary<string, object>>();
+                            x.offlineRecords.ForEach(record => {
+                                Dictionary<string, object> fileMap = new Dictionary<string, object>();
+                                fileMap.Add("url", record.url);
+                                fileMap.Add("fileName", record.name);
+                                fileMap.Add("fileSize", record.size);
+                                fileMap.Add("md5", record.hash);
+                                string fileext = record.url.Substring(record.url.LastIndexOf(".") > 0 ? record.url.LastIndexOf(".") + 1 : 0);
+                                fileMap.Add("fileType", fileext);
+                                files.Add(fileMap);
+                            });
+                            parameterMapData.Add("files", files);
+                            list53122.Add(parameterMapData);
+                        }
+                        else
+                        {
+                            fails.Add(new PushFail { tmdid = t.tmdid, name = t.TeacherName, msgs = msgs53122 });
+                        }
                     }
                 }
+                //推送数据
+                UpdateTeacherListSituation = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterContent53112);
+                UpdateTeacherListSituation.code = "UpdateTeacherListSituation";
+                UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
+
+                UpdateTeacherListDiagnosis = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterContent53113);
+                UpdateTeacherListDiagnosis.code = "UpdateTeacherListDiagnosis";
+                UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
+
+                UploadKTSLList = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterContent53117);
+                UploadKTSLList.code = "UploadKTSLList";
+                UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
+
+                UploadSBTARPDFListV2 = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterContent53122);
+                UploadSBTARPDFListV2.code = "UploadSBTARPDFListV2";
+                UploadSBTARPDFListV2.title = "5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写";
+
             }
             await response.WriteAsJsonAsync(new { });
             return response;

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -324,7 +324,6 @@ namespace TEAMModelOS.Controllers
                 }
                 if (flag)
                 {
-                    exam.ttl = 1;
                     exam.status = 404;
                     exam = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(exam, exam.id, new PartitionKey($"{exam.code}"));
                     //string school_code = code.ToString().Substring(typeof(ExamClassResult).Name.Length + 1);

TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -377,7 +377,6 @@ namespace TEAMModelOS.Controllers.Learn
                 if (flag)
                 {
                     //使用ttl删除，并处理相关事务逻辑
-                    homeworkd.ttl = 1;
                     homeworkd.status = 404;
                     homeworkd = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(homeworkd, homeworkd.id, new PartitionKey($"{homeworkd.code}"));
 

TEAMModelOS/Controllers/Common/StudyController.cs

@@ -327,19 +327,17 @@ namespace TEAMModelOS.Controllers.Common
                         await _dingDing.SendBotMsg($"OS，{_option.Location}，study/delete()ex\n{ex.Message},\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
                     }
                     if (flag) {
-                        study.ttl = 1;
+                       
                         study.status = 404;                        
                         if (!string.IsNullOrEmpty(study.examId))
                         {
                             ExamLite lite =  await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<ExamLite>(study.examId, new PartitionKey($"ExamLite-{code}"));
-                            lite.ttl = 1;
                             lite.status = 404;                           
                             await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync(lite, lite.id, new PartitionKey($"ExamLite-{code}"));
                         }
                         if (!string.IsNullOrEmpty(study.surveyId))
                         {
                             Survey survey = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Survey>(study.surveyId, new PartitionKey($"Survey-{code}"));
-                            survey.ttl = 1;
                             survey.status = 404;
                             await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync(survey, survey.id, new PartitionKey($"Survey-{code}"));
                             //await client.GetContainer("TEAMModelOS", "Common").DeleteItemStreamAsync(study.surveyId, new PartitionKey($"Survey-{code}"));
@@ -347,7 +345,6 @@ namespace TEAMModelOS.Controllers.Common
                         if (!string.IsNullOrEmpty(study.workId))
                         {
                             Homework homework = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Homework>(study.workId, new PartitionKey($"Homework-{code}"));
-                            homework.ttl = 1;
                             homework.status = 404;
                             await client.GetContainer("TEAMModelOS", "Common").ReplaceItemAsync(homework, homework.id, new PartitionKey($"Homework-{code}"));
                             //await client.GetContainer("TEAMModelOS", "Common").DeleteItemStreamAsync(study.workId, new PartitionKey($"Homework-{code}"));

TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -390,7 +390,6 @@ namespace TEAMModelOS.Controllers
                 if (flag)
                 {
                     //使用ttl删除，并处理相关事务逻辑
-                    survey.ttl = 1;
                     survey.status = 404;
                     survey = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(survey,survey.id, new PartitionKey($"{survey.code}"));
                     _azureRedis.GetRedisClient(8).KeyDelete($"Survey:Record:{survey.id}");

TEAMModelOS/Controllers/Common/VoteController.cs

@@ -359,7 +359,6 @@ namespace TEAMModelOS.Controllers
                 if (flag)
                 {
                     //使用ttl删除，并处理相关事务逻辑
-                    vote.ttl = 1;
                     vote.status = 404;
                     vote = await client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync(vote,vote.id,  new PartitionKey($"{vote.code}"));
                     //await _dingDing.SendBotMsg($"{_option.Location}-投票活动【{vote.name}-{vote.id}-ttl={vote.ttl}】正在操作", GroupNames.成都开发測試群組);