zhouj1203@hotmail.com 1 年之前
父节点
当前提交
9c6cef6d78
共有 1 个文件被更改,包括 10 次插入6 次删除
  1. 10 6
      TEAMModelOS.SDK/Models/Service/StudentService.cs

+ 10 - 6
TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -4,8 +4,10 @@ using Azure.Messaging.ServiceBus;
 using DocumentFormat.OpenXml.Drawing;
 using DocumentFormat.OpenXml.Drawing.Charts;
 using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
 using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml.VariantTypes;
+using DocumentFormat.OpenXml.Vml;
 using HTEXLib.COMM.Helpers;
 using HTEXLib.Helpers.ShapeHelpers;
 using Microsoft.AspNetCore.Http;
@@ -186,6 +188,7 @@ namespace TEAMModelOS.SDK
                         foreach (var vote in resultSchool.list)
                         {
                             vote.scode = vote.code;
+                            vote.classIds = vote.classes.Count > 0 ? vote.classes : vote.stuLists;
                             List<string> sub = new();
                             if (vote.tchLists.Count == 0)
                             {
@@ -215,8 +218,8 @@ namespace TEAMModelOS.SDK
                         foreach (var vote in resultTeacher.list)
                         {
                             vote.scode = vote.code;
-
-                                List<string> sub = new();
+                            vote.classIds = vote.classes.Count > 0 ? vote.classes : vote.stuLists;
+                            List<string> sub = new();
                                 if (vote.tchLists.Count == 0)
                                 {
                                     if (vote.targets.Count > 0)
@@ -251,6 +254,7 @@ namespace TEAMModelOS.SDK
                         foreach (var survey in resultSchool.list)
                         {
                             survey.scode = survey.code;
+                            survey.classIds = survey.classes.Count > 0 ? survey.classes : survey.stuLists; 
                             List<string> sub = new();
                             if (survey.tchLists.Count == 0)
                             {
@@ -278,8 +282,8 @@ namespace TEAMModelOS.SDK
                     if (resultTeacher.list.Count > 0) {
                         foreach (var survey in resultTeacher.list) {
                             survey.scode = survey.code;
-
-                                List<string> sub = new();
+                            survey.stuLists = survey.classes.Count > 0 ? survey.classes : survey.stuLists;
+                            List<string> sub = new();
                                 if (survey.tchLists.Count == 0)
                                 {
                                     if (survey.targets.Count > 0)
@@ -313,7 +317,7 @@ namespace TEAMModelOS.SDK
                     {
                         foreach (var work in resultSchool.list)
                         {
-                            work.classIds = work.classes;
+                            work.classIds = work.classes.Count > 0 ? work.classes : work.stuLists;
                             work.scode = work.code;
                             List<string> sub = new();
                             if (work.tchLists.Count == 0)
@@ -344,7 +348,7 @@ namespace TEAMModelOS.SDK
                         foreach (var work in resultTeacher.list)
                         {
                             work.scode = work.code;
-                            work.classIds = work.stuLists;
+                            work.classIds = work.classes.Count > 0 ? work.classes : work.stuLists;
                             List<string> sub = new();
                             if (work.tchLists.Count == 0)
                             {