From 7adfee22b189a689fa27e879666dda505311ed0a Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 17 Jan 2022 15:26:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8E=92=E8=AF=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8E=BB=E6=8E=89=E5=AD=A6=E6=A0=A1=20?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=88=97=E5=8F=AA=E4=BF=9D=E7=95=99=E7=8F=AD?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 9ec9a47b1..39196dfb6 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 @@ -679,15 +679,14 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest var LessonList = BaseRepository("paikeDbString").FindList( @"SELECT a.week AS 'week', a.section AS 'section',a.timetext AS 'timetext',c.name AS 'classname',c.number AS 'classnumber', r.name AS 'roomname',r.number AS 'ClassroomNo',t.name AS 'teachername',t.number AS 'teacherNumber', cu.name AS 'curriculunName', - cu.number AS 'curriculunNumber', s.year AS 'year', s.number AS 'semester', sc.name AS 'schoolname', sc.sid AS 'schoolno' + cu.number AS 'curriculunNumber', s.year AS 'year', s.number AS 'semester' FROM tb_paike a LEFT JOIN tb_clazz c ON c.id= a.`clazzid` LEFT JOIN tb_classroom r ON r.id =a.`classroomid` LEFT JOIN tb_teacher t ON t.id =a.`teacherid` LEFT JOIN tb_curriculum cu ON cu.id=a.`curriculunid` LEFT JOIN tb_semester s ON s.id=a.`semester` - LEFT JOIN tb_school sc ON sc.`id`= a.`school` - WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'AND sc.sid = '" + entity.F_SchoolId + " '"); + WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); if (LessonList.Count() > 0) { var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); @@ -706,14 +705,14 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest MajorNo = classinfo?.MajorNo, LessonNo = item.curriculunNumber, LessonName = item.curriculunName, - TeachClassNo = item.curriculunName + classinfo?.ClassNo, + TeachClassNo =classinfo?.ClassNo, EmpNo = item.teacherNumber, EmpName = item.teachername, LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.curriculunNumber)?.LessonSortNo, ClassroomNo = classroomData.FirstOrDefault(m => m.ClassroomNo == item.ClassroomNo)?.ClassroomNo, LessonTime = item.week + item.section, CheckMark = "1", - F_SchoolId = item.schoolno + F_SchoolId =entity.F_SchoolId }; if (oldArrangeLessonTermList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester && m.LessonNo == insertData.LessonNo && m.LessonDate == insertData.LessonDate From 59b1a0b9af63bc0ad140ba29b27f8e9e6c8171fe Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 17 Jan 2022 15:31:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8E=92=E8=AF=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8A=82=E6=AC=A1=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?-=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 2 +- 1 file changed, 1 insertion(+), 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 39196dfb6..d1c035b96 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 @@ -710,7 +710,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest EmpName = item.teachername, LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.curriculunNumber)?.LessonSortNo, ClassroomNo = classroomData.FirstOrDefault(m => m.ClassroomNo == item.ClassroomNo)?.ClassroomNo, - LessonTime = item.week + item.section, + LessonTime = item.week+"-"+item.section, CheckMark = "1", F_SchoolId =entity.F_SchoolId };