From 483914d6c363f826eb2f665bd3d6e4e0d6689dd1 Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 21 Mar 2022 17:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A1=94=E9=87=8C=E6=9C=A8=E9=80=89=E4=BF=AE?= =?UTF-8?q?=E8=AF=BE=E5=AE=9A=E5=88=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...补充接口说明V1.0（塔里木）.docx | Bin 0 -> 20309 bytes .../Controllers/ElectiveMergeController.cs | 5 ++++ .../OpenLessonPlanOfElective/MergeIndex.js | 3 ++- .../StudentIndex.cshtml | 25 ++++++++++-------- .../Index.cshtml | 3 +++ .../ArrangeLessonTermOfElectiveService.cs | 19 ++++++++++++- .../ElectiveMerge/ElectiveMergeService.cs | 4 +-- .../EducationalAdministration/SignUpHelper.cs | 6 +++++ 8 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx diff --git a/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx b/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx new file mode 100644 index 0000000000000000000000000000000000000000..40c37ee4265dfa734a7717514a06ecd939797d2d GIT binary patch literal 20309 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 literal 0 HcmV?d00001 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ElectiveMergeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ElectiveMergeController.cs index d7ffb29b4..8bae3e3f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ElectiveMergeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ElectiveMergeController.cs @@ -149,6 +149,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers emItemEntity.ClassRoomName = olpoe.ClassRoomName; listElectiveMergeItemEntity.Add(emItemEntity); } + + if (listElectiveMergeItemEntity.Select(m=>m.LessonSection.Substring(0,1)).Distinct().Count()>1) + { + return Fail("合班失败！请确认所选课程是否为同一天课程。"); + } electiveMergeIBLL.SaveEntity(null, emMergeEntity, listElectiveMergeItemEntity); return Success("合班成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js index b9446da71..465946539 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js @@ -183,8 +183,9 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue.indexOf(',') == -1) return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; - else + else { return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; + } } }, { label: "上课时间", name: "LessonTime", width: 150, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.cshtml index 855d8696f..ac93283a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.cshtml @@ -26,21 +26,24 @@ - -
-
- +
+ 选课要求：至少需要选择3门不同的课程
-
-  报名 -  取消报名
-
-  报名(预) -  取消报名(预) +
+
+ +
+
+  报名 +  取消报名 +
+
+  报名(预) +  取消报名(预) +
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.cshtml index a3fd15128..26676a0c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.cshtml @@ -21,6 +21,9 @@ +
+ 选课要求：至少需要选择3门不同的课程 +
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs index b57de4c9d..b95b6846f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermOfElective/ArrangeLessonTermOfElectiveService.cs @@ -200,6 +200,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { foreach (var lessontime in item.paike.timeText.TrimEnd(',').Split(',')) { + string tmplessontime = ""; + if (item.paike.section == "7") + { + tmplessontime = "18:00-18:45"; + } + if (item.paike.section == "8") + { + tmplessontime = "18:45-19:30"; + } + if (item.paike.section == "9") + { + tmplessontime = "20:30-21:15"; + } + if (item.paike.section == "10") + { + tmplessontime = "21:15-22:00"; + } var insertData = new ArrangeLessonTermOfElectiveEntity { Id = Guid.NewGuid().ToString(), @@ -210,7 +227,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration LessonNo = item.paike.curriculunNumber, LessonName = item.paike.curriculunName, LessonSortNo = "2", - LessonTime = (item.paike.section == "7" ? "16:20-17:05" : "17:15-18:00"), + LessonTime = tmplessontime, LessonSection = item.paike.week + item.paike.section, StudyScore = lessonData.FirstOrDefault(x => x.LessonNo == item.paike.curriculunNumber)?.StudyScore, EmpNo = item.paike.teacherNumber, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMerge/ElectiveMergeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMerge/ElectiveMergeService.cs index 19090038e..9fe409667 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMerge/ElectiveMergeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMerge/ElectiveMergeService.cs @@ -113,7 +113,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { db.BeginTrans(); - var deldatalist = db.FindList(m => m.EmId == keyValue).OrderBy(m=>m.LessonSection); + var deldatalist = db.FindList(m => m.EmId == keyValue).OrderBy(m=>Convert.ToInt32(m.LessonSection)); var deldatafirst = deldatalist.First(); var deldatalast= deldatalist.Last(); var opfirst = db.FindEntity(m => m.Id == deldatafirst.OLPOEId); @@ -162,7 +162,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.Insert(electiveMergeItemEntity); var ids =string.Join(",",electiveMergeItemEntity.Select(n => n.OLPOEId)); var olplist = db.FindList(m => - ids.Contains(m.Id)).OrderBy(c=>c.LessonSection); + ids.Contains(m.Id)).OrderBy(c=>Convert.ToInt32(c.LessonSection)); var opfirst = olplist.First(); var oplast = olplist.Last(); opfirst.LessonSection +=","+ oplast.LessonSection; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SignUpHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SignUpHelper.cs index 456fd1771..76bd20839 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SignUpHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SignUpHelper.cs @@ -177,6 +177,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //相同时间不能报名 return; } + //相同课程不能报名 + if (sslleListOfNow1.Where(x => x.LessonNo == olpeEntity.LessonNo).Any()) + { + //相同课程不能报名 + return; + } //新增报名数据 var model = new StuSelectLessonListOfElectiveEntity() {