update

TEAMModelOS.FunctionV4/HttpTrigger/ScsYxptApis.cs

@@ -510,8 +510,20 @@ 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
             List<TeacherTrain> trains53113OK = new List<TeacherTrain>();
@@ -521,12 +533,6 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
 
             //5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写-UploadSBTARPDFListV2
             List<TeacherTrain> trains53122OK = new List<TeacherTrain>();
-            List<KeyValuePair<TeacherTrain, string>> trainsNO = new List<KeyValuePair<TeacherTrain, string>>();
-            List<PushFail> fails = new List<PushFail>();
-
-            ScsResult UpdateTeacherListSituation = null;
-            Dictionary<string, object> parameterContent53112 = new Dictionary<string, object>();
-            List<Dictionary<string, object>> list53112 = new List<Dictionary<string, object>>();
 
             trains.ForEach(x => {
                 List<KeyValuePair<string, string>> msgs = new List<KeyValuePair<string, string>>();
@@ -542,7 +548,39 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                     if (t53112OK == 1)
                     {
                         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);
 
                     }
                     //5.3.1.13学员能力点测评结果批量回写-UpdateTeacherListDiagnosis

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -784,10 +784,16 @@ namespace TEAMModelOS.SDK
                                     y.name = tmd?.name;
                                     y.picture = tmd?.picture;
                                 }
-                                else { 
-                                
+                                else {
+                                    groups.ForEach(x =>
+                                    {
+                                        int item = x.members.RemoveAll(z => z.id.Equals(y.id) && z.type == 1);
+                                        if (item > 0)
+                                        {
+                                            changes.Add(x);
+                                        }
+                                    });
                                 }
-                               
                             });
                         }
                     }