From 5426a765b4cd8141a2f9d944cc693879d6d65611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Thu, 3 Aug 2023 21:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=8E=E6=8E=92=E8=AF=BE?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5=E4=B8=8A=E8=AF=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermService.cs | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index b50124011..79a331efc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/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 timelist = new List(); + //获取上课时间 + var LessontimesList = BaseRepository("paikeDbString").FindList( + @"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(LessontimesList.First().studyhour.Split(',')); + } var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); var insertDataList = new List(); 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 }