考务管理-安排教师

排除已分配教师报错，排除已分配教师数据处理错误报错

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs

@@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         strSql.Append($" AND t.Semester = '{ELEntity.Semester}' ");
                     }
                     //同一考试课程下考场的监考老师不重复
-                    var empSql = "SELECT DISTINCT EPLId, STUFF( (SELECT ',' + empno FROM Exam_ExamPlanRoom WHERE 1=1 ";
+                    var empSql = "SELECT STUFF( (SELECT ',' + empno FROM Exam_ExamPlanRoom WHERE 1=1 ";
                     if (!queryParam["EPRId"].IsEmpty())
                     {
                         empSql += $" and EPRId<>'{queryParam["EPRId"].ToString()}'";
@@ -81,10 +81,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     empSql += $@"  and EPLId = T.EPLId FOR XML PATH('') ), 1, 1, '') AS empno FROM Exam_ExamPlanRoom AS T
                     where EPLId ='{queryParam["EPLId"].ToString()}'";
                     var obj = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanRoomEntity>(empSql).Select(x => x.EmpNo).Distinct().ToList();
-                    if (obj != null && obj.Count > 0)
+                    if (!string.IsNullOrEmpty(obj[0]))
                     {
+                        //if (obj[0].IsEmpty())
+                        //{
                         var empNo = string.Join("','", obj[0].ToString().Split(',').Distinct());
                         strSql.Append($" AND t.EmpNo not in ('{empNo}')");
+                        //}
                     }
 
                     //筛选掉考试时间冲突的老师和专业课的代课老师
@@ -133,7 +136,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             //此处判断当前考场时间是否在考试课程排考时间的开始前30分钟到结束后30分钟
                             if ((examRoomTime1 >= examtimeStart.AddMinutes(-30) && examRoomTime1 <= examtimeEnd.AddMinutes(30)) || (examRoomTime2 >= examtimeStart.AddMinutes(-30) && examRoomTime2 <= examtimeEnd.AddMinutes(30)))
                             {
-                                empnos.Add(examRoom.EmpNo);
+                                if (examRoom.EmpNo.Contains(','))
+                                {
+                                    var ss = examRoom.EmpNo.Split(',');
+                                    foreach (var item in ss)
+                                    {
+                                        empnos.Add(item);
+                                    }
+                                }
+                                else
+                                {
+                                    empnos.Add(examRoom.EmpNo);
+                                }
+
                             }
                         }
                         if (empnos.Count() > 0)