增加从排课系统对接上课时间

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -798,6 +798,19 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
 
                     if (LessonList.Count() > 0)
                     {
+                        List<string> timelist = new List<string>();
+                        //获取上课时间
+                        var LessontimesList = BaseRepository("paikeDbString").FindList<paikeTime>(
+                            @"select kebiao.studyhour
+                                             from tb_kebiaojiegou  kebiao 
+	                                            LEFT JOIN tb_classschedulestructure c on c.kebiaojiegou=kebiao.id
+	                                            LEFT JOIN tb_semester s on s.id=c.semester	                                            
+	                                            where s.`year`='" + entity.AcademicYearNo + "' and s.number='" + entity.Semester + "'  and c.isnopretermit='1'");
+                        //判断有无上课时间
+                        if (LessontimesList.Count() > 0 && LessontimesList.First().studyhour != null && LessontimesList.First().studyhour.Contains(","))
+                        {
+                            timelist = new List<string>(LessontimesList.First().studyhour.Split(',')); 
+                        }
                         var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeLessonTermEntity>()).ToList();
                         var insertDataList = new List<ArrangeLessonTermEntity>();
                         foreach (var item in LessonList)
@@ -806,10 +819,22 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                             var timesArr = item.timetext.Substring(0, item.timetext.Length - 1).Split(',');
                             foreach (var timesItem in timesArr)
                             {
+                                string ltime = "";
+                                string datestr = timesItem;
+                                if (timelist.Count()>0&& timelist[Convert.ToInt32(item.section)]!=null)
+                                {
+                                    ltime = timelist[Convert.ToInt32(item.section)];
+                                    DateTime dt = DateTime.Parse(datestr);
+                                    if (dt.Hour==0&&dt.Minute==0)
+                                    {
+                                        dt.Add(TimeSpan.Parse(ltime));
+                                    }
+                                    datestr = dt.ToString();
+                                }
                                 var insertData = new ArrangeLessonTermEntity
                                 {
                                     ALTId = Guid.NewGuid().ToString(),
-                                    LessonDate = DateTime.Parse(timesItem),
+                                    LessonDate = DateTime.Parse(datestr),
                                     AcademicYearNo = item.year,
                                     Semester = item.semester,
                                     DeptNo = classinfo?.DeptNo,
@@ -2857,6 +2882,12 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
         public string semester { get; set; }
         public string schoolno { get; set; }
     }
+
+    public class paikeTime
+    {
+        public string studyhour { get; set; }
+    }
+
     #endregion
 }