From d6f4f2938815c8cc5f5124ad6a7a3fc6233d0120 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 18 Mar 2022 18:14:00 +0800 Subject: [PATCH 01/41] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_FormModule/Views/FormRelation/Form.cshtml | 2 +- .../Areas/LR_FormModule/Views/FormRelation/Form.js | 5 ++--- .../Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js | 6 +++++- .../Learun.Application.Form/Scheme/FormSchemeBLL.cs | 7 ++++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml index ce5fadf56..d85c010ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml @@ -64,7 +64,7 @@
-
请填写Sql语句*
+
条件筛选Sql语句*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js index 883981420..4eefbb4dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js @@ -366,19 +366,18 @@ var bootstrap = function ($, learun) { $('#step-1').lrSetFormData(data.module); $('#F_FormId').lrselectSet(data.relation.F_FormId); - + $("#F_CloseDoSql").val(data.relation.F_CloseDoSql); var settingJson = JSON.parse(data.relation.F_SettingJson); $('[name="formOpenType"][value="' + settingJson.layer.opentype + '"]').attr('checked', 'checked'); $('#fromWidth').val(settingJson.layer.width); $('#fromHeight').val(settingJson.layer.height); - $('[name="queryDatetime"][value="' + settingJson.query.isDate + '"]').attr('checked', 'checked'); $('#queryDatetime').lrselectSet(settingJson.query.DateField); $('#queryWidth').val(settingJson.query.width); $('#queryHeight').val(settingJson.query.height); queryData = settingJson.query.fields; - console.log(queryData); + $('#query_girdtable').jfGridSet('refreshdata', queryData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js index 5bd0c94fa..49678ffae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js @@ -15,6 +15,7 @@ var relation; var mainTablePk = ""; var mainTable = ""; var mainCompontId = ""; +var sqlwhere = ""; var bootstrap = function ($, learun) { "use strict"; @@ -28,7 +29,7 @@ var bootstrap = function ($, learun) { relation = data.relation; settingJson = JSON.parse(data.relation.F_SettingJson); formScheme = JSON.parse(data.scheme.F_Scheme); - + sqlwhere = relation.F_CloseDoSql; for (var i = 0, l = formScheme.dbTable.length; i < l; i++) { var tabledata = formScheme.dbTable[i]; if (tabledata.relationName == "") { @@ -305,6 +306,9 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (!!sqlwhere) { + queryJson.sqlwhere = sqlwhere; + } param.queryJson = JSON.stringify(queryJson); $('#gridtable').jfGridSet('reload', param); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs index 1e3296b7e..1948b9075 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs @@ -902,6 +902,11 @@ namespace Learun.Application.Form queryParamTemp.Add("lrend", queryParam["lrend"].ToDate()); querySql += " AND (" + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " >=@lrbegin AND " + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " <=@lrend ) "; } + //自定义sql查询条件 + else if (queryParam != null && !queryParam["sqlwhere"].IsEmpty()) + { + querySql += " "+ queryParam["sqlwhere"].ToString(); + } else if (queryParam != null) // 复合条件查询 { @@ -932,7 +937,7 @@ namespace Learun.Application.Form { queryParam.Add(item.Key, item.Value); } - + return querySql; } From 16090a318258926d0aaa7d12b1a04b773aac8797 Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 21 Mar 2022 17:02:02 +0800 Subject: [PATCH 02/41] =?UTF-8?q?=E5=A1=94=E9=87=8C=E6=9C=A8=E9=80=89?= =?UTF-8?q?=E4=BF=AE=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 +++ .../XmlConfig/system.config | 2 +- .../ArrangeLessonTermOfElectiveService.cs | 19 ++++++++++++- .../ElectiveMerge/ElectiveMergeService.cs | 4 +-- .../EducationalAdministration/SignUpHelper.cs | 6 +++++ 9 files changed, 51 insertions(+), 16 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.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 9592e4aee..562bad2aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -145,7 +145,7 @@ - + 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() { From 4c10b79f4fd7c7bf084ff5424c432e6ecbfee883 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 22 Mar 2022 11:02:26 +0800 Subject: [PATCH 03/41] =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B--=E5=88=97=E8=A1=A8=E5=8A=A0=20=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=B7=B2=E9=80=89=E4=B8=93=E4=B8=9A=E3=80=81=E9=80=89=E8=AF=BE?= =?UTF-8?q?=E4=B8=93=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ElectiveMajor/Index.js | 10 +++++ .../OpenLessonPlanOfElective/MergeIndex.js | 40 +++++++++++++------ .../ElectiveMajor/ElectiveMajorService.cs | 24 ++++++----- .../OpenLessonPlanOfElectiveService.cs | 7 +++- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js index 58dfa6639..6839e2da6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js @@ -5,6 +5,7 @@ * 描 述：选课专业 */ var refreshGirdData; +var acceptClick; var OLPOEId = request("OLPOEId"); var bootstrap = function ($, learun) { "use strict"; @@ -129,8 +130,17 @@ var bootstrap = function ($, learun) { $('#gridtablemanagemajor').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; + refreshGirdData = function () { page.search(); }; + + // 保存数据 + acceptClick = function (callBack) { + if (!!callBack) { + learun.layerClose(window.name); + callBack(); + } + }; page.init(); } 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 465946539..470213e9a 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 @@ -40,7 +40,10 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/ElectiveMajor/Index?OLPOEId=' + keyValue, width: 1000, height: 700, - btn: null + //btn: null + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } }); } @@ -222,18 +225,29 @@ var bootstrap = function ($, learun) { { label: "通过人数", name: "StuNum", width: 60, align: "left" }, { label: "已报人数(预)", name: "StuNumOfApplyPre", width: 80, align: "left" }, { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" }, - //{ - // label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) { - // var str = ""; - // for (var i = 0; i < row.ElectiveMajorList.length; i++) { - // str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName; - // if (i != row.ElectiveMajorList.length - 1) { - // str += ","; - // } - // } - // return str; - // } - //} + { + label: "是否已选专业", name: "IsElectiveMajor", width: 100, align: "left", formatter: function (cellvalue,row) { + if (!!row.ElectiveMajorList && row.ElectiveMajorList.length > 0) { + return "是"; + } else { + return "否"; + } + } + }, + { + label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left", formatter: function (cellvalue, row) { + var str = ""; + if (!!cellvalue && cellvalue.length > 0) { + for (var i = 0; i < cellvalue.length; i++) { + str += cellvalue[i].Grade + "级" + cellvalue[i].MajorName; + if (i != cellvalue.length - 1) { + str += ","; + } + } + } + return str; + } + } ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs index 4152e37ad..106cc3bd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs @@ -4,6 +4,7 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Text; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -261,18 +262,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var now = DateTime.Now; var loginInfo = LoginUserInfo.Get(); + var list = db.FindList(x => x.OLPOEId == olpoeId); //添加 foreach (var item in dataList) { - var entity = new ElectiveMajorEntity(); - entity.Create(); - entity.OLPOEId = olpoeId; - entity.MajorId = item.ID; - entity.Grade = item.Grade; - entity.CreateUserId = loginInfo.userId; - entity.CreateUserName = loginInfo.realName; - entity.CreateDate = now; - db.Insert(entity); + //判断是否已选 + if (list.Where(x => x.MajorId == item.ID).Count() <= 0) + { + var entity = new ElectiveMajorEntity(); + entity.Create(); + entity.OLPOEId = olpoeId; + entity.MajorId = item.ID; + entity.Grade = item.Grade; + entity.CreateUserId = loginInfo.userId; + entity.CreateUserName = loginInfo.realName; + entity.CreateDate = now; + db.Insert(entity); + } } db.Commit(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index c2ec1f140..dfd8da0fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -359,7 +359,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { list = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); } - + //选课专业 + var majorSql = + @"SELECT t.MajorName,t.MajorNo,a.* FROM ElectiveMajor a left join CdMajor t on a.majorid=t.id"; + var electiveMajorList = this.BaseRepository("CollegeMIS").FindList(majorSql); foreach (var item in list) { //模式二：正式选课 @@ -381,6 +384,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration item.StuNumPre = aaa.Where(x => x.Status == 2).Count(); + //选课专业 + item.ElectiveMajorList = electiveMajorList.Where(x => x.OLPOEId == item.Id).ToList(); } return list; From 082b462a0bb89b8ebbafef8ab31c9b7c8c3f2748 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 22 Mar 2022 14:26:19 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=BC=82=E5=8A=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenLessonPlanOfElectiveController.cs | 45 +++++++++++++++++++ .../OpenLessonPlanOfElectiveService.cs | 18 +++++--- .../OpenLessonPlanOfElectiveChangeEntity.cs | 6 +++ 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs index 622ce156b..a1a8f1486 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Collections.Generic; using System; using System.Linq; +using Learun.Application.Base.SystemModule; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -25,6 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers CdMajorIBLL CdMajorIBLL = new CdMajorBLL(); private StuSelectLessonListOfElectivePreIBLL stuSelectLessonListOfElectivePreIBLL = new StuSelectLessonListOfElectivePreBLL(); private OpenLessonPlanOfElectiveChangeIBLL openLessonPlanOfElectiveChangeIBLL = new OpenLessonPlanOfElectiveChangeBLL(); + private DataSourceIBLL dataSourceIBLL = new DataSourceBLL(); #region 视图功能 @@ -224,14 +226,57 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (!string.IsNullOrEmpty(entity.AfterLessonNo)) { model.AfterLessonNo = entity.AfterLessonNo; + var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.AfterLessonNo + "'"); + if (lesson != null && lesson.Rows.Count > 0) + { + model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); + } + } + else + { + var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.LessonNo + "'"); + if (lesson != null && lesson.Rows.Count > 0) + { + model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); + } } + if (!string.IsNullOrEmpty(entity.AfterEmpNo)) { model.AfterEmpNo = entity.AfterEmpNo; + + var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.AfterEmpNo + "'"); + if (emp != null && emp.Rows.Count > 0) + { + model.AfterEmpName = emp.Rows[0]["empname"].ToString(); + } } + else + { + var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.EmpNo + "'"); + if (emp != null && emp.Rows.Count > 0) + { + model.AfterEmpName = emp.Rows[0]["empname"].ToString(); + } + } + if (!string.IsNullOrEmpty(entity.AfterClassRoomNo)) { model.AfterClassRoomNo = entity.AfterClassRoomNo; + + var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.AfterClassRoomNo + "'"); + if (classRoom != null && classRoom.Rows.Count > 0) + { + model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); + } + } + else + { + var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.ClassRoomNo + "'"); + if (classRoom != null && classRoom.Rows.Count > 0) + { + model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); + } } openLessonPlanOfElectiveChangeIBLL.SaveEntity("", model); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index dfd8da0fc..452884e6b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -420,14 +420,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EmId = db.FindEntity(x => x.OLPOEId == OLPEIdOne)?.EmId; var OLPEIdTwo = db.FindEntity(x => x.EmId == EmId && x.OLPOEId != OLPEIdOne).OLPOEId; var lessonInfoEntity = db.FindEntity(x => x.LessonNo == entity.AfterLessonNo); + //选修课开课计划 + db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdOne}' "); - db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdOne}' "); - db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); + //学生选课表 + db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where OLPEId='{OLPEIdOne}' "); db.ExecuteBySql($"update StuSelectLessonListOfElectivePre set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); - db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where EmId='{EmId}' "); - db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}' where EMId='{EmId}' "); - db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdTwo}' "); - db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); + //选修合班明细 + db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where EmId='{EmId}' "); + //合班合并结果 + db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}' where EMId='{EmId}' "); + //合班异动数据记录 + db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdTwo}' "); + //选修课程表 + db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); db.Commit(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs index 280180925..690b6a29c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs @@ -107,6 +107,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string EmpNo { get; set; } [NotMapped] public string ClassRoomNo { get; set; } + [NotMapped] + public string AfterLessonName { get; set; } + [NotMapped] + public string AfterEmpName { get; set; } + [NotMapped] + public string AfterClassRoomName { get; set; } #endregion } From e93705ae20665165c38a1ae71566dd69645a8caa Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 24 Mar 2022 11:29:36 +0800 Subject: [PATCH 05/41] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E9=A1=B5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A4=B1=E8=B4=A5=E5=A4=84=E7=90=86=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=AF=BC=E5=87=BA=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=B8=8D?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/LR_Content/plugin/grid/jfgrid.js | 1 + .../Views/LR_Content/script/lr-excel.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js index e78391a95..767cc70ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js @@ -2203,6 +2203,7 @@ dfop.rows = 1000000; data = data || dfop.param || {}; dfop.param = data.param || data; + dfop.running.pageparam.page = 1; _jfgrid.reload($self, dfop); break; case 'refresh': diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js index a617e48ef..d3bd95e31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js @@ -61,6 +61,12 @@ callBack: function (id) { return top[id].acceptClick(); }, + end: function () { + if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) { + learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30; + learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload'); + } + }, btn: ['导出Excel', '关闭'] }); }); From 4b1659f6e1fdca1018bc7ce24d552361186be2cb Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 24 Mar 2022 16:36:10 +0800 Subject: [PATCH 06/41] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=80=89=E4=BF=AE?= =?UTF-8?q?=E8=AF=BE=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenLessonPlanOfElective/StudentIndex.js | 17 ++++++++++++++++- .../StuSelectLessonListOfElective/Index.js | 17 ++++++++++++++++- .../QueryStuSelectResult.js | 2 +- .../OpenLessonPlanOfElectiveEntity.cs | 2 ++ .../OpenLessonPlanOfElectiveService.cs | 4 ++-- .../StuSelectLessonListOfElectiveEntity.cs | 1 + .../StuSelectLessonListOfElectiveService.cs | 4 ++-- 7 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js index c426e026f..3079bf4fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js @@ -176,7 +176,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/GetPageListOfStudent', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, @@ -196,6 +196,21 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "课程类型", name: "LessonTypeId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + console.log(row.LessonTypeId); + + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', + key: row.LessonTypeId, + keyId: 'ltid', + callback: function (_data) { + callback(_data['lessontypename']); + } + }); + } + }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js index fa4d52a95..9da21e054 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js @@ -68,7 +68,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetPageList', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left"}, @@ -87,6 +87,21 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "课程类型", name: "LessonTypeId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + console.log(row.LessonTypeId); + + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', + key: row.LessonTypeId, + keyId: 'ltid', + callback: function (_data) { + callback(_data['lessontypename']); + } + }); + } + }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js index c5f5bb8cb..48fd142b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', headData: [ { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs index 3f3730287..c7b3e472e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs @@ -222,6 +222,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string LessonNo2 { get; set; } [NotMapped] public string EmpNo2 { get; set; } + [NotMapped] public string LessonTypeId { get; set; } + /// /// 选课专业列表 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index 452884e6b..6e76ce297 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -100,9 +100,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1"); var strSql = new StringBuilder(); - strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id + strSql.Append(@"select b.*,leif.LessonTypeId,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo - left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo + left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo left join LessonInfo leif on b.LessonNo=leif.LessonNo where not exists ( "); //不显示与已选课程 相同课程名称相同教师的课程 strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs index 70f099fe1..d27073da4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs @@ -212,6 +212,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 扩展字段 [NotMapped] public string F_SchoolId { get; set; } + [NotMapped] public string LessonTypeId { get; set; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs index 1ff93c134..9bff6fd34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs @@ -29,8 +29,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.* "); - strSql.Append(" FROM StuSelectLessonListOfElective t "); + strSql.Append("SELECT t.*,leif.LessonTypeId "); + strSql.Append(" FROM StuSelectLessonListOfElective t left join LessonInfo leif on t.LessonNo=leif.LessonNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 From 11efc41159cf30e3b05439989f23c2b64b0a5e97 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 25 Mar 2022 10:12:01 +0800 Subject: [PATCH 07/41] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BF=85=E4=BF=AE?= =?UTF-8?q?=E6=8E=92=E8=AF=BE=E6=96=B9=E6=B3=95=E5=86=85=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 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 058d33054..6b07e142f 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 @@ -684,7 +684,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest 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` - WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); + WHERE 1=1 AND c.number IS NOT NULL AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); if (LessonList.Count() > 0) { @@ -758,7 +758,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_curriculum curriculum ON curriculum.id = a.curriculum LEFT JOIN tb_classroom room ON room.id = a.classroom LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher - WHERE semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); + WHERE a.type='1' and semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync(@"SELECT * FROM TeachClass WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); @@ -847,7 +847,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_course cour ON cour.id= p.`course` LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester - + "' AND sc.sid = '" + entity.F_SchoolId + "' ORDER BY p.`major` "); + + "' AND sc.sid = '" + entity.F_SchoolId + "' AND curr.`ification` ='1' ORDER BY p.`major` "); var majorData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); var lessonData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); From dffa8ca378ab760b7a950d488b693de038ea4000 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 25 Mar 2022 16:50:17 +0800 Subject: [PATCH 08/41] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=90=8E=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=9B=B4=E6=8E=A5=E4=BC=9A?= =?UTF-8?q?update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CustmerformController.cs | 19 +++++++++++----- .../Views/NWFProcess/NWFContainerForm.js | 22 +++++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs index 50cb98846..da1527d9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs @@ -1,4 +1,5 @@ -using Learun.Application.Form; +using System; +using Learun.Application.Form; using Learun.Util; using System.Collections.Generic; using System.Web.Mvc; @@ -331,12 +332,20 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers [ValidateInput(false)] public ActionResult SaveInstanceForms(string data) { - List list = data.ToObject>(); - foreach (var item in list) + try { - formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + List list = data.ToObject>(); + foreach (var item in list) + { + formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + } + return Success("保存成功！"); } - return Success("保存成功！"); + catch (Exception e) + { + return Fail("sql执行错误，数据溢出"); + } + } /// /// 删除自定义表单数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 090db1c3a..a66d6452e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -711,13 +711,13 @@ var bootstrap = function ($, learun) { signUrl: signUrl, stamp: stamp }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { - learun.loading(false); - if (_data) { - learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); - learun.frameTab.close(tabIframeId); - } - }); + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { + learun.loading(false); + if (_data) { + learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close(tabIframeId); + } + }); }); }); } @@ -1721,14 +1721,18 @@ var bootstrap = function ($, learun) { formData[_item.field] = processId; point.formData = JSON.stringify(formData); formDataList.push(point); - - _item.isUpdate = true; + //liangkun 修复第一次保存失败报错后第二次直接会update + //_item.isUpdate = true; } }); if (formDataList.length > 0) { $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForms', { data: JSON.stringify(formDataList) }, function (res) { if (res.code == 200) { + //liangkun 修复第一次保存失败报错后第二次直接会update + $.each(nwfForms, function (_index, _item) { + _item.isUpdate = true; + }); monitorSave(); } else { From 936e88b44e05d209964bfef48f3cbafee1d64917 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 29 Mar 2022 10:45:26 +0800 Subject: [PATCH 09/41] =?UTF-8?q?=E6=95=99=E5=8A=A1--=E8=A1=A5=E8=80=83?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LessonInfoController.cs | 12 ++ .../Controllers/StuScoreNotPassController.cs | 44 +++++- .../Views/StuScoreNotPass/IndexUnpass.cshtml | 58 +++++++ .../Views/StuScoreNotPass/IndexUnpass.js | 143 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../LessonInfo/LessonInfoBLL.cs | 19 +++ .../LessonInfo/LessonInfoIBLL.cs | 1 + .../LessonInfo/LessonInfoService.cs | 19 +++ .../StuScoreNotPass/StuScoreNotPassBLL.cs | 40 +++++ .../StuScoreNotPass/StuScoreNotPassEntity.cs | 14 ++ .../StuScoreNotPass/StuScoreNotPassIBLL.cs | 2 + .../StuScoreNotPass/StuScoreNotPassService.cs | 107 +++++++++++++ 12 files changed, 460 insertions(+), 1 deletion(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs index 270d9f43b..d99e78b0a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs @@ -104,6 +104,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers LessonInfoData.Introduction = WebHelper.HtmlDecode(LessonInfoData.Introduction); return Success(LessonInfoData); } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonByMajorNo(string majorNo) + { + var LessonInfoList = lessonInfoIBLL.GetLessonByMajorNo(majorNo); + return Success(LessonInfoList); + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs index ef8c04c8d..77e7fec38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs @@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 补考名单查看 + /// + /// + [HttpGet] + public ActionResult IndexUnpass() + { + return View(); + } + #endregion #region 获取数据 @@ -106,6 +116,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + /// + /// 补考名单查看 + /// 分页参数 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForUnpass(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreNotPassIBLL.GetPageListForUnpass(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// /// 获取表单数据 /// 主键 @@ -171,7 +203,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - + /// 初始化补考成绩 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult InitScore() + { + stuScoreNotPassIBLL.InitScore(); + return Success("操作成功！"); + } + #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml new file mode 100644 index 000000000..7f42b08f4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml @@ -0,0 +1,58 @@ +@{ + ViewBag.Title = "长阳迎新"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
学年
+
+
+
+
学期
+
+
+
+
年级
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
课程
+
+
+
+
班级
+
+
+
+
+
+
+
+
+ +
+
+  初始化补考成绩 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js new file mode 100644 index 000000000..f9cdd3fac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js @@ -0,0 +1,143 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-12-16 10:14 + * 描 述：长阳迎新 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + //年级 + $('#grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + + majorNo, + text: "ClassName", + value: "ClassNo" + }); + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + + majorNo, + text: "LessonName", + value: "LessonNo" + }); + } + }); + $('#ClassNo').lrDataSourceSelect({ + code: 'bjsj', value: 'classno', text: 'classname' + }); + $('#LessonNo').lrDataSourceSelect({ + code: 'LessonInfo', value: 'lessonno', text: 'lessonname' + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 初始化补考成绩 + $('#lr_Init').on('click', function () { + learun.layerConfirm('是否确认初始化补考成绩！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetPageListForUnpass', + headData: [ + { + label: "学号", name: "stuno", width: 80, align: "left" + }, + { + label: "姓名", name: "stuname", width: 100, align: "left" + }, + { label: "课程", name: "LessonName", width: 100, align: "left" }, + { label: "考试年级", name: "Grade", width: 100, align: "left" }, + { + label: "学年", name: "AcademicYearNo", width: 80, align: "left", + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'usersex', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} + }, + { label: "学期", name: "Semester", width: 150, align: "left" }, + { label: "班级", name: "classname", width: 150, align: "left" }, + { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, + { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, + { label: "成绩", name: "Score2", width: 150, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'ClassNo,LessonNo', + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index ddde51aa8..1a7dc16c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1043,6 +1043,7 @@ + @@ -7641,6 +7642,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs index 2dd7f2d23..1bdfcc200 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs @@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetLessonByMajorNo(string majorNo) + { + try + { + return lessonInfoService.GetLessonByMajorNo(majorNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs index bb89e6e35..9e56b4fd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs @@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetLessonByMajorNo(string majorNo); /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 2bbbdb6c8..96e49ebe8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs @@ -100,6 +100,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetLessonByMajorNo(string majorNo) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.TeachMajorNo == majorNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + internal bool GetAny() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs index b083b6586..06edde13f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs @@ -65,6 +65,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + return stuScoreNotPassService.GetPageListForUnpass(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取实体数据 /// 主键 @@ -187,6 +206,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化补考成绩 + /// + public void InitScore() + { + try + { + stuScoreNotPassService.InitScore(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs index c937dc615..d5a83aac9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs @@ -328,5 +328,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion } + + public class NotPassEntity + { + public string stuno { get; set; } + public string stuname { get; set; } + public string LessonName { get; set; } + public string Grade { get; set; } + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public string classname { get; set; } + public string OrdinaryScore2 { get; set; } + public string TermEndScore2 { get; set; } + public string Score2 { get; set; } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs index 509b479e6..ad1e1472d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs @@ -26,6 +26,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取实体数据 /// 主键 @@ -61,6 +62,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void SaveEntity(string keyValue, StuScoreNotPassEntity entity); + void InitScore(); #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 464fdc255..32e6e39c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -163,6 +163,67 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) +else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) +else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) +else CONVERT(varchar,a.Score) end as Score2 "); + strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo "); + strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); + } + if (!queryParam["Semester"].IsEmpty()) + { + strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); + } + if (!queryParam["grade"].IsEmpty()) + { + strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); + } + if (!queryParam["ClassNo"].IsEmpty()) + { + strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); + } + + strSql.Append(" and b.AbmormityMoveMark!='1'"); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取实体数据 /// 主键 @@ -342,6 +403,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化补考成绩 + /// + public void InitScore() + { + try + { + string sql = @"insert into StuScoreNotPass +(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, + TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) + select + NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', + '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' + from + ( + select a.* from +StuScore a +left join StuInfoBasic b on b.StuNo=a.StuNo +where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) +and a.StuNo not in ( +select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo +) +) as bb +order by bb.ScoreId"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion #region 扩展数据 From ff53ad9d60972269937b6e1b631957bb8dd2d1ea Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 29 Mar 2022 12:11:34 +0800 Subject: [PATCH 10/41] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=A1=A5=E8=80=83?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuScoreNotPassTwoController.cs | 43 ++++++ .../StuScoreNotPassTwo/IndexUnpassTwo.cshtml | 58 +++++++ .../StuScoreNotPassTwo/IndexUnpassTwo.js | 143 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../StuScoreNotPassTwoBLL.cs | 45 ++++++ .../StuScoreNotPassTwoIBLL.cs | 2 + .../StuScoreNotPassTwoService.cs | 115 ++++++++++++++ 7 files changed, 408 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs index 380f8dc62..8eec54f49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs @@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } + /// + /// 二次补考成绩查看 + /// + /// + [HttpGet] + public ActionResult IndexUnpassTwo() + { + return View(); + } + #endregion #region 获取数据 @@ -146,6 +156,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(data); } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForUnpass(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreNotPassTwoIBLL.GetPageListForUnpass(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } #endregion #region 提交数据 @@ -176,6 +207,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassTwoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + + /// + /// 初始化二次补考成绩 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult InitScore() + { + stuScoreNotPassTwoIBLL.InitScore(); + return Success("操作成功！"); + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml new file mode 100644 index 000000000..da3304a88 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml @@ -0,0 +1,58 @@ +@{ + ViewBag.Title = "二次补考成绩查看"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
学年
+
+
+
+
学期
+
+
+
+
年级
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
课程
+
+
+
+
班级
+
+
+
+
+
+
+
+
+ +
+
+  初始化二次补考成绩 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js new file mode 100644 index 000000000..2c9f8248a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js @@ -0,0 +1,143 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-12-16 10:14 + * 描 述：长阳迎新 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + //年级 + $('#grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + + majorNo, + text: "ClassName", + value: "ClassNo" + }); + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + + majorNo, + text: "LessonName", + value: "LessonNo" + }); + } + }); + $('#ClassNo').lrDataSourceSelect({ + code: 'bjsj', value: 'classno', text: 'classname' + }); + $('#LessonNo').lrDataSourceSelect({ + code: 'LessonInfo', value: 'lessonno', text: 'lessonname' + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 初始化补考成绩 + $('#lr_Init').on('click', function () { + learun.layerConfirm('是否确认初始化二次补考成绩！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetPageListForUnpass', + headData: [ + { + label: "学号", name: "stuno", width: 80, align: "left" + }, + { + label: "姓名", name: "stuname", width: 100, align: "left" + }, + { label: "课程", name: "LessonName", width: 100, align: "left" }, + { label: "考试年级", name: "Grade", width: 100, align: "left" }, + { + label: "学年", name: "AcademicYearNo", width: 80, align: "left", + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'usersex', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} + }, + { label: "学期", name: "Semester", width: 150, align: "left" }, + { label: "班级", name: "classname", width: 150, align: "left" }, + { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, + { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, + { label: "成绩", name: "Score2", width: 150, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'ClassNo,LessonNo', + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 1a7dc16c5..6a8a214c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1038,6 +1038,7 @@ + @@ -7643,6 +7644,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs index d9169e806..fa7db1635 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs @@ -65,6 +65,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 二次补考名单查看 + /// + /// + /// + /// + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + return stuScoreNotPassTwoService.GetPageListForUnpass(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -164,6 +188,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化二次补考成绩 + /// + public void InitScore() + { + try + { + stuScoreNotPassTwoService.InitScore(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs index bf26394c2..fe3be3622 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs @@ -27,6 +27,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -57,6 +58,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void DeleteEntity(string keyValue); + void InitScore(); /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index e13506595..e31ad49c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -249,6 +249,73 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 二次补考成绩查看 + /// + /// + /// + /// + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) +else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) +else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) +else CONVERT(varchar,a.Score) end as Score2 "); + strSql.Append(@" from StuScoreNotPass a left join StuInfoBasic b on b.StuNo=a.StuNo "); + strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); + } + if (!queryParam["Semester"].IsEmpty()) + { + strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); + } + if (!queryParam["grade"].IsEmpty()) + { + strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); + } + if (!queryParam["ClassNo"].IsEmpty()) + { + strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); + } + + strSql.Append(" and b.AbmormityMoveMark!='1' "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 @@ -310,10 +377,58 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + #endregion #region 扩展数据 + /// + /// 初始化二次补考成绩 + /// + public void InitScore() + { + try + { + string sql = @"insert into StuScoreNotPassTwo +(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, + TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) + select + NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', + '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' + from + ( + select a.* from +StuScoreNotPass a +left join StuInfoBasic b on b.StuNo=a.StuNo +where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) +and a.StuNo not in ( +select StuNo from StuScoreNotPassTwo p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo +) +) as bb +order by bb.ScoreId"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 学年下拉框信息 /// From 825697b14359583327833ca187f0e7b1d0548927 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 29 Mar 2022 15:31:07 +0800 Subject: [PATCH 11/41] =?UTF-8?q?=E8=A1=A5=E8=80=83=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScoreNotPass/IndexUnpass.js | 4 ++++ .../StuScoreNotPass/StuScoreNotPassService.cs | 2 +- .../StuScoreNotPassTwo/StuScoreNotPassTwoService.cs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js index f9cdd3fac..672507755 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js @@ -38,6 +38,7 @@ var bootstrap = function ($, learun) { text: 'text' }); $('#DeptNo').lrDataSourceSelect({ + allowSearch: true, code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { var deptno = ""; if (val) { @@ -51,6 +52,7 @@ var bootstrap = function ($, learun) { } }); $('#MajorNo').lrDataSourceSelect({ + allowSearch: true, code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (val) { var majorNo = ''; @@ -74,9 +76,11 @@ var bootstrap = function ($, learun) { } }); $('#ClassNo').lrDataSourceSelect({ + allowSearch: true, code: 'bjsj', value: 'classno', text: 'classname' }); $('#LessonNo').lrDataSourceSelect({ + allowSearch: true, code: 'LessonInfo', value: 'lessonno', text: 'lessonname' }); // 刷新 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 32e6e39c9..501189f44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -208,7 +208,7 @@ else CONVERT(varchar,a.Score) end as Score2 "); strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); } - strSql.Append(" and b.AbmormityMoveMark!='1'"); + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index e31ad49c3..979fee09a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -300,7 +300,7 @@ else CONVERT(varchar,a.Score) end as Score2 "); strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); } - strSql.Append(" and b.AbmormityMoveMark!='1' "); + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); } catch (Exception ex) From e159f9fa8e3aa0cf7c2adfc091f7f0dfa6016205 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 29 Mar 2022 15:37:30 +0800 Subject: [PATCH 12/41] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1-=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9-?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuScoreController.cs | 27 ++++++ .../StuScore/AllStuScoreQueryIndex.cshtml | 36 ++++++++ .../Views/StuScore/AllStuScoreQueryIndex.js | 83 +++++++++++++++++++ .../StuScore/StuScoreService.cs | 2 +- 4 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 905be20de..d5e16926b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -183,6 +183,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 全院学生成绩查看页面 + /// + /// + [HttpGet] + public ActionResult AllStuScoreQueryIndex() + { + return View(); + } #endregion #region 获取数据 @@ -715,6 +724,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(result); } + /// + /// 全院学生成绩查看 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetScoreListByStuNo2(string queryJson) + { + var data = stuScoreIBLL.GetScoreListByStuNo(queryJson); + if (data.Any()) + { + data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x => x.LessonNo); + } + + return Success(data); + } + public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo) { var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml new file mode 100644 index 000000000..fabcc03bc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml @@ -0,0 +1,36 @@ +@{ ViewBag.Title = "全院学生成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; } + +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js") + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js new file mode 100644 index 000000000..48543e2f5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -0,0 +1,83 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-06-14 11:02 + * 描 述：全院学生成绩查看 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.bind(); + page.bindSelect(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var p = {}; + p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + p.Semester = $('#Semester').lrselectGet(); + p.StuNo = $.trim($('#StuNo').val()); + if (p.StuNo == null || p.StuNo == "") { + learun.alert.warning("请输入学号！"); + return; + } + + page.initGird(); + page.search(p); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + bindSelect: function () { + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学期", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuNo2', + headData: [ + { label: '学号', name: 'StuNo', width: 100, align: "left" }, + { label: '姓名', name: 'StuName', width: 100, align: "left" }, + { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, + { label: '学期', name: 'Semester', width: 100, align: "left" }, + { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, + { label: '课程名称', name: 'LessonName', width: 200, align: "left" }, + { label: '总分', name: 'ScoreFormat', width: 100, align: "left" }, + ], + mainId: 'StuNo', + isPage: false, + sidx: '', + sord: '', + }); + + //page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index d80ecc687..ff9ad073b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1839,7 +1839,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var strSql = new StringBuilder(); strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName "); strSql.Append(" ,case when bb.LessonSortNo='2' then bb.Score else (case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end) end as Score "); - strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score) else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); + strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score)+'(选修)' else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); strSql.Append(" from ( "); strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); From e8672a91bf7dcb549c06096bbe488849dcce43e8 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 29 Mar 2022 15:53:29 +0800 Subject: [PATCH 13/41] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Learun.Application.Web.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 6a8a214c6..4b477c1c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1048,6 +1048,7 @@ + @@ -7645,6 +7646,7 @@ + From 8ae31f27f44845c23010f1bf00003ad7d0031ba2 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 29 Mar 2022 16:20:19 +0800 Subject: [PATCH 14/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9A=E5=88=97=E8=B7=9D=E7=A6=BB=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index 48543e2f5..e48abb9be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -56,11 +56,11 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuNo2', headData: [ { label: '学号', name: 'StuNo', width: 100, align: "left" }, - { label: '姓名', name: 'StuName', width: 100, align: "left" }, + { label: '姓名', name: 'StuName', width: 150, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 100, align: "left" }, { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, - { label: '课程名称', name: 'LessonName', width: 200, align: "left" }, + { label: '课程名称', name: 'LessonName', width: 280, align: "left" }, { label: '总分', name: 'ScoreFormat', width: 100, align: "left" }, ], mainId: 'StuNo', From 38c16c77a062d0d2a5379028404a4bf563344e50 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 29 Mar 2022 16:22:03 +0800 Subject: [PATCH 15/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9A=E5=88=97=E8=B7=9D=E7=A6=BB=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index e48abb9be..baf1c2f77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -56,11 +56,11 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuNo2', headData: [ { label: '学号', name: 'StuNo', width: 100, align: "left" }, - { label: '姓名', name: 'StuName', width: 150, align: "left" }, + { label: '姓名', name: 'StuName', width: 200, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 100, align: "left" }, { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, - { label: '课程名称', name: 'LessonName', width: 280, align: "left" }, + { label: '课程名称', name: 'LessonName', width: 300, align: "left" }, { label: '总分', name: 'ScoreFormat', width: 100, align: "left" }, ], mainId: 'StuNo', From 57cd001b04b279146f63231ab823973469640b7e Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 30 Mar 2022 17:21:56 +0800 Subject: [PATCH 16/41] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=8E=A5=E5=8F=A3=EF=BC=9B=E5=85=A8=E9=99=A2=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi.csproj | 1 + .../Modules/StuScoreApi.cs | 112 ++++++++++++++++++ .../Modules/TimeTable.cs | 89 +++++++++++++- .../StuScore/StuScoreBLL.cs | 24 ++++ .../StuScore/StuScoreEntity.cs | 20 +++- .../StuScore/StuScoreIBLL.cs | 6 + .../StuScore/StuScoreService.cs | 67 +++++++++++ 7 files changed, 317 insertions(+), 2 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index a5634307c..13908fea8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -212,6 +212,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs new file mode 100644 index 000000000..e4a560b61 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs @@ -0,0 +1,112 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using Learun.Util; +using Nancy; +using Newtonsoft.Json; + +namespace Learun.Application.WebApi.Modules +{ + public class StuScoreApi : BaseNoLoginApi + { + public StuScoreApi() + : base("/Learun/adms/EducationalAdministration/StuScore") + { + Get["/scoreListByStuInfo"] = GetScoreListByStuInfo; + + } + + private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); + private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); + private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); + private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); + + /// + /// 获取成绩列表 + /// + /// + /// + private Response GetScoreListByStuInfo(dynamic _) + { + var param = this.GetReq(); + + ScoreListByStuInfo result = new ScoreListByStuInfo(); + + var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(param.StuNo); + if (stuInfoBasicEntity != null) + { + result.StuNo = stuInfoBasicEntity.StuNo; + result.StuName = stuInfoBasicEntity.StuName; + result.MajorNo = stuInfoBasicEntity.MajorNo; + result.ClassNo = stuInfoBasicEntity.ClassNo; + if (!string.IsNullOrEmpty(stuInfoBasicEntity.MajorNo)) + { + result.MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo)?.MajorName; + } + if (!string.IsNullOrEmpty(stuInfoBasicEntity.ClassNo)) + { + result.ClassName = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo)?.ClassName; + } + } + var queryJson = JsonConvert.SerializeObject(param); + + var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); + var dataTemp = data.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new ScoreList() + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + StuScoreEntityList = x.Select(y => new StuScoreEntity() + { + AcademicYearNo = y.AcademicYearNo, + Semester = y.Semester, + LessonSortNo = y.LessonSortNo, + LessonSortName = y.LessonSortName, + LessonNo = y.LessonNo, + LessonName = y.LessonName, + StudyScore = y.StudyScore, + Score = y.Score, + ScoreOfNotPass = y.ScoreOfNotPass, + ScoreOfNotPassTwo = y.ScoreOfNotPassTwo + }).OrderBy(a=>a.LessonSortNo).ThenBy(a=>a.LessonNo).ToList() + }).ToList().OrderByDescending(x=>x.AcademicYearNo).ThenByDescending(x=>x.Semester); + result.ScoreList = dataTemp.ToList(); + + return Success(result); + + } + + public class Model + { + /// + /// 学年（18-19） + /// + public string AcademicYearNo { get; set; } + /// + /// 学期（1） + /// + public string Semester { get; set; } + /// + /// 学号 + /// + public string StuNo { get; set; } + + } + public class ScoreListByStuInfo { + public string StuNo { get; set; } + public string StuName { get; set; } + public string MajorNo { get; set; } + public string MajorName { get; set; } + public string ClassNo { get; set; } + public string ClassName { get; set; } + public List ScoreList { get; set; } + } + public class ScoreList { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public List StuScoreEntityList { get; set; } + } + + } +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 65df96b5e..457e01c62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -13,7 +13,7 @@ using Nancy; namespace Learun.Application.WebApi.Modules { - public class TimeTable : BaseApi + public class TimeTable : BaseNoLoginApi { public TimeTable() : base("/learun/adms/timetable") @@ -21,6 +21,7 @@ namespace Learun.Application.WebApi.Modules Get["/list"] = GetList; Get["/StuList"] = GetStuInfo; Get["/StuLessonInfo"] = GetStuLessonInfo; + Get["/timeTableData"] = GetTimeTableData; } private ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL(); private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL(); @@ -111,6 +112,68 @@ namespace Learun.Application.WebApi.Modules } + + /// + /// 全院课程表【按班级分组】 + /// + /// + /// + private Response GetTimeTableData(dynamic _) + { + var param = this.GetReq(); + + TimeTableData result = new TimeTableData(); + + //开始时间 + var startdate = string.IsNullOrEmpty(param.StartDate) ? DateTime.Today : Convert.ToDateTime(param.StartDate); + var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd"); + var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd"); + result.StartDate = startDate; + result.EndDate = endDate; + + var semesterAndYear = Common.GetSemesterAndYear(startDate); + result.AcademicYearNo = semesterAndYear.AcademicYearLong; + result.Semester = semesterAndYear.Semester; + + //课程表数据 + var timeTableList = new List(); + //必修课课程表 + var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + timeTableList.AddRange(data); + //选修课课程表 + var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + timeTableList.AddRange(dataOfElective); + var dataTemp = timeTableList.GroupBy(x => new { x.TeachClassNo, x.ClassName, x.LessonSortNo }).Select(x => new ClassDataList() + { + ClassNo = x.Key.TeachClassNo, + ClassName = x.Key.ClassName, + LessonSortNo = x.Key.LessonSortNo, + TimeTableList = x.Select(y => new TwoDevelopment.EducationalAdministration.TimeTable() + { + AcademicYear = y.AcademicYear, + Semester = y.Semester, + DeptNo = y.DeptNo, + MajorNo = y.MajorNo, + F_SchoolId = y.F_SchoolId, + LessonNo = y.LessonNo, + LessonName = y.LessonName, + LessonDate = y.LessonDate, + LessonTime = y.LessonTime, + EmpNo = y.EmpNo, + EmpName = y.EmpName, + TeachClassNo = y.TeachClassNo, + ClassName = y.ClassName, + ClassRoomNo = y.ClassRoomNo, + ClassroomName = y.ClassroomName, + LessonSortNo = y.LessonSortNo + }).OrderBy(a => a.LessonTime.Substring(0, 1)).ThenBy(a => a.LessonTime.Substring(1)).ToList() + }).OrderBy(x => x.LessonSortNo).ThenBy(x => x.ClassNo).ToList(); + + result.ClassDataList = dataTemp; + + return Success(result); + + } /// /// 数字转中文 @@ -166,6 +229,30 @@ namespace Learun.Application.WebApi.Modules { public string StartDate { get; set; } public string EndDate { get; set; } + /// + /// 班级编号 + /// + public string ClassNo { get; set; } + /// + /// 教师编号 + /// + public string EmpNo { get; set; } } + public class TimeTableData + { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public string StartDate { get; set; } + public string EndDate { get; set; } + public List ClassDataList { get; set; } + } + public class ClassDataList + { + public string ClassNo { get; set; } + public string ClassName { get; set; } + public string LessonSortNo { get; set; } + public List TimeTableList { get; set; } + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs index 9fc249220..f311eb7a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs @@ -677,6 +677,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + public IEnumerable GetScoreListByStuInfo(string queryJson) + { + try + { + return stuScoreService.GetScoreListByStuInfo(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetStuGraduateInfo(string queryJson) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs index 5b3681e63..8946527f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs @@ -388,11 +388,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// - /// 成绩格式化(补)(重) + /// 成绩格式化(补)(重)(选修) /// [NotMapped] public string ScoreFormat { get; set; } + /// + /// 补考成绩 + /// + [NotMapped] + public string ScoreOfNotPass { get; set; } + /// + /// 二次补考成绩 + /// + [NotMapped] + public string ScoreOfNotPassTwo { get; set; } + /// + /// 课程类别名称 + /// + /// + [NotMapped] + public string LessonSortName { get; set; } + + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs index 1943c15b9..7e987896c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs @@ -182,6 +182,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetScoreListByStuNo(string queryJson); + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + IEnumerable GetScoreListByStuInfo(string queryJson); /// /// 获取个人成绩列表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index ff9ad073b..1deba2713 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1876,5 +1876,72 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad } } } + + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + public IEnumerable GetScoreListByStuInfo(string queryJson) + { + try + { + //参考写法 + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var tableName = "StuScore"; + if (!queryParam["TableName"].IsEmpty()) + { + tableName = queryParam["TableName"].ToString(); + } + var strSql = new StringBuilder(); + strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,li.StudyScore,ls.LessonSortName,bb.Score,sp.Score as ScoreOfNotPass,spt.Score as ScoreOfNotPassTwo "); + strSql.Append(" from ( "); + strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); + strSql.Append(" where 1=1 and s.CheckMark='1' "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" and s.AcademicYearNo=@AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" and s.Semester=@Semester "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); + strSql.Append(" and s.StuNo=@StuNo "); + } + if (!queryParam["StuName"].IsEmpty()) + { + dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); + strSql.Append(" and s.StuName=@StuName "); + } + strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName ) as bb "); + strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); + strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); + strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); + strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo "); + + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + } } From 55a3e55a80ee9a8c6e9d254cf1f119b1f5087697 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 30 Mar 2022 17:45:45 +0800 Subject: [PATCH 17/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/StuScore/StuScoreService.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/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index 1deba2713..0da6b7d3a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1924,7 +1924,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); - strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo "); + strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } From 65ca6a55474f71e8420997cf36ed032c2d696a6a Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 30 Mar 2022 17:46:15 +0800 Subject: [PATCH 18/41] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=89=E4=BF=AE=E8=AF=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...StuSelectLessonListOfElectiveController.cs | 6 + .../QueryStuSelectResultForTeacher.cshtml | 59 +++++ .../QueryStuSelectResultForTeacher.js | 218 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + 4 files changed, 285 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs index cc47418eb..cb4b7d1b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs @@ -34,6 +34,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + [HttpGet] + public ActionResult QueryStuSelectResultForTeacher() + { + return View(); + } /// /// 教务-审核表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml new file mode 100644 index 000000000..f7c8f9b3c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml @@ -0,0 +1,59 @@ +@{ + ViewBag.Title = "选修课课程"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
学年
+
+
+
+
学期
+
+
+
+
校区
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
班级
+
+
+
+
选课状态
+
+
+
+
报名状态
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js new file mode 100644 index 000000000..a773bbc7e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js @@ -0,0 +1,218 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-05-15 10:33 + * 描 述：选修课课程 + */ +var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + if ($("#AcademicYearNo").lrselectGet() == "" || $("#AcademicYearNo").lrselectGet() == null || $("#AcademicYearNo").lrselectGet() == undefined) { + top.learun.alert.warning("请先选择学年！"); + return false; + } + if ($("#Semester").lrselectGet() == "" || $("#Semester").lrselectGet() == null || $("#Semester").lrselectGet() == undefined) { + top.learun.alert.warning("请先选择学期！"); + return; + } + page.search(queryJson); + }, 300, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学期", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' }); + $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' }); + $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, + { label: "学期", name: "Semester", width: 60, align: "left" }, + { + label: "校区", name: "F_SchoolId", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "选课状态", name: "Id", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == null || cellvalue == undefined || cellvalue == "") { + return '未报名'; + } else { + return '已报名'; + } + } + }, + { + label: "报名状态", name: "Status", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == 1) { + return '审核中'; + } else if (cellvalue == 2) { + return '报名成功'; + } else if (cellvalue == 3) { + return '报名失败'; + } else { + return '未报名'; + } + } + }, + { label: "所选课程号", name: "LessonNo", width: 100, align: "left" }, + { + label: "所选课程名称", name: "LessonName", width: 150, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + key: row.LessonNo, + keyId: 'lessonno', + callback: function (_data) { + callback(_data['lessonname']); + } + }); + } + }, + { label: "课程学分", name: "StudyScore", width: 100, align: "left" }, + { label: "教师编号", name: "EmpNo", width: 100, align: "left" }, + { + label: "教师姓名", name: "EmpName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: row.EmpNo, + keyId: 'empno', + callback: function (_data) { + callback(_data['empname']); + } + }); + } + }, + { + label: "上课节次", name: "LessonSection", width: 150, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue != "" && cellvalue != undefined && cellvalue != null) { + if (cellvalue.indexOf(',') == -1) { + return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; + } else { + return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; + } + } + } + }, + { label: "上课时间", name: "LessonTime", width: 180, align: "left" }, + { + label: "教室名称", name: "ClassRoomName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo', + key: row.ClassRoomNo, + keyId: 'classroomno', + callback: function (_data) { + callback(_data['classroomname']); + } + }); + } + }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + ], + mainId: 'StuId', + isPage: true, + sidx: 'StuNo', + sord: 'asc' + }); + }, + search: function (param) { + param = param || {}; + param.EmpNo = learun.clientdata.get(['userinfo']).enCode; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 4b477c1c3..3d1b00bb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1056,6 +1056,7 @@ + @@ -7647,6 +7648,7 @@ + From 07a0b1d3760481d33289fee67a4d81f2f9a5e818 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 30 Mar 2022 18:15:28 +0800 Subject: [PATCH 19/41] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=BF=E8=88=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Acc_DormitoryRuleController.cs | 141 ++++ .../Controllers/AccommodationController.cs | 205 +++++- .../Controllers/DormitoryReturnController.cs | 245 +++++++ .../Views/Acc_DormitoryRule/Form.cshtml | 27 + .../Views/Acc_DormitoryRule/Form.js | 62 ++ .../Views/Acc_DormitoryRule/Index.cshtml | 27 + .../Views/Acc_DormitoryRule/Index.js | 139 ++++ .../Views/Accommodation/Corridor.cshtml | 22 +- .../Views/Accommodation/Dormitory.cshtml | 176 +---- .../Views/Accommodation/DormitoryAdd.cshtml | 8 +- .../Views/Accommodation/Floor.cshtml | 32 +- .../Views/Accommodation/Form.cshtml | 76 ++- .../Views/Accommodation/Form.js | 1 + .../Views/Accommodation/FormBed.cshtml | 12 + .../Views/Accommodation/FormBed.js | 52 ++ .../Views/Accommodation/FormClass.cshtml | 19 + .../Views/Accommodation/FormClass.js | 82 +++ .../Views/Accommodation/FormClassify.cshtml | 97 +++ .../Views/Accommodation/FormClassify.js | 167 +++++ .../Views/Accommodation/FormDept.cshtml | 15 + .../Views/Accommodation/FormDept.js | 56 ++ .../Views/Accommodation/FormRoom.cshtml | 26 + .../Views/Accommodation/FormRoom.js | 128 ++++ .../Views/Accommodation/Index.cshtml | 82 +-- .../Views/Accommodation/Index.js | 547 +++++++++++---- .../Views/Accommodation/IndexBed.cshtml | 61 ++ .../Views/Accommodation/IndexBed.js | 110 +++ .../Views/Accommodation/IndexClassify.cshtml | 69 ++ .../Views/Accommodation/IndexClassify.js | 187 ++++++ .../Accommodation/IndexDistribution.cshtml | 92 +++ .../Views/Accommodation/IndexDistribution.js | 625 ++++++++++++++++++ .../Views/Accommodation/Room.cshtml | 12 +- .../Views/Accommodation/Unit.cshtml | 21 +- .../Views/DormitoryReturn/Form.cshtml | 23 + .../Views/DormitoryReturn/Form.js | 59 ++ .../Views/DormitoryReturn/FormOut.cshtml | 19 + .../Views/DormitoryReturn/FormOut.js | 61 ++ .../Views/DormitoryReturn/FormReturn.cshtml | 19 + .../Views/DormitoryReturn/FormReturn.js | 61 ++ .../Views/DormitoryReturn/Index.cshtml | 49 ++ .../Views/DormitoryReturn/Index.js | 159 +++++ .../Views/DormitoryReturn/IndexReport.cshtml | 49 ++ .../Views/DormitoryReturn/IndexReport.js | 131 ++++ .../Learun.Application.Web.csproj | 32 + .../Learun.Application.Mapping.csproj | 2 + .../Acc_DormitoryReturnMap.cs | 29 + .../Acc_DormitoryRuleMap.cs | 29 + .../Learun.Application.TwoDevelopment.csproj | 8 + .../Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs | 148 +++++ .../Acc_DormitoryRuleEntity.cs | 90 +++ .../Acc_DormitoryRuleIBLL.cs | 49 ++ .../Acc_DormitoryRuleService.cs | 168 +++++ .../Accommodation/Acc_DormitoryBuildEntity.cs | 51 ++ .../Accommodation/AccommodationBLL.cs | 260 +++++++- .../Accommodation/AccommodationIBLL.cs | 12 +- .../Accommodation/AccommodationService.cs | 546 ++++++++++++++- .../Acc_DormitoryReturnEntity.cs | 104 +++ .../DormitoryReturn/DormitoryReturnBLL.cs | 210 ++++++ .../DormitoryReturn/DormitoryReturnIBLL.cs | 50 ++ .../DormitoryReturn/DormitoryReturnService.cs | 273 ++++++++ 60 files changed, 5853 insertions(+), 459 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs new file mode 100644 index 000000000..043d4af3e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs @@ -0,0 +1,141 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleController : MvcControllerBase + { + private Acc_DormitoryRuleIBLL acc_DormitoryRuleIBLL = new Acc_DormitoryRuleBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = acc_DormitoryRuleIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Acc_DormitoryRuleData = acc_DormitoryRuleIBLL.GetAcc_DormitoryRuleEntity(keyValue); + var jsonData = new + { + Acc_DormitoryRule = Acc_DormitoryRuleData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + acc_DormitoryRuleIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Acc_DormitoryRuleEntity entity = strEntity.ToObject(); + DateTime time; + bool flag = DateTime.TryParse(entity.LateReturnTime, out time); + if (!flag) + { + return Fail("晚归时间格式不正确！"); + } + + if (!(entity.PushHour >= 0 && entity.PushHour <= 23)) + { + return Fail("推送时间点填写不正确！"); + } + + var model = acc_DormitoryRuleIBLL.GetEnableEntity(); + if (entity.IsEnable == 1) + { + if (string.IsNullOrEmpty(keyValue) && model != null) + { + return Fail("只能有一个启用的规则！"); + } + else if (!string.IsNullOrEmpty(keyValue) && model != null && model.Id != keyValue) + { + return Fail("只能有一个启用的规则！"); + } + } + acc_DormitoryRuleIBLL.SaveEntity(keyValue, entity); + + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs index 94c336d32..24e3ad8cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs @@ -7,6 +7,7 @@ using System.Web.Helpers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; +using System.Linq; namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { @@ -32,26 +33,31 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { return View(); } - ///// - ///// 表单页 - ///// - ///// - //[HttpGet] - //public ActionResult Form() - //{ - // return View(); - //} + /// + /// 分配宿舍 + /// + /// + [HttpGet] + public ActionResult IndexDistribution() + { + return View(); + } /// /// 带参数的表单页 /// /// [HttpGet] - public ActionResult Form(string ParentID = null, string ParentName = null) + public ActionResult Form(string ParentID = null, string ParentName = null, string keyValue = null) { ViewBag.ParentID = ParentID; ViewBag.ParentName = ParentName; ViewBag.BuildType = accommodationIBLL.GetBuildType(ParentID); + if (!string.IsNullOrEmpty(keyValue)) + { + ViewBag.BuildType = accommodationIBLL.GetParentBuildType(keyValue); + } + return View(); } @@ -137,9 +143,70 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return View(); } + /// + /// 分配系 + /// + /// + [HttpGet] + public ActionResult FormDept() + { + return View(); + } - - + /// + /// 分配专业和班级 + /// + /// + [HttpGet] + public ActionResult FormClass() + { + return View(); + } + /// + /// 分配宿舍 + /// + /// + [HttpGet] + public ActionResult FormRoom() + { + return View(); + } + /// + /// 床位管理 + /// + /// + [HttpGet] + public ActionResult IndexBed() + { + return View(); + } + /// + /// 床位管理 + /// + /// + [HttpGet] + public ActionResult FormBed() + { + return View(); + } + /// + /// 分类管理 + /// + /// + [HttpGet] + public ActionResult FormClassify() + { + return View(); + } + /// + /// 分类管理 + /// + /// + [HttpGet] + public ActionResult IndexClassify() + { + return View(); + } #endregion @@ -167,6 +234,38 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success(jsonData); } + /// + /// 获取床位数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetBedListByRoomId(string RoomId) + { + var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo); + return Success(data); + } + /// + /// 获取分类数据 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassifyList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = accommodationIBLL.GetClassifyList(paginationobj, queryJson).OrderBy(x => x.DNo); + //var jsonData = new + //{ + // rows = data, + // total = paginationobj.total, + // page = paginationobj.page, + // records = paginationobj.records + //}; + return Success(data); + } /// /// 获取宿舍楼数据 @@ -269,6 +368,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers var data = accommodationIBLL.GetTreeNew(); return Success(data); } + /// + /// 获取上级树形数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassifyTree() + { + var data = accommodationIBLL.GetClassifyTree(); + return Success(data); + } + + #endregion #region 提交数据 @@ -286,6 +398,18 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success("删除成功！"); } /// + /// 删除 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteBed(string keyValue, string ParentID) + { + accommodationIBLL.DeleteBed(keyValue, ParentID); + return Success("删除成功！"); + } + /// /// 保存实体数据（新增、修改） /// 主键 /// @@ -299,7 +423,54 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers accommodationIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) + { + Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); + return Success("保存成功！"); + } + /// + /// 寝室分配系 + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveDeptClass(string keyValue, string strEntity, int type) + { + Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + accommodationIBLL.SaveDeptClass(keyValue, entity, type); + return Success("保存成功！"); + } + + /// + /// 寝室分配床位 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveRoom(string RoomId, List list) + { + //List list = strEntity.ToObject>(); + string res = accommodationIBLL.SaveRoom(RoomId, list); + if (!string.IsNullOrEmpty(res)) + { + return Fail(res); + } + + return Success("保存成功！"); + } /// /// 学生宿舍的单元、楼层、房间、床位添加 @@ -312,11 +483,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult DormitoryAdd(string keyValue, string strEntity) { - //dynamic entity = JsonConvert.DeserializeObject(strEntity); - //var ElementNum = entity.ElementNum; - //var FloorNum = entity.FloorNum; - //var RoomNum = entity.RoomNUm; - //var BedNum = entity.BedNum; JObject jsonEntity = JObject.Parse(strEntity); var elementNum = int.Parse(jsonEntity["ElementNum"].ToString()); @@ -344,7 +510,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers } - + /// /// 同步宿舍信息数据 /// @@ -353,10 +519,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { accommodationIBLL.SyncData(); return Success("同步成功"); - - } - //public ActionResult DormitoryAdd(string a,string ) #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs new file mode 100644 index 000000000..10d1f7135 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs @@ -0,0 +1,245 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System.Linq; +using System; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnController : MvcControllerBase + { + private DormitoryReturnIBLL dormitoryReturnIBLL = new DormitoryReturnBLL(); + private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormOut() + { + return View(); + } + + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormReturn() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult IndexReport() + { + return View(); + } + + #endregion + + #region 获取数据 + /// + /// 获取左侧树形数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetTree() + { + var data = dormitoryReturnIBLL.GetTree(); + return Success(data); + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = dormitoryReturnIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Acc_DormitoryReturnData = dormitoryReturnIBLL.GetAcc_DormitoryReturnEntity(keyValue); + var jsonData = new + { + Acc_DormitoryReturn = Acc_DormitoryReturnData, + }; + return Success(jsonData); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetDept() + { + var data = accommodationIBLL.GetDept(); + + return Success(data); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetMajor(string strWhere) + { + var data = accommodationIBLL.GetMajor(strWhere); + + return Success(data); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetClass(string strWhere) + { + var data = accommodationIBLL.GetClass(strWhere); + + return Success(data); + } + + [HttpGet] + public ActionResult GetReportList(string queryJson) + { + List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); + var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); + List list2 = new List(); + foreach (var item in list) + { + var name = item.Key == 1 ? "已归宿" : "未归宿"; + list2.Add(new { name = name, value = item.num }); + + } + return JsonResult(list2); + } + + /// + /// + /// + /// + public ActionResult GetReportData(string queryJson) + { + List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); + var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); + List list2 = new List(); + List list1 = new List(); + foreach (var item in list) + { + var name = item.Key == 1 ? "已归宿" : "未归宿"; + list2.Add(new { name = name, value = item.num }); + list1.Add(name); + + } + return Success(new { list1, list2 }); + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + dormitoryReturnIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveData(string keyValue, string strEntity) + { + Acc_DormitoryReturnEntity entity = strEntity.ToObject(); + dormitoryReturnIBLL.SaveData(keyValue, entity); + + return Success("保存成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string type, string strEntity) + { + Acc_DormitoryReturnEntity entity = strEntity.ToObject(); + dormitoryReturnIBLL.SaveEntity(type, entity); + + return Success("保存成功！"); + } + + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml new file mode 100644 index 000000000..100ee31f8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍晚归规则"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
晚归时间*
+ +
+
+
推送人*
+
+
+
+
推送班主任*
+
+
+
+
推送时间点*
+ +
+
+
启用*
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js new file mode 100644 index 000000000..2dab9f792 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js @@ -0,0 +1,62 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-03-14 12:05 + * 描 述：宿舍晚归规则 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#PushUser').lrDataSourceSelect({ + code: 'teacheruserdata', value: 'f_userid', text: 'f_realname', type: 'multiple' + }); + + $('#ClassDiredctor').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#IsEnable').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml new file mode 100644 index 000000000..ebbd5409c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍晚归规则"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js new file mode 100644 index 000000000..4b81ce7c9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js @@ -0,0 +1,139 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-03-14 12:05 + * 描 述：宿舍晚归规则 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetPageList', + headData: [ + { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" }, + { + label: "推送人", name: "PushUser", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + if (value.indexOf(',') != -1) { + var content = ''; + var timearr = value.split(','); + for (var i = 0; i < timearr.length; i++) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: timearr[i], + keyId: 'f_userid', + callback: function (_data) { + content += _data['f_realname']; + } + }); + } + content = content.substring(0, content.length - 1); + callback(content); + } else { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + } + }, + { + label: "推送班主任", name: "ClassDiredctor", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "推送时间点", name: "PushHour", width: 100, align: "left" }, + { + label: "启用", name: "IsEnable", width: 100, align: "left", + formatter: function (cellvalue, rowObject) { + return cellvalue == 1 ? "" : ""; + } + + }, + ], + mainId: 'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml index 76b48d7ef..a6de56ca7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml @@ -58,11 +58,7 @@
{{dormitoryName}}{{unitName}}
@@ -76,7 +72,9 @@
-
{{floor.dormitory.Name}}
{{floor.dormitory.Sex | filter_sex}}
+
{{floor.dormitory.Name}} + @*
{{floor.dormitory.Sex | filter_sex}}
*@ +
{{floor.RoomNum}}间 {{floor.BedNum}}床
@@ -344,7 +342,7 @@ }, addFloor: function () { var url = ""; - url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.unitID + '&ParentName=' + this.unitName; + url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?ParentID=' + this.unitID + '&ParentName=' + this.unitName; top.learun.layerForm({ id: 'form', title: '新增', @@ -361,7 +359,7 @@ top.learun.layerForm({ id: 'form', title: '编辑', - url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id, + url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id, width: 600, height: 400, callBack: function (id) { @@ -393,7 +391,7 @@ '
' + '
' + this.dormitoryName + '  ' + this.unitName + '
' + '
' + floor.dormitory.Name + - this.filter_sex(floor.dormitory.Sex) + + '' + this.filter_sex(floor.dormitory.Sex) + '' + '
' + '
' + '
负 责 人' + floor.dormitory.Functionary + '
负责人电话' + floor.dormitory.Phone + '
' + @@ -403,14 +401,14 @@ '
' + '
' + '
    ' + - '
  • 编     号' + floor.dormitory.Name + '
    • ' + - '
  • 价     格' + floor.dormitory.Price + ' 元
    • ' + + '
  • 编     号' + floor.dormitory.DNo + '
    • ' + + '
  • 价     格' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' 元
    • ' + '
  • 房     间' + floor.RoomNum + ' 间
    • ' + '
  • 入     住' + floor.HasStudentNum + ' 人
    • ' + '
  • 空     床' + floor.NoStudentNum + ' 床
    • ' + '
  • 床     位' + floor.BedNum + ' 个
    • ' + - '
  • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
    • ' + - '
  • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
    • ' + + //'
  • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
    • ' + + //'
  • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
    • ' + '
' + '
' + //'' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml index b9a5635ac..b85a292ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml @@ -62,11 +62,7 @@
@@ -118,155 +114,6 @@ +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js new file mode 100644 index 000000000..7f8aec873 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js @@ -0,0 +1,131 @@ +var bootstrap = function ($, learun) { + "use strict"; + var year = ""; + var page = { + init: function () { + page.bind(); + page.initGrid(); + page.initChart(); + }, + bind: function () { + $('#Dept').lrselect({ + width: '150px', + placeholder: "请选择系部", + allowSearch: true, + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetDept', + value: 'Dept', + text: 'DeptName', + select: function (item) { + if (item) { + $('#Major').lrselectRefresh({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', + param: { strWhere: "m.deptno='" + item.Dept + "'" } + }); + $('#Class').lrselectRefresh({ + //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', + //param: { strWhere: "c.majorno=''" } + }); + } + } + }); + $('#Major').lrselect({ + width: '150px', + placeholder: "请选择专业", + allowSearch: true, + //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', + value: 'Major', + text: 'MajorName', + select: function (item) { + if (item) { + $('#Class').lrselectRefresh({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', + param: { strWhere: "c.majorno='" + item.Major + "'" } + }); + } + } + }); + $('#Class').lrselect({ + width: '150px', + placeholder: "请选择班级", + allowSearch: true, + value: 'Class', + text: 'ClassName' + }); + + //查询 + $('#btn_Search').on('click', function () { + page.search({ Dept: $('#Dept').lrselectGet(), Major: $('#Major').lrselectGet(), Class: $('#Class').lrselectGet() }); + }); + + }, + initGrid: function () { + $(".lr-layout-grid").height($(window).height() - 110); + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportList', + headData: [ + { name: "name", label: "状态", width: 100, align: "center" }, + { name: "value", label: "人数", width: 150, align: "center" } + + ] + }); + page.search(); + }, + initChart: function (queryJson) { + var myChart1 = echarts.init(document.getElementById('main')); + //var myChart2 = echarts.init(document.getElementById('main1')); + queryJson = { + Dept: $('#Dept').lrselectGet(), + Major: $('#Major').lrselectGet(), + Class: $('#Class').lrselectGet() + }; + //console.log('queryJson', queryJson); + learun.httpAsyncPost(top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportData', { queryJson: JSON.stringify(queryJson) }, function (res) { + if (res.code == 200) { + var option = { + title: { + text: '学生归宿统计', + x: 'center' + }, + tooltip: { + trigger: 'item', + formatter: "{a}
{b} : {c} ({d}%)" + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.list1 + }, + series: [ + { + name: '学生归宿', + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: res.data.list2, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + + myChart1.setOption(option); + + } + }); + + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + page.initChart(param); + } + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 6a8a214c6..36d47b979 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -361,8 +361,10 @@ + + @@ -1220,6 +1222,16 @@ + + + + + + + + + + @@ -1227,6 +1239,11 @@ + + + + + @@ -7645,6 +7662,21 @@ + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index e366181a5..229569a99 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -102,6 +102,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs new file mode 100644 index 000000000..912286693 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class Acc_DormitoryReturnMap : EntityTypeConfiguration + { + public Acc_DormitoryReturnMap() + { + #region 表、主键 + //表 + this.ToTable("ACC_DORMITORYRETURN"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs new file mode 100644 index 000000000..f56e03bcd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleMap : EntityTypeConfiguration + { + public Acc_DormitoryRuleMap() + { + #region 表、主键 + //表 + this.ToTable("ACC_DORMITORYRULE"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 18945acac..5cf67fb65 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -275,8 +275,16 @@ + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs new file mode 100644 index 000000000..491d215b1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs @@ -0,0 +1,148 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleBLL : Acc_DormitoryRuleIBLL + { + private Acc_DormitoryRuleService acc_DormitoryRuleService = new Acc_DormitoryRuleService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return acc_DormitoryRuleService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) + { + try + { + return acc_DormitoryRuleService.GetAcc_DormitoryRuleEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// + public Acc_DormitoryRuleEntity GetEnableEntity() + { + try + { + return acc_DormitoryRuleService.GetEnableEntity(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + acc_DormitoryRuleService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) + { + try + { + acc_DormitoryRuleService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs new file mode 100644 index 000000000..351f0e912 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 晚归时间 + /// + [Column("LATERETURNTIME")] + public string LateReturnTime { get; set; } + /// + /// 推送人员 + /// + [Column("PUSHUSER")] + public string PushUser { get; set; } + /// + /// 是否推送班主任 + /// + [Column("CLASSDIREDCTOR")] + public int? ClassDiredctor { get; set; } + /// + /// 推送时间点 + /// + [Column("PUSHHOUR")] + public int? PushHour { get; set; } + /// + /// 是否启用 + /// + [Column("ISENABLE")] + public int? IsEnable { get; set; } + /// + /// CreateTime + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// UpdateTime + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + /// + /// UpdateUserId + /// + [Column("UPDATEUSERID")] + public string UpdateUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs new file mode 100644 index 000000000..22b52a86d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs @@ -0,0 +1,49 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public interface Acc_DormitoryRuleIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue); + Acc_DormitoryRuleEntity GetEnableEntity(); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs new file mode 100644 index 000000000..751c2f837 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs @@ -0,0 +1,168 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.* + "); + strSql.Append(" FROM Acc_DormitoryRule t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetEnableEntity() + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(x => x.IsEnable == 1); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs index 8dfc1bb3a..0c0866c1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs @@ -19,12 +19,33 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("ID")] public string ID { get; set; } + /// + /// 编号 + /// + [Column("DNO")] + public string DNo { get; set; } + /// /// 名称 /// [Column("NAME")] public string Name { get; set; } /// + /// 宿舍楼 + /// + [Column("APARTMENTID")] + public string ApartmentId { get; set; } + /// + /// 单元 + /// + [Column("UNITID")] + public string UnitId { get; set; } + /// + /// 楼层 + /// + [Column("FLOORID")] + public string FloorId { get; set; } + /// /// 负责人 /// [Column("FUNCTIONARY")] @@ -145,9 +166,32 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("PLANBEDNUM")] public int? PlanBedNum { get; set; } + + /// + /// 寝室类型（几人寝） + /// + [Column("ROOMTYPE")] + public int? RoomType { get; set; } + /// + /// 入住人数 + /// + [Column("CHECKINSTU")] + public int? CheckInStu { get; set; } + /// + /// 是否归宿 + /// + [Column("ISRETURN")] + public int? IsReturn { get; set; } #endregion #region 扩展字段 + + [NotMapped] + public string ApartmentName { get; set; } + [NotMapped] + public string UnitName { get; set; } + [NotMapped] + public string FloorName { get; set; } /// /// 学生名字 /// @@ -176,6 +220,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [NotMapped] public string bedId { get; set; } + + [NotMapped] + public string DeptName { get; set; } + [NotMapped] + public string MajorName { get; set; } + [NotMapped] + public string ClassName { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs index efb5fe22b..41bda8acd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs @@ -42,6 +42,26 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + + public IEnumerable GetBedListByRoomId(string RoomId) + { + try + { + return accommodationService.GetBedListByRoomId(RoomId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public IEnumerable GetAllList() { try @@ -61,6 +81,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public IEnumerable GetClassifyList(Pagination paginationobj, string queryJson) + { + try + { + return accommodationService.GetClassifyList(paginationobj, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public object GetDormitoryList() { try @@ -179,6 +218,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } + public string GetParentBuildType(string keyValue) + { + try + { + return accommodationService.GetParentBuildType(keyValue); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + + } + /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -251,6 +311,61 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public List GetDept() + { + try + { + return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetMajor(string strWhere) + { + try + { + return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetClass(string strWhere) + { + try + { + return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取左侧树形数据 /// @@ -270,8 +385,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement value = item.ID.ToString(), showcheck = false, checkstate = 0, - isexpand = false, - parentId = item.ParentID == null ? "" : item.ParentID + isexpand = true, + parentId = item.ParentID == null ? "" : item.ParentID, + title = item.BuildType }; @@ -339,9 +455,49 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + public List GetClassifyTree() + { + try + { + List list = accommodationService.GetClassifyTree(); + List treeList = new List(); + foreach (Acc_DormitoryBuildEntity item in list) + { + TreeModel node = new TreeModel + { + id = item.ID.ToString(), + text = item.Name.ToString(), + value = item.ID.ToString(), + showcheck = false, + checkstate = 0, + isexpand = false, + parentId = item.ParentID == null ? "" : item.ParentID, + title = string.IsNullOrEmpty(item.BuildType) ? "" : (Convert.ToInt32(item.BuildType) + 1).ToString(), + }; + treeList.Add(node); + + + } + + + return treeList.ToTree(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 根据父id 获取树形数据 @@ -386,7 +542,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - /// + /// /// 根据父id 获取树形数据 /// /// @@ -431,11 +587,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - public bool MatchDormitoryInfo(string stuNo,string dormitory,string unit,string floor,string room,string bed ,List data) + public bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed, List data) { try { - return accommodationService.MatchDormitoryInfo(stuNo,dormitory,unit,floor,room,bed,data); + return accommodationService.MatchDormitoryInfo(stuNo, dormitory, unit, floor, room, bed, data); } catch (Exception ex) @@ -481,6 +637,31 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteBed(string keyValue, string ParentID) + { + try + { + accommodationService.DeleteBed(keyValue, ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 保存实体数据（新增、修改） /// 主键 @@ -505,6 +686,74 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) + { + try + { + accommodationService.SaveBedEntity(keyValue, ParentID, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + + /// + /// 分配系 + /// + /// + /// + public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) + { + try + { + accommodationService.SaveDeptClass(keyValue, entity, type); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public string SaveRoom(string RoomId, List list) + { + try + { + return accommodationService.SaveRoom(RoomId, list); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 批量添加单元、楼层、宿舍、床位 @@ -581,7 +830,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs index 41cd164b0..2050f1292 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs @@ -21,7 +21,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetBedListByRoomId(string RoomId); IEnumerable GetAllList(); + IEnumerable GetClassifyList(Pagination paginationobj,string queryJson); /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -42,6 +44,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// List GetList(); + List GetDept(); + List GetMajor(string strWhere); + List GetClass(string strWhere); /// /// 获取左侧树形数据 /// @@ -50,6 +55,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement string GetDormitoryInfoByStuNo(string val); List GetTree(); List GetTreeNew(); + List GetClassifyTree(); bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed,List data); @@ -68,7 +74,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void DeleteEntity(string keyValue); + void DeleteBed(string keyValue, string ParentID); string GetBuildType(string parentID); + string GetParentBuildType(string keyValue); /// /// 保存实体数据（新增、修改） @@ -76,7 +84,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void SaveEntity(string keyValue, Acc_DormitoryBuildEntity entity); - + void SaveBedEntity(string keyValue,string ParentID, Acc_DormitoryBuildEntity entity); + void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type); + string SaveRoom(string RoomId, List list); /// /// 批量添加单元、楼层、房间、床位 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index 21b627eb3..ade272d6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -51,10 +51,14 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.ParentID, t.Remark, t.Starred, - t.HasToilet, - stb.StuName + t.HasToilet,t.RoomType, +t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, +a.name as ApartmentName,b.name as UnitName,c.Name as FloorName "); - strSql.Append(" FROM Acc_DormitoryBuild t LEFT JOIN dbo.StuInfoBasic stb ON t.StudentID=stb.StuId"); + strSql.Append(" FROM Acc_DormitoryBuild t "); + strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -64,6 +68,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); strSql.Append(" AND t.ParentID =@ParentID "); } + //else + //{ + // strSql.Append(" AND t.BuildType ='4' "); + //} + + if (!queryParam["ApartmentId"].IsEmpty()) + { + dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.ApartmentId =@ApartmentId "); + } + if (!queryParam["UnitId"].IsEmpty()) + { + dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); + strSql.Append(" AND t.UnitId =@UnitId "); + } + if (!queryParam["FloorId"].IsEmpty()) + { + dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); + strSql.Append(" AND t.FloorId =@FloorId "); + } + if (!queryParam["Name"].IsEmpty()) { dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); @@ -76,18 +101,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } if (!queryParam["Dept"].IsEmpty()) { - dp.Add("Dept", "%" + queryParam["Dept"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Dept Like @Dept "); + dp.Add("Dept", queryParam["Dept"].ToString(), DbType.String); + strSql.Append(" AND t.Dept=@Dept "); } if (!queryParam["Class"].IsEmpty()) { - dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Class Like @Class "); + dp.Add("Class", queryParam["Class"].ToString(), DbType.String); + strSql.Append(" AND t.Class=@Class "); } if (!queryParam["Major"].IsEmpty()) { - dp.Add("Major", "%" + queryParam["Major"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Major Like @Major "); + dp.Add("Major", queryParam["Major"].ToString(), DbType.String); + strSql.Append(" AND t.Major=@Major "); } if (!queryParam["Sex"].IsEmpty()) { @@ -104,6 +129,53 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("Leader", "%" + queryParam["Leader"].ToString() + "%", DbType.String); strSql.Append(" AND t.Leader Like @Leader "); } + + if (!queryParam["NoDistribution"].IsEmpty()) + { + var noDistribution = queryParam["NoDistribution"].ToString(); + if (noDistribution.Contains("dept")) + { + strSql.Append(" AND (t.Dept is null or len(t.Dept)=0) "); + } + if (noDistribution.Contains("major")) + { + strSql.Append(" AND (t.Major is null or len(t.Major)=0) "); + } + if (noDistribution.Contains("class")) + { + strSql.Append(" AND (t.Class is null or len(t.Class)=0) "); + } + if (noDistribution.Contains("room")) + { + strSql.Append(" AND (t.CheckInStu is null or len(t.CheckInStu)=0 or t.CheckInStu=0) "); + } + } + if (!queryParam["Distribution"].IsEmpty()) + { + var distribution = queryParam["Distribution"].ToString(); + if (distribution.Contains("dept")) + { + strSql.Append(" AND len(t.Dept)>0 "); + } + if (distribution.Contains("major")) + { + strSql.Append(" AND len(t.Major)>0 "); + } + if (distribution.Contains("class")) + { + strSql.Append(" AND len(t.Class)>0 "); + } + if (distribution.Contains("room")) + { + strSql.Append(" AND t.CheckInStu>0 "); + } + } + + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).OrderBy(a => a.Name).ThenBy(a => a.Name).ToList(); } catch (Exception ex) @@ -118,6 +190,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + + public IEnumerable GetBedListByRoomId(string RoomId) + { + try + { + string sql = $"select ID,Name,DNo,StudentID from Acc_DormitoryBuild where BuildType='5' and ParentID='{RoomId}'"; + return this.BaseRepository("CollegeMIS").FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public IEnumerable GetAllList() { try @@ -137,11 +230,95 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + public IEnumerable GetClassifyList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.Name, + t.Address, + t.Campus, + t.Dept, + t.BuildType, + t.Major, + t.Class, + t.Sex, + t.Functionary, + t.Phone, + t.Price, + t.Leader, + t.StudentID, + t.PlanStudentID, + t.ParentID, + t.Remark, + t.Starred, + t.HasToilet,t.RoomType, +t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, +a.name as ApartmentName,b.name as UnitName,c.Name as FloorName + "); + strSql.Append(" FROM Acc_DormitoryBuild t "); + strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); + strSql.Append(" WHERE 1=1 and (t.BuildType<>'5' and t.BuildType<>'4') "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["ParentID"].IsEmpty()) + { + dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); + strSql.Append(" AND t.ParentID =@ParentID "); + } + if (!queryParam["keyword"].IsEmpty()) + { + strSql.Append($" AND t.Name like '%{queryParam["keyword"].ToString()}%' "); + } + if (!queryParam["ApartmentId"].IsEmpty()) + { + dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.ApartmentId =@ApartmentId "); + } + if (!queryParam["UnitId"].IsEmpty()) + { + dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); + strSql.Append(" AND t.UnitId =@UnitId "); + } + if (!queryParam["FloorId"].IsEmpty()) + { + dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); + strSql.Append(" AND t.FloorId =@FloorId "); + } + + if (!queryParam["Name"].IsEmpty()) + { + dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Name Like @Name "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); + //return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + internal string GetBuildType(string parentID) { try { - var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ParentID == parentID); + var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ID == parentID); if (null != entity) { return entity.BuildType; @@ -164,6 +341,35 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public string GetParentBuildType(string keyValue) + { + try + { + string sql = $@" select BuildType from [dbo].[Acc_DormitoryBuild] where Id=( + select parentid from [dbo].[Acc_DormitoryBuild] where id='{keyValue}')"; + var data = this.BaseRepository("CollegeMIS").FindObject(sql); + if (data == null) + { + return ""; + } + else + { + return data.ToString(); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + internal object GetRoomList(string parentID) { try @@ -418,7 +624,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement floorInfo.dormitory = bed; if (!string.IsNullOrEmpty(bed.StudentID)) { - floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuId == bed.StudentID); + floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == bed.StudentID); } list.Add(floorInfo); } @@ -510,6 +716,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public List GetClassifyTree() + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => (x.BuildType == "2" || x.BuildType == "1")).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -582,7 +807,44 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { - return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); + return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5" && a.BuildType != "4").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取非空床的系部专业 班级 + /// + /// + public List GetSelectData(string strWhere) + { + try + { + string sql = + @"select distinct dept,d.DeptName,major,m.MajorName,class,c.ClassName from [dbo].[Acc_DormitoryBuild] t +join CdDept d on t.dept=d.deptno +join CdMajor m on t.major=m.majorno +join ClassInfo c on t.class=c.classno +where t.ID in ( +select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +)"; + if (!string.IsNullOrEmpty(strWhere)) + { + sql += " and " + strWhere; + } + + return this.BaseRepository("CollegeMIS").FindList(sql).ToList(); } catch (Exception ex) @@ -598,6 +860,41 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 获取树形数据(学生归宿) + /// + /// + public List GetSqlTreeForReturn() + { + try + { + List list = new List(); + var roomSql = @"select * from [dbo].[Acc_DormitoryBuild] where ID in ( +select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +)"; + List roomList = this.BaseRepository("CollegeMIS") + .FindList(roomSql).ToList(); + list = roomList.Union(list).ToList(); + var apartIds = roomList.Select(x => x.ApartmentId).Distinct().ToList(); + var unitIds = roomList.Select(x => x.UnitId).Distinct().ToList(); + var floorIds = roomList.Select(x => x.FloorId).Distinct().ToList(); + var otherList = this.BaseRepository("CollegeMIS").FindList(x => + apartIds.Contains(x.ID) || unitIds.Contains(x.ID) || floorIds.Contains(x.ID)).ToList(); + list = list.Union(otherList).ToList(); + return list.OrderBy(x => x.DNo).OrderBy(x => x.Name).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 根据父id获取数据 /// @@ -734,6 +1031,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } bedInfo.StudentID = stuInfo.StuId; bedInfo.StuName = stuInfo.StuName; + bedInfo.Dept = stuInfo.DeptNo; + bedInfo.Major = stuInfo.MajorNo; + bedInfo.Class = stuInfo.ClassNo; + bedInfo.Sex = Convert.ToString(stuInfo.GenderNo); this.BaseRepository("CollegeMIS").Update(bedInfo); return true; } @@ -799,6 +1100,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + public void DeleteBed(string keyValue, string ParentID) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); + UpdateCheckInNum(ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public void DeleteAll(string parentid) { var list = this.BaseRepository("CollegeMIS").FindList(a => a.ParentID == parentid).ToList(); @@ -842,7 +1164,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var elementEntity = new Acc_DormitoryBuildEntity { ParentID = keyValue, + ApartmentId = keyValue, Name = i.ToString() + "单元", + DNo = i.ToString(), BuildType = "2",//单元类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -859,6 +1183,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement UpdateTime = DateTime.Now }; elementEntity.Create(); + elementEntity.UnitId = elementEntity.ID; list.Add(elementEntity); //添加楼层 @@ -869,7 +1194,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var floorEntity = new Acc_DormitoryBuildEntity { ParentID = elementEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, Name = j.ToString() + "层", + DNo = j.ToString(), BuildType = "3",//楼层类型, Sex = dormitory.Sex, Address = dormitory.Address, @@ -886,6 +1214,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement UpdateTime = DateTime.Now }; floorEntity.Create(); + floorEntity.FloorId = floorEntity.ID; list.Add(floorEntity); //添加房间 @@ -896,7 +1225,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var roomEntity = new Acc_DormitoryBuildEntity { ParentID = floorEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, + FloorId = floorEntity.ID, Name = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()) + "室", + DNo = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()), BuildType = "4",//房间类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -909,6 +1242,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Major = dormitory.Major, Phone = dormitory.Phone, Price = dormitory.Price, + RoomType = bedNum, UpdateBy = currentUser.realName, UpdateTime = DateTime.Now, Starred = "3", @@ -925,7 +1259,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var bedEntity = new Acc_DormitoryBuildEntity { ParentID = roomEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, + FloorId = floorEntity.ID, Name = m.ToString() + "床", + DNo = m.ToString(), BuildType = "5", Sex = dormitory.Sex, Address = dormitory.Address, @@ -1275,9 +1613,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } else { + entity.Create(); if (entity.BuildType == "1") { - if (string.IsNullOrEmpty(entity.ParentID)) + entity.ApartmentId = entity.ID; + if (string.IsNullOrEmpty(entity.ParentID) || entity.ParentID == "-1") { var rootNode = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ParentID == null); if (rootNode == null) @@ -1291,6 +1631,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement rootEntity.CreateTime = DateTime.Now; rootEntity.UpdateBy = currentUser.realName; rootEntity.UpdateTime = DateTime.Now; + rootEntity.ApartmentId = rootEntity.ID; entity.ParentID = rootEntity.ID; this.BaseRepository("CollegeMIS").Insert(rootEntity); } @@ -1300,7 +1641,33 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } - entity.Create(); + else + { + //上一级 + var parentity = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ID == entity.ParentID); + switch (parentity.BuildType) + { + case "1": + entity.ApartmentId = parentity.ID; + entity.UnitId = entity.ID; + break; + case "2": + { + entity.FloorId = entity.ID; + entity.UnitId = parentity.ID; + entity.ApartmentId = parentity.ApartmentId; + } + break; + case "3": + { + entity.FloorId = parentity.ID; + entity.UnitId = parentity.UnitId; + entity.ApartmentId = parentity.ApartmentId; + } + break; + } + } + entity.CreateBy = currentUser.realName; entity.CreateTime = DateTime.Now; entity.UpdateBy = currentUser.realName; @@ -1321,6 +1688,157 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + db.Update(entity); + } + else + { + var parentEntity = db.FindEntity(ParentID); + entity.Create(); + entity.ApartmentId = parentEntity.ApartmentId; + entity.UnitId = parentEntity.UnitId; + entity.FloorId = parentEntity.FloorId; + entity.ParentID = ParentID; + entity.BuildType = "5"; + db.Insert(entity); + } + db.Commit(); + UpdateCheckInNum(ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + private void UpdateCheckInNum(string ParentID) + { + try + { + string sql = $@"update [dbo].[Acc_DormitoryBuild] set RoomType=( +select count(1) from [dbo].[Acc_DormitoryBuild] where ParentId='{ParentID}' and BuildType='5' +) +where ID='{ParentID}' +"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) + { + try + { + if (keyValue.Contains(",")) + { + keyValue = string.Join("','", keyValue.Split(',')); + } + string sql = $"update Acc_DormitoryBuild set "; + if (type == 1) + { + sql += $" Dept='{entity.Dept}' "; + } + else + { + sql += $"Major='{entity.Major}',Class='{entity.Class}'"; + } + + sql += $" where ID in ('{keyValue}')"; + + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 分配宿舍 + /// + /// + /// + public string SaveRoom(string RoomId, List list) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + foreach (var entity in list) + { + //判断该学生是否已分配 + if (!string.IsNullOrEmpty(entity.StudentID)) + { + var count = db.FindList().Count(x => x.StudentID == entity.StudentID && x.ID != entity.ID); + if (count > 0) + { + var stuname = db.FindEntity(x => x.StuNo == entity.StudentID)?.StuName; + return "学生" + stuname + "已分配床位，不可重复分配！"; + } + } + + //分配床位 + string sql = $"update Acc_DormitoryBuild set StudentID='{entity.StudentID}' where ID='{entity.ID}'"; + db.ExecuteBySql(sql); + } + + int checkInStu = list.Where(x => x.StudentID != null).Count(); + string checkInSql = $"update Acc_DormitoryBuild set CheckInStu='{checkInStu}' where ID='{RoomId}'"; + db.ExecuteBySql(checkInSql); + + db.Commit(); + return ""; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 同步宿舍信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs new file mode 100644 index 000000000..3e91d02ac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs @@ -0,0 +1,104 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class Acc_DormitoryReturnEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 宿舍id，关联Acc_DormitoryBuild表 + /// + [Column("DORMITORYBUILDID")] + public string DormitoryBuildId { get; set; } + /// + /// 床位父级 + /// + [Column("PARENTID")] + public string ParentId { get; set; } + + /// + /// 检查日期 + /// + [Column("CHECKDATE")] + public DateTime? CheckDate { get; set; } + /// + /// 出宿时间 + /// + [Column("OUTTIME")] + public DateTime? OutTime { get; set; } + /// + /// 归宿时间 + /// + [Column("RETURNTIME")] + public DateTime? ReturnTime { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 修改时间 + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + /// + /// 修改人 + /// + [Column("UPDATEUSERID")] + public string UpdateUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.CreateTime = DateTime.Now; + this.CreateUserId = LoginUserInfo.Get().userId; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.UpdateTime = DateTime.Now; + this.UpdateUserId = LoginUserInfo.Get().userId; + } + #endregion + #region 扩展字段 + [NotMapped] + public string Name { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs new file mode 100644 index 000000000..066f0b3e8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs @@ -0,0 +1,210 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; +using System.Linq; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnBLL : DormitoryReturnIBLL + { + private DormitoryReturnService dormitoryReturnService = new DormitoryReturnService(); + private AccommodationService accommodationService = new AccommodationService(); + + #region 获取数据 + + /// + /// 获取左侧树形数据 + /// + /// + public List GetTree() + { + try + { + List list = accommodationService.GetSqlTreeForReturn(); + List treeList = new List(); + foreach (Acc_DormitoryBuildEntity item in list) + { + TreeModel node = new TreeModel + { + id = item.ID.ToString(), + text = item.Name.ToString(), + value = item.ID.ToString(), + showcheck = false, + checkstate = 0, + isexpand = true, + parentId = item.ParentID == null ? "" : item.ParentID, + title = item.BuildType + + }; + + + treeList.Add(node); + + + } + + + return treeList.ToTree(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return dormitoryReturnService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public IEnumerable GetReportList(string queryJson) + { + try + { + return dormitoryReturnService.GetReportList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) + { + try + { + return dormitoryReturnService.GetAcc_DormitoryReturnEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + dormitoryReturnService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) + { + try + { + dormitoryReturnService.SaveEntity(type, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) + { + try + { + dormitoryReturnService.SaveData(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs new file mode 100644 index 000000000..39401c7d1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs @@ -0,0 +1,50 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public interface DormitoryReturnIBLL + { + #region 获取数据 + List GetTree(); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetReportList(string queryJson); + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string type, Acc_DormitoryReturnEntity entity); + void SaveData(string keyValue, Acc_DormitoryReturnEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs new file mode 100644 index 000000000..66b235250 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs @@ -0,0 +1,273 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.*,a.Name + "); + strSql.Append(" FROM Acc_DormitoryReturn t "); + strSql.Append(" join Acc_DormitoryBuild a on t.DormitoryBuildId=a.ID "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.CheckDate >= @startTime AND t.CheckDate <= @endTime ) "); + } + if (!queryParam["OutTime"].IsEmpty()) + { + dp.Add("OutTime", queryParam["OutTime"].ToString(), DbType.String); + strSql.Append(" AND t.OutTime = @OutTime "); + } + if (!queryParam["ParentId"].IsEmpty()) + { + dp.Add("ParentId", queryParam["ParentId"].ToString(), DbType.String); + strSql.Append(" AND t.ParentId = @ParentId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取统计数据 + /// + /// + /// + public IEnumerable GetReportList(string queryJson) + { + try + { + string sql = @"select t.isreturn,a.Dept,a.Major,a.class from +( +select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +) t +join Acc_DormitoryBuild a on a.ID=t.parentid where 1=1 +"; + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Dept"].IsEmpty()) + { + sql += $" AND a.Dept = '{queryParam["Dept"].ToString()}'"; + } + if (!queryParam["Major"].IsEmpty()) + { + sql += $" AND a.Major = '{queryParam["Major"].ToString()}'"; + } + if (!queryParam["Class"].IsEmpty()) + { + sql += $" AND a.Class = '{queryParam["Class"].ToString()}'"; + } + return this.BaseRepository("CollegeMIS").FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + if (type == "1") + { + //学生出宿 + entity.Create(); + entity.CheckDate = Convert.ToDateTime(entity.OutTime.Value.Date); + db.Insert(entity); + + //修改该床位为未归宿 + var sql = $"update Acc_DormitoryBuild set IsReturn=0 where ID='{entity.DormitoryBuildId}'"; + db.ExecuteBySql(sql); + } + else + { + //学生归宿 + //获取今天最后一次出宿的记录 + var outsql = + $"select top 1 * from Acc_DormitoryReturn where DormitoryBuildId='{entity.DormitoryBuildId}' and CheckDate='{DateTime.Now.Date}' order by OutTime desc"; + var model = db.FindList(outsql).FirstOrDefault(); + if (model == null) + { + //新增 + entity.Create(); + entity.ReturnTime = entity.ReturnTime; + entity.CheckDate = Convert.ToDateTime(entity.ReturnTime.Value.Date); + db.Insert(entity); + } + else + { + //修改 + model.ReturnTime = entity.ReturnTime; + model.Remark += " " + entity.Remark; + model.Modify(model.Id); + db.Update(model); + } + + //修改该床位为未归宿 + var sql = $"update Acc_DormitoryBuild set IsReturn=1 where ID='{entity.DormitoryBuildId}'"; + db.ExecuteBySql(sql); + } + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存 + /// + /// + /// + public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + } +} From fe4a13318fb88b88efe50cc910679c1d2605edc6 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 31 Mar 2022 09:32:19 +0800 Subject: [PATCH 20/41] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=BD=92=E5=AE=BF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DormitoryReturn/DormitoryReturnService.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/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs index 66b235250..94249c21b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs @@ -81,7 +81,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { - string sql = @"select t.isreturn,a.Dept,a.Major,a.class from + string sql = @"select (case t.isreturn when 1 then 1 else 0 end) as isreturn,a.Dept,a.Major,a.class from ( select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) ) t From fb1acd13b621cab4329741c2dc55acd633370e29 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 31 Mar 2022 12:11:29 +0800 Subject: [PATCH 21/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E6=A0=A1=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9A=E5=A2=9E=E5=8A=A0=E4=B8=93=E4=B8=9A=E6=8E=92?= =?UTF-8?q?=E5=90=8D=E5=88=97=E3=80=81=E7=8F=AD=E7=BA=A7=E6=8E=92=E5=90=8D?= =?UTF-8?q?=E5=88=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuScoreController.cs | 6 +- .../Views/StuScore/AllStuScoreQueryIndex.js | 21 ++++--- .../StuScore/StuScoreEntity.cs | 15 +++++ .../StuScore/StuScoreService.cs | 61 +++++++++++++++++-- 4 files changed, 89 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index d5e16926b..a6bc47fdc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -731,12 +731,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpGet] [AjaxOnly] - public ActionResult GetScoreListByStuNo2(string queryJson) + public ActionResult GetScoreListByStuInfo(string queryJson) { - var data = stuScoreIBLL.GetScoreListByStuNo(queryJson); + var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); if (data.Any()) { - data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x => x.LessonNo); + data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x=>x.LessonSortNo).ThenBy(x => x.LessonNo); } return Success(data); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index baf1c2f77..7ccca94d8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -53,15 +53,22 @@ var bootstrap = function ($, learun) { }, initGird: function () { $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuNo2', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuInfo', headData: [ { label: '学号', name: 'StuNo', width: 100, align: "left" }, - { label: '姓名', name: 'StuName', width: 200, align: "left" }, - { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, - { label: '学期', name: 'Semester', width: 100, align: "left" }, - { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, - { label: '课程名称', name: 'LessonName', width: 300, align: "left" }, - { label: '总分', name: 'ScoreFormat', width: 100, align: "left" }, + { label: '姓名', name: 'StuName', width: 150, align: "left" }, + { label: '专业', name: 'MajorName', width: 100, align: "left" }, + { label: '班级', name: 'ClassName', width: 100, align: "left" }, + { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, + { label: '学期', name: 'Semester', width: 50, align: "left" }, + { label: '科目类型', name: 'LessonSortName', width: 60, align: "left" }, + { label: '科目', name: 'LessonName', width: 200, align: "left" }, + { label: '学分', name: 'StudyScore', width: 50, align: "left" }, + { label: '成绩', name: 'Score', width: 100, align: "left" }, + { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, + { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, + { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, + { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, ], mainId: 'StuNo', isPage: false, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs index 8946527f4..4be5477b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs @@ -409,6 +409,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string LessonSortName { get; set; } + /// + /// 专业名称 + /// + [NotMapped] + public string MajorName { get; set; } + /// + /// 专业排名 + /// + [NotMapped] + public int RankInMajor { get; set; } + /// + /// 班级排名 + /// + [NotMapped] + public int RankInClass { get; set; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index 0da6b7d3a..c10ba0ced 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1896,9 +1896,9 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad tableName = queryParam["TableName"].ToString(); } var strSql = new StringBuilder(); - strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,li.StudyScore,ls.LessonSortName,bb.Score,sp.Score as ScoreOfNotPass,spt.Score as ScoreOfNotPassTwo "); + strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,bb.Score,sp.Score as ScoreOfNotPass,spt.Score as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); strSql.Append(" from ( "); - strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); + strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); if (!queryParam["AcademicYearNo"].IsEmpty()) { @@ -1920,13 +1920,66 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); strSql.Append(" and s.StuName=@StuName "); } - strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName ) as bb "); + strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo ) as bb "); strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' "); + strSql.Append(" left join CdMajor cm on bb.MajorNo= cm.MajorNo and cm.CheckMark='1' "); + strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + + //计算专业排名，班级排名 + if (result.Any()) + { + var temp = result.GroupBy(x=>new { x.AcademicYearNo,x.Semester}).Select(x => new StuScoreEntity() + { + AcademicYearNo=x.Key.AcademicYearNo, + Semester=x.Key.Semester, + StuNo=x.FirstOrDefault().StuNo, + ClassNo=x.FirstOrDefault().ClassNo, + MajorNo=x.FirstOrDefault().MajorNo + }).ToList(); + if (temp.Any()) + { + foreach (var item in temp) + { + //专业排名 + var ml = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.MajorNo == item.MajorNo && x.CheckMark == "1"); + var mlGroup = ml.GroupBy(x => x.StuNo).Select(x => new + { + StuNo = x.Key, + TotalScore = x.Select(y => y.Score).Sum() + }).OrderByDescending(x => x.TotalScore); + if (mlGroup.Any()) + { + var rank = mlGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); + item.RankInMajor = rank + 1; + } + //班级排名 + var cl = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.ClassNo == item.ClassNo && x.CheckMark == "1"); + var clGroup = cl.GroupBy(x => x.StuNo).Select(x => new + { + StuNo = x.Key, + TotalScore = x.Select(y => y.Score).Sum() + }).OrderByDescending(x => x.TotalScore); + if (clGroup.Any()) + { + var rank = clGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); + item.RankInClass = rank + 1; + } + } + } + foreach (var ii in result) + { + ii.RankInMajor = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInMajor; + ii.RankInClass = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInClass; + } + + } + + return result; } catch (Exception ex) { From a67c2ec1ab0f71f0c177659deb42fcd136f94b3a Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 31 Mar 2022 12:17:29 +0800 Subject: [PATCH 22/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9A=E5=88=97=E8=B7=9D=E7=A6=BB=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index 7ccca94d8..e9a040df5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -56,13 +56,13 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuInfo', headData: [ { label: '学号', name: 'StuNo', width: 100, align: "left" }, - { label: '姓名', name: 'StuName', width: 150, align: "left" }, + { label: '姓名', name: 'StuName', width: 200, align: "left" }, { label: '专业', name: 'MajorName', width: 100, align: "left" }, { label: '班级', name: 'ClassName', width: 100, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 50, align: "left" }, { label: '科目类型', name: 'LessonSortName', width: 60, align: "left" }, - { label: '科目', name: 'LessonName', width: 200, align: "left" }, + { label: '科目', name: 'LessonName', width: 300, align: "left" }, { label: '学分', name: 'StudyScore', width: 50, align: "left" }, { label: '成绩', name: 'Score', width: 100, align: "left" }, { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, From d671325b647c6cb522d88948debab649a9499577 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 10:05:15 +0800 Subject: [PATCH 23/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E7=B2=BE=E7=AE=80=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/StuScoreApi.cs | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs index e4a560b61..08c563989 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs @@ -24,7 +24,7 @@ namespace Learun.Application.WebApi.Modules private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); /// - /// 获取成绩列表 + /// 全院学生成绩查看-打印成绩单 /// /// /// @@ -57,7 +57,7 @@ namespace Learun.Application.WebApi.Modules { AcademicYearNo = x.Key.AcademicYearNo, Semester = x.Key.Semester, - StuScoreEntityList = x.Select(y => new StuScoreEntity() + StuScoreEntityList = x.Select(y => new StuScoreModel() { AcademicYearNo = y.AcademicYearNo, Semester = y.Semester, @@ -105,7 +105,38 @@ namespace Learun.Application.WebApi.Modules public class ScoreList { public string AcademicYearNo { get; set; } public string Semester { get; set; } - public List StuScoreEntityList { get; set; } + public List StuScoreEntityList { get; set; } + } + public class StuScoreModel { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + /// + /// 课程类别码 + /// + public string LessonSortNo { get; set; } + /// + /// 课程类别名称 + /// + public string LessonSortName { get; set; } + public string LessonNo { get; set; } + public string LessonName { get; set; } + /// + /// 学分 + /// + public decimal? StudyScore { get; set; } + /// + /// 成绩 + /// + public decimal? Score { get; set; } + /// + /// 第一次补考成绩 + /// + public string ScoreOfNotPass { get; set; } + /// + /// 第二次补考成绩 + /// + public string ScoreOfNotPassTwo { get; set; } + } } From aad67a2da17dee3b3a042e7afd091dba9cde293d Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 11:51:32 +0800 Subject: [PATCH 24/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1-=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=EF=BC=9A=E8=B0=83=E5=BA=A6=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermController.cs | 16 ++++++ .../Views/ArrangeLessonTermAttemper/Form.js | 29 ++++------- .../ArrangeLessonTermAttemper/FormView.js | 37 +++++++------ .../ArrangeLessonTermService.cs | 52 +++++++++++++++++-- 4 files changed, 90 insertions(+), 44 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index 2b643cac9..cf57f41e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -122,6 +122,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = arrangeLessonTermIBLL.GetEntity(keyValue); return Success(data); } + /// + /// 获取调度时间数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonDateList(string queryJson) + { + var data = arrangeLessonTermIBLL.GetList(queryJson).Where(x => x.LessonDate.HasValue).Select(x => x.LessonDate).Distinct().Select(x => new + { + text = x, + value = x + }).OrderBy(x => x.value); + + return Success(data); + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 3bbd0b3b6..fa6eb33c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -180,20 +180,9 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperStartTime').lrselect({ allowSearch: true }); //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); - + $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { if (!!keyValue) { @@ -336,7 +325,7 @@ var bootstrap = function ($, learun) { return false; } if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index fb37b83ac..aa1925fba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -180,19 +180,9 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperStartTime').lrselect({ allowSearch: true }); //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { @@ -237,6 +227,10 @@ var bootstrap = function ($, learun) { } } page.query(); + if (!!data[id].length && data[id].length > 0) { + $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); + $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); + } } }); } @@ -314,6 +308,11 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } + page.query(); + if (!!data[id].length && data[id].length > 0) { + $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); + $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); + } } }); } @@ -336,7 +335,7 @@ var bootstrap = function ($, learun) { } } else if (formData.AttemperType == "01") { //调课：调度时间比较 if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } 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 6b07e142f..12e74d8e0 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 @@ -74,15 +74,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { //参考写法 - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(fieldSql); - strSql.Append(" FROM ArrangeLessonTerm t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + strSql.Append(" FROM ArrangeLessonTerm t where 1=1 "); + + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.DeptNo = @DeptNo "); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); + strSql.Append(" AND t.MajorNo = @MajorNo "); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); + strSql.Append(" AND t.LessonNo = @LessonNo "); + } + if (!queryParam["TeachClassNo"].IsEmpty()) + { + dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String); + strSql.Append(" AND t.TeachClassNo like @TeachClassNo "); + } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); + strSql.Append(" AND t.EmpNo = @EmpNo "); + } + if (!queryParam["ClassroomNo"].IsEmpty()) + { + dp.Add("ClassroomNo", queryParam["ClassroomNo"].ToString(), DbType.String); + strSql.Append(" AND t.ClassroomNo = @ClassroomNo "); + } + + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); } catch (Exception ex) { From 1d3f832be1324bc45afff5dcd7d823c94ab8593a Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 14:53:56 +0800 Subject: [PATCH 25/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1-=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E3=80=81=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E5=BA=A6=E6=97=B6=E9=97=B4=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ArrangeLessonTermAttemper/Form.js | 14 +++++-- .../ArrangeLessonTermAttemper/FormView.js | 25 +++++++------ .../Views/ArrangeLessonTermAttemper/Index.js | 37 +++++++++++++------ .../XmlConfig/ioc.config | 2 + .../ArrangeLessonTermAttemperMethod.cs | 20 ++++++---- 5 files changed, 64 insertions(+), 34 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index fa6eb33c9..46e63e24a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -223,7 +223,10 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } @@ -257,7 +260,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -299,9 +302,14 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -338,7 +346,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index aa1925fba..e33622b88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -41,6 +41,7 @@ var bootstrap = function ($, learun) { p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); + //console.log(p); //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 @@ -226,11 +227,11 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); - if (!!data[id].length && data[id].length > 0) { - $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); - $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); - } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + },3000) + } }); } @@ -264,7 +265,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -308,14 +309,14 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); - if (!!data[id].length && data[id].length > 0) { - $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); - $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); - } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -348,7 +349,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index b390431e8..6b56aca3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -408,21 +408,36 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - if (res.code == 200) { + //if (res.code == 200) { + // // 发起流程 + // learun.workflowapi.create({ + // isNew: true, + // schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + // processId: processId, + // processName: '课程异动申请',// 对应流程名称 + // processLevel: '1', + // description: '', + // formData: JSON.stringify(postData), + // callback: function (res, data) { + // } + // }); + // page.search(); + //} + + if (res && res.code && res.code == 200) { // 发起流程 - learun.workflowapi.create({ - isNew: true, - schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + + var postData = { + schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 processId: processId, - processName: '课程异动申请',// 对应流程名称 - processLevel: '1', - description: '', - formData: JSON.stringify(postData), - callback: function (res, data) { - } + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); }); - page.search(); + } + page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index f542e9f12..469130f66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -34,6 +34,7 @@ + @@ -78,6 +79,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs index 5f0ecf4ed..d1e0e9d24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs @@ -7,17 +7,21 @@ using System.Threading.Tasks; namespace Learun.Application.WorkFlow { - public class ArrangeLessonTermAttemperMethod : INodeMethod + public class ArrangeLessonTermAttemperMethod : IWorkFlowMethod { ArrangeLessonTermAttemperIBLL arrangeLessonTermAttemperIBLL = new ArrangeLessonTermAttemperBLL(); - public void Sucess(string processId) + + public void Execute(WfMethodParameter parameter) { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, processId); - } - - public void Fail(string processId) - { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, processId); + if (parameter.code == "agree") + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, parameter.processId); + } + else + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, parameter.processId); + } } + } } From 1b819994783bb4c50bffd6a80f06e9d395485c63 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 16:21:13 +0800 Subject: [PATCH 26/41] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E6=A0=A1=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9A=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuScoreController.cs | 11 ++ .../StuScore/AllStuScoreQueryIndex.cshtml | 3 + .../Views/StuScore/AllStuScoreQueryIndex.js | 18 ++ .../StuScore/AllStuScoreQueryPrint.cshtml | 167 ++++++++++++++++++ .../Learun.Application.Web.csproj | 1 + .../XmlConfig/system.config | 2 +- 6 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index a6bc47fdc..67e843cd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -5,6 +5,7 @@ using Learun.Util; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Configuration; using System.Data; using System.Linq; using System.Web.Mvc; @@ -192,6 +193,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 全院学生成绩打印 + /// + /// + [HttpGet] + public ActionResult AllStuScoreQueryPrint() + { + ViewBag.WebApi = ConfigurationManager.AppSettings["WebApi"]; + return View(); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml index fabcc03bc..d378e911a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml @@ -23,6 +23,9 @@
+
+  打印 +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js index e9a040df5..a8553a604 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -32,6 +32,24 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + //打印 + $('#lr_print').on('click', function () { + var AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + var Semester = $('#Semester').lrselectGet(); + var StuNo = $.trim($('#StuNo').val()); + if (StuNo == null || StuNo == "") { + learun.alert.warning("请输入学号！"); + return; + } + learun.layerForm({ + id: 'AllStuScoreQueryPrint', + title: '学生成绩单', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/AllStuScoreQueryPrint?StuNo=' + StuNo + '&AcademicYearNo=' + AcademicYearNo + '&Semester=' + Semester, + width: 1200, + height: 800, + btn: null + }); + }); }, bindSelect: function () { //学年 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml new file mode 100644 index 000000000..a08a261a5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml @@ -0,0 +1,167 @@ + + + + + + + + + Document + + + + + +
+

塔里木职业技术学院学生成绩单

+
    + +
    + +
    +
    打印
    + + + + + + + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 2ddc32d40..dddfc8074 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -7681,6 +7681,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 562bad2aa..2aaaf7c6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -143,7 +143,7 @@ - + From fc3a03ca53e0bd12b6e79708e824041ab4080b76 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 16:44:41 +0800 Subject: [PATCH 27/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=A8=E9=99=A2=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=9A=E5=8F=96=E6=B6=88clodop.js=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/AllStuScoreQueryIndex.cshtml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml index d378e911a..c612bbfac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml @@ -35,5 +35,4 @@
    -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js") - \ No newline at end of file +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js") \ No newline at end of file From 078dfec7b9a3dfe22a736e215cb5d06d0f5a0e34 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 18:02:02 +0800 Subject: [PATCH 28/41] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1=EF=BC=9A=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=A1=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TimeTableController.cs | 9 + .../TimeTable/ClassIndexInEducation.cshtml | 159 ++++++++++++++ .../Views/TimeTable/ClassIndexInEducation.js | 202 ++++++++++++++++++ 3 files changed, 370 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs index 2b26e1d62..93f48ee5d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs @@ -85,6 +85,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return View(); } /// + /// 班级课程表【教务】 + /// + /// + [HttpGet] + public ActionResult ClassIndexInEducation() + { + return View(); + } + /// /// 课程表【教学调度】 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml new file mode 100644 index 000000000..4a794077d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml @@ -0,0 +1,159 @@ +@{ + ViewBag.Title = "班级课程表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + 查询 +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
      +
    • 节次/星期
      • +
    • 星期一
      • +
    • 星期二
      • +
    • 星期三
      • +
    • 星期四
      • +
    • 星期五
      • +
    • 星期六
      • +
    • 星期日
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js") + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js new file mode 100644 index 000000000..472359edf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js @@ -0,0 +1,202 @@ +var refreshGirdData; +var bootstrap = function ($, learun) { + var startTime; + var endTime; + var page = { + init: function () { + page.bind(); + page.bindSelect(); + }, + loadData: function (param) { + $.lrSetFormWithParam(top.$.rootUrl + '/PersonnelManagement/TimeTable/GetDataInEducation', param, + function (data) { + // 数据处理 + var html = ''; + var weekLists = data.weekList; + for (var i = 1; i < 11; i++) { + (function (arg) { + var args = arg - 1; + var datas = flogs(arg, weekLists, 'time'); + html += ' ' + arg + '节'; + if (datas) { + var lists = datas.list; + html += tdHandles(lists); + } else { + html += tdHandle(arg); + } + html += ''; + })(i); //调用时参数 + } + $('.personT').text(data.schoolName); + $('.perSemester').text(data.semester); + $('.perFestivalsBox table').html(html); + + function flogs(num, data, obj) { + var flog = false; + $.each(data, + function (i, n) { + if (n[obj] == num) { + flog = n; + return; + } + }) + return flog; + } + function flogs2(num, data, obj) { + var arr = new Array(); + $.each(data, + function (i, n) { + if (n[obj] == num) { + arr.push(n); + } + }) + return arr; + } + + //某节课空 + function tdHandle() { + var html = ''; + for (var j = 0; j < 7; j++) { + html += '
    '; + } + return html; + } + + //某节课不空 + function tdHandles(lists) { + var html = ''; + for (var k = 1; k < 8; k++) { + (function (arg) { + var args = arg - 1; + var datas = flogs2(arg, lists, 'day'); + if (datas.length > 0) { + html += ''; + $.each(datas, function (i, item) { + if (i > 0) { + html += '
    '; + } + html += '
    课程：' + + item.curriculum + + '
    ' + + '
    教师：' + + item.teacher + + '
    ' + + '
    班级：' + + item.className + + '
    ' + + '
    教室：' + + item.classRoom + + '
    '; + }); + html += ''; + + } else { + html += '
    '; + } + + })(k); + } + return html; + } + }); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + $('#datesearch').lrdate({ + dfdata: [ + { + name: '上周', + begin: function () { return learun.getTime(7); }, + end: function () { + return learun.getTime(1); + } + }, + { + name: '本周', + begin: function () { return learun.getTime(0); }, + end: function () { + return learun.getTime(-6); + } + }, + { + name: '下周', + begin: function () { return learun.getTime(-7); }, + end: function () { + return learun.getTime(-13); + } + }], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: 'currentWeek', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + //查询 + $('#lr_search').on('click', function () { + var p = {}; + p.schoolId = $('#F_SchoolId').lrselectGet(); + p.ClassNo = $('#ClassNo').lrselectGet(); + page.search(p); + }); + }, + bindSelect: function () { + //校区 + $('#F_SchoolId').lrDataSourceSelect({ + code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { + if (!!item) { + // 班级 + $('#ClassNo').lrselectRefresh({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + param: { schoolId: item.f_companyid }, + value: 'value', + text: 'text' + }); + } else { + //班级 + $('#ClassNo').lrselectRefresh({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + param: { schoolId: "" }, + value: 'value', + text: 'text' + }); + } + } + }); + //班级 + $('#ClassNo').lrselect({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + value: 'value', + text: 'text' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + page.loadData(param); + } + }; + page.init(); +}; From 1ad201d088851fa1d352d0745afa706cb3bf1a39 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 18:06:14 +0800 Subject: [PATCH 29/41] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Learun.Application.Web.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index dddfc8074..5aa3c402b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1489,6 +1489,7 @@ + @@ -7682,6 +7683,7 @@ + From 6e1aaa2b6ae78856e31102e4cb726c67e891b7ab Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Sat, 2 Apr 2022 15:02:00 +0800 Subject: [PATCH 30/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6=EF=BC=9A=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E5=BA=A6=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ArrangeLessonTermAttemper/FormView.cshtml | 4 ++-- .../Views/ArrangeLessonTermAttemper/FormView.js | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index d7c970c4e..71071ebdb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -126,11 +126,11 @@
    调度开始时间*
    -
    +
    调度结束时间*
    -
    +
    调度备注
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index e33622b88..e0247da8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -180,10 +180,6 @@ var bootstrap = function ($, learun) { $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); - //调度开始时间 - $('#AttemperStartTime').lrselect({ allowSearch: true }); - //调度结束时间 - $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { @@ -227,10 +223,6 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - var timer = setTimeout(function () { - page.query(); - clearTimeout(timer); - },3000) } }); @@ -309,10 +301,6 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - var timer = setTimeout(function () { - page.query(); - clearTimeout(timer); - }, 3000) } }); } From 81af20d8366492dc3e19787c3ea1614849414d9c Mon Sep 17 00:00:00 2001 From: liangkun Date: Sat, 2 Apr 2022 17:45:27 +0800 Subject: [PATCH 31/41] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=95=99=E5=B8=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E7=B3=BB?= =?UTF-8?q?=E9=83=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/FormEdit.cshtml | 4 ++-- .../Views/EmpInfo/FormEdit.js | 2 +- .../EmpInfo/EmpInfoService.cs | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index a3ce1de60..d50374b93 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,10 @@
    部门
    - @*
    +
    系部
    -
    *@ +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index ca29ab2d4..9f1bb64ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { } }); $('#F_DepartmentId').lrselect(); - //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index def26cb76..0e1492ada 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -792,10 +792,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - //if (!string.IsNullOrEmpty(entity.DeptNo)) - //{ - // model.DeptNo = entity.DeptNo; - //} + if (!string.IsNullOrEmpty(entity.DeptNo)) + { + model.DeptNo = entity.DeptNo; + } db.Update(model); } } @@ -814,10 +814,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - //if (!string.IsNullOrEmpty(entity.DeptNo)) - //{ - // model.DeptNo = entity.DeptNo; - //} + if (!string.IsNullOrEmpty(entity.DeptNo)) + { + model.DeptNo = entity.DeptNo; + } db.Update(model); } } From 55d2a365083fa99581d33b958f4a6a36aafdf9a7 Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 6 Apr 2022 20:03:36 +0800 Subject: [PATCH 32/41] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BA=BA=E6=95=99=E5=AD=A6=E7=B3=BB=E9=83=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs | 4 ++-- .../AuthorizeModule/DataAuthorize/DataAuthorizeService.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs index 4d9dec5ce..a6ac7efe5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs @@ -514,9 +514,9 @@ namespace Learun.Application.Base.AuthorizeModule case 8: // ѧϵ { var empinfo = dataAuthorizeService.GetEmpInfoEntityByNo(userInfo.account); - if (empinfo != null&&!string.IsNullOrEmpty(empinfo.DeptNo)) + if (empinfo != null&&empinfo.Rows.Count>0&&empinfo.Rows[0]["DeptNo"]!=null) { - text = empinfo.DeptNo; + text = empinfo.Rows[0]["DeptNo"].ToString(); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs index 3c3870537..a96feced9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs @@ -2,6 +2,7 @@ using Learun.DataBase.Repository; using Learun.Util; using System; using System.Collections.Generic; +using System.Data; using System.Text; namespace Learun.Application.Base.AuthorizeModule @@ -265,11 +266,11 @@ namespace Learun.Application.Base.AuthorizeModule #endregion - public dynamic GetEmpInfoEntityByNo(string keyValue) + public DataTable GetEmpInfoEntityByNo(string keyValue) { try { - return this.BaseRepository("CollegeMIS").FindEntity("select * from EmpInfo where EmpNo='"+keyValue+"'"); + return this.BaseRepository("CollegeMIS").FindTable("select * from EmpInfo where EmpNo='"+keyValue+"'"); } catch (Exception ex) { From 661feaf7a998065e9d8f34bf94a2b639820884dd Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Thu, 7 Apr 2022 11:38:23 +0800 Subject: [PATCH 33/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=AF=8F=E6=9C=881?= =?UTF-8?q?=E5=8F=B7=E5=BC=BA=E5=88=B6=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Controllers/LoginController.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index 4c8044023..06b7dfc2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -557,6 +557,11 @@ namespace Learun.Application.Web.Controllers { return Success(new { pwd = true }); } + //每月1号强制用户修改密码 + if (DateTime.Now.Day == 1 && up == "false") + { + return Success(new { pwd = true }); + } //是否30天未修改密码验证 //获取开关显示配置中“30天未修改密码登录后提示修改”项的配置 if (teachSwitchIBLL.FindFirst("modifypwdtip")) From a8439bc60ab9ee7e4383e7f46310aa8a9669fe49 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Fri, 8 Apr 2022 10:26:40 +0800 Subject: [PATCH 34/41] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Views/Home/ChangePwd.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js index 9e0bbba79..f6370ac69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js @@ -35,6 +35,7 @@ var bootstrap = function ($, learun) { } if ($this.val() != $('#NewPwd').val()) { learun.alert.error("两次密码输入不一样"); + return false; } }); } From b823391902f2e797697ffc5dc3ee9ae2f825daad Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 8 Apr 2022 14:53:37 +0800 Subject: [PATCH 35/41] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LR_SystemModule/Views/Log/Index.cshtml | 26 ++++++++++++++----- .../Areas/LR_SystemModule/Views/Log/Index.js | 7 +++-- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml index dac19e036..2adefd6c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml @@ -8,9 +8,9 @@
    • 登录日志
      • -
    • 访问日志
      • -
    • 操作日志
      • -
    • 异常日志
      • +
    • 访问日志
      • +
    • 操作日志
      • +
    • 异常日志
    @@ -23,10 +23,22 @@
    - -
    -
    -  查询 +
    +
    +
    +
    操作用户
    + +
    +
    +
    系统功能
    + +
    +
    +
    操作类型
    + +
    +
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js index f0b8e0869..f89f0c26f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js @@ -51,10 +51,9 @@ var bootstrap = function ($, learun) { }); }); // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); From 8165452b68fb31c1abf010348650543189005481 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 8 Apr 2022 17:57:34 +0800 Subject: [PATCH 36/41] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Util/Learun.Util.Operat/OperatorHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs index f2fdaa45a..0ed02d72b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs @@ -465,7 +465,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo?.account; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account+"("+ operateLogModel.userInfo.realName+ ")"; logEntity.F_OperateUserId = operateLogModel.userInfo?.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; @@ -495,7 +495,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo.account; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account + "(" + operateLogModel.userInfo.realName + ")"; logEntity.F_OperateUserId = operateLogModel.userInfo.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; From 24bd14b7ae84c0afa609578dc92b4156cc223ba9 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 8 Apr 2022 19:24:17 +0800 Subject: [PATCH 37/41] =?UTF-8?q?=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E6=94=BF?= =?UTF-8?q?=E6=B2=BB=E9=9D=A2=E8=B2=8C=E5=AD=97=E5=85=B8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/EducationalAdministration/Views/StuInfoFresh/Form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index 8d45704d1..cc3d59d23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); + $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); From 66afaa88a1d44aed203c15dd6358ec74602b1025 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 14 Apr 2022 11:03:26 +0800 Subject: [PATCH 38/41] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E8=B6=85=E9=95=BF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_FormModule/Controllers/CustmerformController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs index da1527d9a..ddb78929f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs @@ -343,7 +343,7 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers } catch (Exception e) { - return Fail("sql执行错误，数据溢出"); + return Fail("输入字段超过限定长度，请精简内容后再试。"); } } From 257c467ca43fe5ec7e9963dddba58ecefe0d70fd Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 14 Apr 2022 20:19:43 +0800 Subject: [PATCH 39/41] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...补充接口说明V1.0（塔里木）.docx | Bin 0 -> 20309 bytes .../ArrangeLessonTermController.cs | 16 + .../Controllers/ElectiveMergeController.cs | 5 + .../Controllers/Exam_ExamPlanController.cs | 117 ++++ .../Controllers/LessonInfoController.cs | 12 + .../OpenLessonPlanOfElectiveController.cs | 45 ++ .../Controllers/StuScoreController.cs | 38 ++ .../Controllers/StuScoreNotPassController.cs | 44 +- .../StuScoreNotPassTwoController.cs | 43 ++ ...StuSelectLessonListOfElectiveController.cs | 6 + .../Views/ArrangeLessonTermAttemper/Form.js | 43 +- .../ArrangeLessonTermAttemper/FormView.cshtml | 4 +- .../ArrangeLessonTermAttemper/FormView.js | 36 +- .../Views/ArrangeLessonTermAttemper/Index.js | 37 +- .../Views/ElectiveMajor/Index.js | 10 + .../Views/EmpInfo/FormEdit.cshtml | 4 +- .../Views/EmpInfo/FormEdit.js | 2 +- .../Views/Exam_ExamPlan/Form.cshtml | 43 ++ .../Views/Exam_ExamPlan/Form.js | 68 ++ .../Views/Exam_ExamPlan/Index.cshtml | 66 ++ .../Views/Exam_ExamPlan/Index.js | 147 ++++ .../OpenLessonPlanOfElective/MergeIndex.js | 43 +- .../StudentIndex.cshtml | 25 +- .../OpenLessonPlanOfElective/StudentIndex.js | 17 +- .../Views/StuInfoFresh/Form.js | 2 +- .../StuScore/AllStuScoreQueryIndex.cshtml | 38 ++ .../Views/StuScore/AllStuScoreQueryIndex.js | 108 +++ .../StuScore/AllStuScoreQueryPrint.cshtml | 167 +++++ .../Views/StuScoreNotPass/IndexUnpass.cshtml | 58 ++ .../Views/StuScoreNotPass/IndexUnpass.js | 147 ++++ .../StuScoreNotPassTwo/IndexUnpassTwo.cshtml | 58 ++ .../StuScoreNotPassTwo/IndexUnpassTwo.js | 143 ++++ .../Index.cshtml | 3 + .../StuSelectLessonListOfElective/Index.js | 17 +- .../QueryStuSelectResult.js | 2 +- .../QueryStuSelectResultForTeacher.cshtml | 59 ++ .../QueryStuSelectResultForTeacher.js | 218 ++++++ .../Controllers/CustmerformController.cs | 19 +- .../Views/FormRelation/Form.cshtml | 2 +- .../LR_FormModule/Views/FormRelation/Form.js | 5 +- .../Views/FormRelation/PreviewIndex.js | 6 +- .../Views/NWFProcess/NWFContainerForm.js | 22 +- .../LR_SystemModule/Views/Log/Index.cshtml | 26 +- .../Areas/LR_SystemModule/Views/Log/Index.js | 7 +- .../Acc_DormitoryRuleController.cs | 141 ++++ .../Controllers/AccommodationController.cs | 205 +++++- .../Controllers/DormitoryReturnController.cs | 245 +++++++ .../Views/Acc_DormitoryRule/Form.cshtml | 27 + .../Views/Acc_DormitoryRule/Form.js | 62 ++ .../Views/Acc_DormitoryRule/Index.cshtml | 27 + .../Views/Acc_DormitoryRule/Index.js | 139 ++++ .../Views/Accommodation/Corridor.cshtml | 22 +- .../Views/Accommodation/Dormitory.cshtml | 176 +---- .../Views/Accommodation/DormitoryAdd.cshtml | 8 +- .../Views/Accommodation/Floor.cshtml | 32 +- .../Views/Accommodation/Form.cshtml | 76 ++- .../Views/Accommodation/Form.js | 1 + .../Views/Accommodation/FormBed.cshtml | 12 + .../Views/Accommodation/FormBed.js | 52 ++ .../Views/Accommodation/FormClass.cshtml | 19 + .../Views/Accommodation/FormClass.js | 82 +++ .../Views/Accommodation/FormClassify.cshtml | 97 +++ .../Views/Accommodation/FormClassify.js | 167 +++++ .../Views/Accommodation/FormDept.cshtml | 15 + .../Views/Accommodation/FormDept.js | 56 ++ .../Views/Accommodation/FormRoom.cshtml | 26 + .../Views/Accommodation/FormRoom.js | 128 ++++ .../Views/Accommodation/Index.cshtml | 82 +-- .../Views/Accommodation/Index.js | 547 +++++++++++---- .../Views/Accommodation/IndexBed.cshtml | 61 ++ .../Views/Accommodation/IndexBed.js | 110 +++ .../Views/Accommodation/IndexClassify.cshtml | 69 ++ .../Views/Accommodation/IndexClassify.js | 187 ++++++ .../Accommodation/IndexDistribution.cshtml | 92 +++ .../Views/Accommodation/IndexDistribution.js | 625 ++++++++++++++++++ .../Views/Accommodation/Room.cshtml | 12 +- .../Views/Accommodation/Unit.cshtml | 21 +- .../Views/DormitoryReturn/Form.cshtml | 23 + .../Views/DormitoryReturn/Form.js | 59 ++ .../Views/DormitoryReturn/FormOut.cshtml | 19 + .../Views/DormitoryReturn/FormOut.js | 61 ++ .../Views/DormitoryReturn/FormReturn.cshtml | 19 + .../Views/DormitoryReturn/FormReturn.js | 61 ++ .../Views/DormitoryReturn/Index.cshtml | 49 ++ .../Views/DormitoryReturn/Index.js | 159 +++++ .../Views/DormitoryReturn/IndexReport.cshtml | 49 ++ .../Views/DormitoryReturn/IndexReport.js | 131 ++++ .../Controllers/TimeTableController.cs | 9 + .../TimeTable/ClassIndexInEducation.cshtml | 159 +++++ .../Views/TimeTable/ClassIndexInEducation.js | 202 ++++++ .../Controllers/LoginController.cs | 5 + .../Learun.Application.Web.csproj | 20 + .../Views/Home/ChangePwd.js | 1 + .../Views/LR_Content/plugin/grid/jfgrid.js | 1 + .../Views/LR_Content/script/lr-excel.js | 6 + .../XmlConfig/ioc.config | 2 + .../XmlConfig/system.config | 4 +- .../Learun.Application.WebApi.csproj | 1 + .../Modules/StuScoreApi.cs | 143 ++++ .../Modules/TimeTable.cs | 89 ++- .../DataAuthorize/DataAuthorizeBLL.cs | 4 +- .../DataAuthorize/DataAuthorizeService.cs | 5 +- .../Scheme/FormSchemeBLL.cs | 7 +- .../Exam_ExamPlanMap.cs | 29 + .../Learun.Application.Mapping.csproj | 12 + .../Acc_DormitoryReturnMap.cs | 29 + .../Acc_DormitoryRuleMap.cs | 29 + .../ArrangeLessonTermService.cs | 58 +- .../ArrangeLessonTermOfElectiveService.cs | 19 +- .../ElectiveMajor/ElectiveMajorService.cs | 24 +- .../ElectiveMerge/ElectiveMergeService.cs | 4 +- .../EmpInfo/EmpInfoService.cs | 16 +- .../Exam_ExamPlan/Exam_ExamPlanBLL.cs | 125 ++++ .../Exam_ExamPlan/Exam_ExamPlanEntity.cs | 90 +++ .../Exam_ExamPlan/Exam_ExamPlanIBLL.cs | 48 ++ .../Exam_ExamPlan/Exam_ExamPlanService.cs | 188 ++++++ .../LessonInfo/LessonInfoBLL.cs | 19 + .../LessonInfo/LessonInfoIBLL.cs | 1 + .../LessonInfo/LessonInfoService.cs | 19 + .../OpenLessonPlanOfElectiveEntity.cs | 2 + .../OpenLessonPlanOfElectiveService.cs | 29 +- .../OpenLessonPlanOfElectiveChangeEntity.cs | 6 + .../EducationalAdministration/SignUpHelper.cs | 6 + .../StuScore/StuScoreBLL.cs | 24 + .../StuScore/StuScoreEntity.cs | 35 +- .../StuScore/StuScoreIBLL.cs | 6 + .../StuScore/StuScoreService.cs | 122 +++- .../StuScoreNotPass/StuScoreNotPassBLL.cs | 40 ++ .../StuScoreNotPass/StuScoreNotPassEntity.cs | 14 + .../StuScoreNotPass/StuScoreNotPassIBLL.cs | 2 + .../StuScoreNotPass/StuScoreNotPassService.cs | 107 +++ .../StuScoreNotPassTwoBLL.cs | 45 ++ .../StuScoreNotPassTwoIBLL.cs | 2 + .../StuScoreNotPassTwoService.cs | 115 ++++ .../StuSelectLessonListOfElectiveEntity.cs | 1 + .../StuSelectLessonListOfElectiveService.cs | 4 +- .../Learun.Application.TwoDevelopment.csproj | 92 ++- .../Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs | 148 +++++ .../Acc_DormitoryRuleEntity.cs | 90 +++ .../Acc_DormitoryRuleIBLL.cs | 49 ++ .../Acc_DormitoryRuleService.cs | 168 +++++ .../Accommodation/Acc_DormitoryBuildEntity.cs | 51 ++ .../Accommodation/AccommodationBLL.cs | 260 +++++++- .../Accommodation/AccommodationIBLL.cs | 12 +- .../Accommodation/AccommodationService.cs | 546 ++++++++++++++- .../Acc_DormitoryReturnEntity.cs | 104 +++ .../DormitoryReturn/DormitoryReturnBLL.cs | 210 ++++++ .../DormitoryReturn/DormitoryReturnIBLL.cs | 50 ++ .../DormitoryReturn/DormitoryReturnService.cs | 273 ++++++++ .../ArrangeLessonTermAttemperMethod.cs | 20 +- .../Learun.Util.Operat/OperatorHelper.cs | 4 +- 151 files changed, 9565 insertions(+), 669 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs 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/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index 2b643cac9..cf57f41e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -122,6 +122,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = arrangeLessonTermIBLL.GetEntity(keyValue); return Success(data); } + /// + /// 获取调度时间数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonDateList(string queryJson) + { + var data = arrangeLessonTermIBLL.GetList(queryJson).Where(x => x.LessonDate.HasValue).Select(x => x.LessonDate).Distinct().Select(x => new + { + text = x, + value = x + }).OrderBy(x => x.value); + + return Success(data); + } #endregion #region 提交数据 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/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs new file mode 100644 index 000000000..95ae373a7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanController : MvcControllerBase + { + private Exam_ExamPlanIBLL exam_ExamPlanIBLL = new Exam_ExamPlanBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = exam_ExamPlanIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Exam_ExamPlanData = exam_ExamPlanIBLL.GetExam_ExamPlanEntity( keyValue ); + var jsonData = new { + Exam_ExamPlan = Exam_ExamPlanData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + exam_ExamPlanIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Exam_ExamPlanEntity entity = strEntity.ToObject(); + exam_ExamPlanIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs index 270d9f43b..d99e78b0a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs @@ -104,6 +104,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers LessonInfoData.Introduction = WebHelper.HtmlDecode(LessonInfoData.Introduction); return Success(LessonInfoData); } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonByMajorNo(string majorNo) + { + var LessonInfoList = lessonInfoIBLL.GetLessonByMajorNo(majorNo); + return Success(LessonInfoList); + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs index 622ce156b..a1a8f1486 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Collections.Generic; using System; using System.Linq; +using Learun.Application.Base.SystemModule; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -25,6 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers CdMajorIBLL CdMajorIBLL = new CdMajorBLL(); private StuSelectLessonListOfElectivePreIBLL stuSelectLessonListOfElectivePreIBLL = new StuSelectLessonListOfElectivePreBLL(); private OpenLessonPlanOfElectiveChangeIBLL openLessonPlanOfElectiveChangeIBLL = new OpenLessonPlanOfElectiveChangeBLL(); + private DataSourceIBLL dataSourceIBLL = new DataSourceBLL(); #region 视图功能 @@ -224,14 +226,57 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (!string.IsNullOrEmpty(entity.AfterLessonNo)) { model.AfterLessonNo = entity.AfterLessonNo; + var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.AfterLessonNo + "'"); + if (lesson != null && lesson.Rows.Count > 0) + { + model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); + } + } + else + { + var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.LessonNo + "'"); + if (lesson != null && lesson.Rows.Count > 0) + { + model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); + } } + if (!string.IsNullOrEmpty(entity.AfterEmpNo)) { model.AfterEmpNo = entity.AfterEmpNo; + + var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.AfterEmpNo + "'"); + if (emp != null && emp.Rows.Count > 0) + { + model.AfterEmpName = emp.Rows[0]["empname"].ToString(); + } } + else + { + var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.EmpNo + "'"); + if (emp != null && emp.Rows.Count > 0) + { + model.AfterEmpName = emp.Rows[0]["empname"].ToString(); + } + } + if (!string.IsNullOrEmpty(entity.AfterClassRoomNo)) { model.AfterClassRoomNo = entity.AfterClassRoomNo; + + var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.AfterClassRoomNo + "'"); + if (classRoom != null && classRoom.Rows.Count > 0) + { + model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); + } + } + else + { + var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.ClassRoomNo + "'"); + if (classRoom != null && classRoom.Rows.Count > 0) + { + model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); + } } openLessonPlanOfElectiveChangeIBLL.SaveEntity("", model); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 905be20de..67e843cd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -5,6 +5,7 @@ using Learun.Util; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Configuration; using System.Data; using System.Linq; using System.Web.Mvc; @@ -183,6 +184,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 全院学生成绩查看页面 + /// + /// + [HttpGet] + public ActionResult AllStuScoreQueryIndex() + { + return View(); + } + /// + /// 全院学生成绩打印 + /// + /// + [HttpGet] + public ActionResult AllStuScoreQueryPrint() + { + ViewBag.WebApi = ConfigurationManager.AppSettings["WebApi"]; + return View(); + } #endregion #region 获取数据 @@ -715,6 +735,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(result); } + /// + /// 全院学生成绩查看 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetScoreListByStuInfo(string queryJson) + { + var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); + if (data.Any()) + { + data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x=>x.LessonSortNo).ThenBy(x => x.LessonNo); + } + + return Success(data); + } + public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo) { var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs index ef8c04c8d..77e7fec38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs @@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 补考名单查看 + /// + /// + [HttpGet] + public ActionResult IndexUnpass() + { + return View(); + } + #endregion #region 获取数据 @@ -106,6 +116,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + /// + /// 补考名单查看 + /// 分页参数 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForUnpass(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreNotPassIBLL.GetPageListForUnpass(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// /// 获取表单数据 /// 主键 @@ -171,7 +203,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - + /// 初始化补考成绩 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult InitScore() + { + stuScoreNotPassIBLL.InitScore(); + return Success("操作成功！"); + } + #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs index 380f8dc62..8eec54f49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs @@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } + /// + /// 二次补考成绩查看 + /// + /// + [HttpGet] + public ActionResult IndexUnpassTwo() + { + return View(); + } + #endregion #region 获取数据 @@ -146,6 +156,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(data); } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForUnpass(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreNotPassTwoIBLL.GetPageListForUnpass(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } #endregion #region 提交数据 @@ -176,6 +207,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassTwoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + + /// + /// 初始化二次补考成绩 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult InitScore() + { + stuScoreNotPassTwoIBLL.InitScore(); + return Success("操作成功！"); + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs index cc47418eb..cb4b7d1b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs @@ -34,6 +34,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + [HttpGet] + public ActionResult QueryStuSelectResultForTeacher() + { + return View(); + } /// /// 教务-审核表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 3bbd0b3b6..46e63e24a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -180,20 +180,9 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperStartTime').lrselect({ allowSearch: true }); //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); - + $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { if (!!keyValue) { @@ -234,7 +223,10 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } @@ -268,7 +260,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -310,9 +302,14 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -336,7 +333,7 @@ var bootstrap = function ($, learun) { return false; } if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } @@ -349,7 +346,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index d7c970c4e..71071ebdb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -126,11 +126,11 @@
    调度开始时间*
    -
    +
    调度结束时间*
    -
    +
    调度备注
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index fb37b83ac..e0247da8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -41,21 +41,22 @@ var bootstrap = function ($, learun) { p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); + //console.log(p); //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -179,20 +180,6 @@ var bootstrap = function ($, learun) { $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); - //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); - //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); }, initData: function () { @@ -236,7 +223,7 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); + } }); } @@ -270,7 +257,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -317,6 +304,7 @@ var bootstrap = function ($, learun) { } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -336,7 +324,7 @@ var bootstrap = function ($, learun) { } } else if (formData.AttemperType == "01") { //调课：调度时间比较 if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } @@ -349,7 +337,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index b390431e8..6b56aca3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -408,21 +408,36 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - if (res.code == 200) { + //if (res.code == 200) { + // // 发起流程 + // learun.workflowapi.create({ + // isNew: true, + // schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + // processId: processId, + // processName: '课程异动申请',// 对应流程名称 + // processLevel: '1', + // description: '', + // formData: JSON.stringify(postData), + // callback: function (res, data) { + // } + // }); + // page.search(); + //} + + if (res && res.code && res.code == 200) { // 发起流程 - learun.workflowapi.create({ - isNew: true, - schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + + var postData = { + schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 processId: processId, - processName: '课程异动申请',// 对应流程名称 - processLevel: '1', - description: '', - formData: JSON.stringify(postData), - callback: function (res, data) { - } + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); }); - page.search(); + } + page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js index 58dfa6639..6839e2da6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js @@ -5,6 +5,7 @@ * 描 述：选课专业 */ var refreshGirdData; +var acceptClick; var OLPOEId = request("OLPOEId"); var bootstrap = function ($, learun) { "use strict"; @@ -129,8 +130,17 @@ var bootstrap = function ($, learun) { $('#gridtablemanagemajor').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; + refreshGirdData = function () { page.search(); }; + + // 保存数据 + acceptClick = function (callBack) { + if (!!callBack) { + learun.layerClose(window.name); + callBack(); + } + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index a3ce1de60..d50374b93 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,10 @@
    部门
    - @*
    +
    系部
    -
    *@ +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index ca29ab2d4..9f1bb64ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { } }); $('#F_DepartmentId').lrselect(); - //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml new file mode 100644 index 000000000..f8810fce8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml @@ -0,0 +1,43 @@ +@{ + ViewBag.Title = "考试记录表"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    学年*
    +
    +
    +
    +
    学期*
    +
    +
    +
    +
    排考名称*
    + +
    +
    +
    排考类型*
    +
    +
    +
    +
    排考编号*
    + +
    +
    +
    排考总人数*
    + +
    +
    +
    生成座位*
    +
    +
    +
    +
    是否生成*
    +
    +
    +
    +
    排序号*
    + +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js new file mode 100644 index 000000000..7a12a2cb2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js @@ -0,0 +1,68 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-04-14 18:12 + * 描 述：考试记录表 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); + $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml new file mode 100644 index 000000000..15b62df28 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml @@ -0,0 +1,66 @@ +@{ + ViewBag.Title = "考试记录表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    学年
    +
    +
    +
    +
    学期
    +
    +
    +
    +
    排考名称
    + +
    +
    +
    排考类型
    +
    +
    +
    +
    排考编号
    + +
    +
    +
    生成座位
    +
    +
    +
    +
    是否生成
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  打印 +
    +
    +   生成排考名单 +   清除排考名单 +   安排考试 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js new file mode 100644 index 000000000..4a3990b5a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js @@ -0,0 +1,147 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-04-14 18:12 + * 描 述：考试记录表 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); + $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('EPId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('EPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + //  生成排考名单 + $('#lr_generate').on('click', function () { + }); + //  清除排考名单 + $('#lr_cleargenerate').on('click', function () { + }); + //  安排考试 + $('#lr_planks').on('click', function () { + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetPageList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, + { label: "排考名称", name: "PlanName", width: 100, align: "left" }, + { + label: "排考类型", name: "PlanType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudentType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "排考编号", name: "PlanCode", width: 100, align: "left" }, + { label: "排考总人数", name: "EPStuCount", width: 100, align: "left" }, + { + label: "生成座位", name: "EPRandom", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "是" : "否"; + } + }, + { + label: "是否生成", name: "EPGenarate", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "是" : "否"; + } + }, + { label: "排序号", name: "EPOrder", width: 100, align: "left" }, + ], + mainId: 'EPId', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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..470213e9a 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 @@ -40,7 +40,10 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/ElectiveMajor/Index?OLPOEId=' + keyValue, width: 1000, height: 700, - btn: null + //btn: null + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } }); } @@ -183,8 +186,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" }, @@ -221,18 +225,29 @@ var bootstrap = function ($, learun) { { label: "通过人数", name: "StuNum", width: 60, align: "left" }, { label: "已报人数(预)", name: "StuNumOfApplyPre", width: 80, align: "left" }, { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" }, - //{ - // label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) { - // var str = ""; - // for (var i = 0; i < row.ElectiveMajorList.length; i++) { - // str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName; - // if (i != row.ElectiveMajorList.length - 1) { - // str += ","; - // } - // } - // return str; - // } - //} + { + label: "是否已选专业", name: "IsElectiveMajor", width: 100, align: "left", formatter: function (cellvalue,row) { + if (!!row.ElectiveMajorList && row.ElectiveMajorList.length > 0) { + return "是"; + } else { + return "否"; + } + } + }, + { + label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left", formatter: function (cellvalue, row) { + var str = ""; + if (!!cellvalue && cellvalue.length > 0) { + for (var i = 0; i < cellvalue.length; i++) { + str += cellvalue[i].Grade + "级" + cellvalue[i].MajorName; + if (i != cellvalue.length - 1) { + str += ","; + } + } + } + return str; + } + } ], mainId: 'Id', isPage: true, 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/OpenLessonPlanOfElective/StudentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js index c426e026f..3079bf4fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js @@ -176,7 +176,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/GetPageListOfStudent', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, @@ -196,6 +196,21 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "课程类型", name: "LessonTypeId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + console.log(row.LessonTypeId); + + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', + key: row.LessonTypeId, + keyId: 'ltid', + callback: function (_data) { + callback(_data['lessontypename']); + } + }); + } + }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index 8d45704d1..cc3d59d23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); + $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml new file mode 100644 index 000000000..c612bbfac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml @@ -0,0 +1,38 @@ +@{ ViewBag.Title = "全院学生成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; } + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  查询 +
    +
    +
    +
    +  打印 +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js new file mode 100644 index 000000000..a8553a604 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -0,0 +1,108 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-06-14 11:02 + * 描 述：全院学生成绩查看 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.bind(); + page.bindSelect(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var p = {}; + p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + p.Semester = $('#Semester').lrselectGet(); + p.StuNo = $.trim($('#StuNo').val()); + if (p.StuNo == null || p.StuNo == "") { + learun.alert.warning("请输入学号！"); + return; + } + + page.initGird(); + page.search(p); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //打印 + $('#lr_print').on('click', function () { + var AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + var Semester = $('#Semester').lrselectGet(); + var StuNo = $.trim($('#StuNo').val()); + if (StuNo == null || StuNo == "") { + learun.alert.warning("请输入学号！"); + return; + } + learun.layerForm({ + id: 'AllStuScoreQueryPrint', + title: '学生成绩单', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/AllStuScoreQueryPrint?StuNo=' + StuNo + '&AcademicYearNo=' + AcademicYearNo + '&Semester=' + Semester, + width: 1200, + height: 800, + btn: null + }); + }); + }, + bindSelect: function () { + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学期", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuInfo', + headData: [ + { label: '学号', name: 'StuNo', width: 100, align: "left" }, + { label: '姓名', name: 'StuName', width: 200, align: "left" }, + { label: '专业', name: 'MajorName', width: 100, align: "left" }, + { label: '班级', name: 'ClassName', width: 100, align: "left" }, + { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, + { label: '学期', name: 'Semester', width: 50, align: "left" }, + { label: '科目类型', name: 'LessonSortName', width: 60, align: "left" }, + { label: '科目', name: 'LessonName', width: 300, align: "left" }, + { label: '学分', name: 'StudyScore', width: 50, align: "left" }, + { label: '成绩', name: 'Score', width: 100, align: "left" }, + { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, + { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, + { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, + { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, + ], + mainId: 'StuNo', + isPage: false, + sidx: '', + sord: '', + }); + + //page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml new file mode 100644 index 000000000..a08a261a5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml @@ -0,0 +1,167 @@ + + + + + + + + + Document + + + + + +
    +

    塔里木职业技术学院学生成绩单

    +
      + +
      + +
      +
      打印
      + + + + + + + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml new file mode 100644 index 000000000..7f42b08f4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml @@ -0,0 +1,58 @@ +@{ + ViewBag.Title = "长阳迎新"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      学年
      +
      +
      +
      +
      学期
      +
      +
      +
      +
      年级
      +
      +
      +
      +
      系部
      +
      +
      +
      +
      专业
      +
      +
      +
      +
      课程
      +
      +
      +
      +
      班级
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +  初始化补考成绩 +
      +
      +
      +
      +
      +
      +
      +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js new file mode 100644 index 000000000..672507755 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js @@ -0,0 +1,147 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-12-16 10:14 + * 描 述：长阳迎新 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + //年级 + $('#grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + allowSearch: true, + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + allowSearch: true, + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + + majorNo, + text: "ClassName", + value: "ClassNo" + }); + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + + majorNo, + text: "LessonName", + value: "LessonNo" + }); + } + }); + $('#ClassNo').lrDataSourceSelect({ + allowSearch: true, + code: 'bjsj', value: 'classno', text: 'classname' + }); + $('#LessonNo').lrDataSourceSelect({ + allowSearch: true, + code: 'LessonInfo', value: 'lessonno', text: 'lessonname' + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 初始化补考成绩 + $('#lr_Init').on('click', function () { + learun.layerConfirm('是否确认初始化补考成绩！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetPageListForUnpass', + headData: [ + { + label: "学号", name: "stuno", width: 80, align: "left" + }, + { + label: "姓名", name: "stuname", width: 100, align: "left" + }, + { label: "课程", name: "LessonName", width: 100, align: "left" }, + { label: "考试年级", name: "Grade", width: 100, align: "left" }, + { + label: "学年", name: "AcademicYearNo", width: 80, align: "left", + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'usersex', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} + }, + { label: "学期", name: "Semester", width: 150, align: "left" }, + { label: "班级", name: "classname", width: 150, align: "left" }, + { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, + { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, + { label: "成绩", name: "Score2", width: 150, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'ClassNo,LessonNo', + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml new file mode 100644 index 000000000..da3304a88 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml @@ -0,0 +1,58 @@ +@{ + ViewBag.Title = "二次补考成绩查看"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      学年
      +
      +
      +
      +
      学期
      +
      +
      +
      +
      年级
      +
      +
      +
      +
      系部
      +
      +
      +
      +
      专业
      +
      +
      +
      +
      课程
      +
      +
      +
      +
      班级
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +  初始化二次补考成绩 +
      +
      +
      +
      +
      +
      +
      +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js new file mode 100644 index 000000000..2c9f8248a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js @@ -0,0 +1,143 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-12-16 10:14 + * 描 述：长阳迎新 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + //年级 + $('#grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + + majorNo, + text: "ClassName", + value: "ClassNo" + }); + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + + majorNo, + text: "LessonName", + value: "LessonNo" + }); + } + }); + $('#ClassNo').lrDataSourceSelect({ + code: 'bjsj', value: 'classno', text: 'classname' + }); + $('#LessonNo').lrDataSourceSelect({ + code: 'LessonInfo', value: 'lessonno', text: 'lessonname' + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 初始化补考成绩 + $('#lr_Init').on('click', function () { + learun.layerConfirm('是否确认初始化二次补考成绩！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetPageListForUnpass', + headData: [ + { + label: "学号", name: "stuno", width: 80, align: "left" + }, + { + label: "姓名", name: "stuname", width: 100, align: "left" + }, + { label: "课程", name: "LessonName", width: 100, align: "left" }, + { label: "考试年级", name: "Grade", width: 100, align: "left" }, + { + label: "学年", name: "AcademicYearNo", width: 80, align: "left", + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'usersex', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} + }, + { label: "学期", name: "Semester", width: 150, align: "left" }, + { label: "班级", name: "classname", width: 150, align: "left" }, + { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, + { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, + { label: "成绩", name: "Score2", width: 150, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'ClassNo,LessonNo', + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js index fa4d52a95..9da21e054 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js @@ -68,7 +68,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetPageList', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left"}, @@ -87,6 +87,21 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "课程类型", name: "LessonTypeId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + console.log(row.LessonTypeId); + + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', + key: row.LessonTypeId, + keyId: 'ltid', + callback: function (_data) { + callback(_data['lessontypename']); + } + }); + } + }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js index c5f5bb8cb..48fd142b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', headData: [ { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml new file mode 100644 index 000000000..f7c8f9b3c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml @@ -0,0 +1,59 @@ +@{ + ViewBag.Title = "选修课课程"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      学年
      +
      +
      +
      +
      学期
      +
      +
      +
      +
      校区
      +
      +
      +
      +
      系部
      +
      +
      +
      +
      专业
      +
      +
      +
      +
      班级
      +
      +
      +
      +
      选课状态
      +
      +
      +
      +
      报名状态
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js new file mode 100644 index 000000000..a773bbc7e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js @@ -0,0 +1,218 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-05-15 10:33 + * 描 述：选修课课程 + */ +var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + if ($("#AcademicYearNo").lrselectGet() == "" || $("#AcademicYearNo").lrselectGet() == null || $("#AcademicYearNo").lrselectGet() == undefined) { + top.learun.alert.warning("请先选择学年！"); + return false; + } + if ($("#Semester").lrselectGet() == "" || $("#Semester").lrselectGet() == null || $("#Semester").lrselectGet() == undefined) { + top.learun.alert.warning("请先选择学期！"); + return; + } + page.search(queryJson); + }, 300, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学期", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' }); + $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' }); + $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, + { label: "学期", name: "Semester", width: 60, align: "left" }, + { + label: "校区", name: "F_SchoolId", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "选课状态", name: "Id", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == null || cellvalue == undefined || cellvalue == "") { + return '未报名'; + } else { + return '已报名'; + } + } + }, + { + label: "报名状态", name: "Status", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == 1) { + return '审核中'; + } else if (cellvalue == 2) { + return '报名成功'; + } else if (cellvalue == 3) { + return '报名失败'; + } else { + return '未报名'; + } + } + }, + { label: "所选课程号", name: "LessonNo", width: 100, align: "left" }, + { + label: "所选课程名称", name: "LessonName", width: 150, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + key: row.LessonNo, + keyId: 'lessonno', + callback: function (_data) { + callback(_data['lessonname']); + } + }); + } + }, + { label: "课程学分", name: "StudyScore", width: 100, align: "left" }, + { label: "教师编号", name: "EmpNo", width: 100, align: "left" }, + { + label: "教师姓名", name: "EmpName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: row.EmpNo, + keyId: 'empno', + callback: function (_data) { + callback(_data['empname']); + } + }); + } + }, + { + label: "上课节次", name: "LessonSection", width: 150, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue != "" && cellvalue != undefined && cellvalue != null) { + if (cellvalue.indexOf(',') == -1) { + return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; + } else { + return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; + } + } + } + }, + { label: "上课时间", name: "LessonTime", width: 180, align: "left" }, + { + label: "教室名称", name: "ClassRoomName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo', + key: row.ClassRoomNo, + keyId: 'classroomno', + callback: function (_data) { + callback(_data['classroomname']); + } + }); + } + }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + ], + mainId: 'StuId', + isPage: true, + sidx: 'StuNo', + sord: 'asc' + }); + }, + search: function (param) { + param = param || {}; + param.EmpNo = learun.clientdata.get(['userinfo']).enCode; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs index 50cb98846..ddb78929f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs @@ -1,4 +1,5 @@ -using Learun.Application.Form; +using System; +using Learun.Application.Form; using Learun.Util; using System.Collections.Generic; using System.Web.Mvc; @@ -331,12 +332,20 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers [ValidateInput(false)] public ActionResult SaveInstanceForms(string data) { - List list = data.ToObject>(); - foreach (var item in list) + try { - formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + List list = data.ToObject>(); + foreach (var item in list) + { + formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + } + return Success("保存成功！"); } - return Success("保存成功！"); + catch (Exception e) + { + return Fail("输入字段超过限定长度，请精简内容后再试。"); + } + } /// /// 删除自定义表单数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml index ce5fadf56..d85c010ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml @@ -64,7 +64,7 @@
      -
      请填写Sql语句*
      +
      条件筛选Sql语句*
      diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js index 883981420..4eefbb4dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js @@ -366,19 +366,18 @@ var bootstrap = function ($, learun) { $('#step-1').lrSetFormData(data.module); $('#F_FormId').lrselectSet(data.relation.F_FormId); - + $("#F_CloseDoSql").val(data.relation.F_CloseDoSql); var settingJson = JSON.parse(data.relation.F_SettingJson); $('[name="formOpenType"][value="' + settingJson.layer.opentype + '"]').attr('checked', 'checked'); $('#fromWidth').val(settingJson.layer.width); $('#fromHeight').val(settingJson.layer.height); - $('[name="queryDatetime"][value="' + settingJson.query.isDate + '"]').attr('checked', 'checked'); $('#queryDatetime').lrselectSet(settingJson.query.DateField); $('#queryWidth').val(settingJson.query.width); $('#queryHeight').val(settingJson.query.height); queryData = settingJson.query.fields; - console.log(queryData); + $('#query_girdtable').jfGridSet('refreshdata', queryData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js index 5bd0c94fa..49678ffae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js @@ -15,6 +15,7 @@ var relation; var mainTablePk = ""; var mainTable = ""; var mainCompontId = ""; +var sqlwhere = ""; var bootstrap = function ($, learun) { "use strict"; @@ -28,7 +29,7 @@ var bootstrap = function ($, learun) { relation = data.relation; settingJson = JSON.parse(data.relation.F_SettingJson); formScheme = JSON.parse(data.scheme.F_Scheme); - + sqlwhere = relation.F_CloseDoSql; for (var i = 0, l = formScheme.dbTable.length; i < l; i++) { var tabledata = formScheme.dbTable[i]; if (tabledata.relationName == "") { @@ -305,6 +306,9 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (!!sqlwhere) { + queryJson.sqlwhere = sqlwhere; + } param.queryJson = JSON.stringify(queryJson); $('#gridtable').jfGridSet('reload', param); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 090db1c3a..a66d6452e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -711,13 +711,13 @@ var bootstrap = function ($, learun) { signUrl: signUrl, stamp: stamp }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { - learun.loading(false); - if (_data) { - learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); - learun.frameTab.close(tabIframeId); - } - }); + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { + learun.loading(false); + if (_data) { + learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close(tabIframeId); + } + }); }); }); } @@ -1721,14 +1721,18 @@ var bootstrap = function ($, learun) { formData[_item.field] = processId; point.formData = JSON.stringify(formData); formDataList.push(point); - - _item.isUpdate = true; + //liangkun 修复第一次保存失败报错后第二次直接会update + //_item.isUpdate = true; } }); if (formDataList.length > 0) { $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForms', { data: JSON.stringify(formDataList) }, function (res) { if (res.code == 200) { + //liangkun 修复第一次保存失败报错后第二次直接会update + $.each(nwfForms, function (_index, _item) { + _item.isUpdate = true; + }); monitorSave(); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml index dac19e036..2adefd6c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml @@ -8,9 +8,9 @@
      • 登录日志
        • -
      • 访问日志
        • -
      • 操作日志
        • -
      • 异常日志
        • +
      • 访问日志
        • +
      • 操作日志
        • +
      • 异常日志
      @@ -23,10 +23,22 @@
      - -
      -
      -  查询 +
      +
      +
      +
      操作用户
      + +
      +
      +
      系统功能
      + +
      +
      +
      操作类型
      + +
      +
      +
      diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js index f0b8e0869..f89f0c26f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js @@ -51,10 +51,9 @@ var bootstrap = function ($, learun) { }); }); // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs new file mode 100644 index 000000000..043d4af3e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs @@ -0,0 +1,141 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleController : MvcControllerBase + { + private Acc_DormitoryRuleIBLL acc_DormitoryRuleIBLL = new Acc_DormitoryRuleBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = acc_DormitoryRuleIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Acc_DormitoryRuleData = acc_DormitoryRuleIBLL.GetAcc_DormitoryRuleEntity(keyValue); + var jsonData = new + { + Acc_DormitoryRule = Acc_DormitoryRuleData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + acc_DormitoryRuleIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Acc_DormitoryRuleEntity entity = strEntity.ToObject(); + DateTime time; + bool flag = DateTime.TryParse(entity.LateReturnTime, out time); + if (!flag) + { + return Fail("晚归时间格式不正确！"); + } + + if (!(entity.PushHour >= 0 && entity.PushHour <= 23)) + { + return Fail("推送时间点填写不正确！"); + } + + var model = acc_DormitoryRuleIBLL.GetEnableEntity(); + if (entity.IsEnable == 1) + { + if (string.IsNullOrEmpty(keyValue) && model != null) + { + return Fail("只能有一个启用的规则！"); + } + else if (!string.IsNullOrEmpty(keyValue) && model != null && model.Id != keyValue) + { + return Fail("只能有一个启用的规则！"); + } + } + acc_DormitoryRuleIBLL.SaveEntity(keyValue, entity); + + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs index 94c336d32..24e3ad8cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs @@ -7,6 +7,7 @@ using System.Web.Helpers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; +using System.Linq; namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { @@ -32,26 +33,31 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { return View(); } - ///// - ///// 表单页 - ///// - ///// - //[HttpGet] - //public ActionResult Form() - //{ - // return View(); - //} + /// + /// 分配宿舍 + /// + /// + [HttpGet] + public ActionResult IndexDistribution() + { + return View(); + } /// /// 带参数的表单页 /// /// [HttpGet] - public ActionResult Form(string ParentID = null, string ParentName = null) + public ActionResult Form(string ParentID = null, string ParentName = null, string keyValue = null) { ViewBag.ParentID = ParentID; ViewBag.ParentName = ParentName; ViewBag.BuildType = accommodationIBLL.GetBuildType(ParentID); + if (!string.IsNullOrEmpty(keyValue)) + { + ViewBag.BuildType = accommodationIBLL.GetParentBuildType(keyValue); + } + return View(); } @@ -137,9 +143,70 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return View(); } + /// + /// 分配系 + /// + /// + [HttpGet] + public ActionResult FormDept() + { + return View(); + } - - + /// + /// 分配专业和班级 + /// + /// + [HttpGet] + public ActionResult FormClass() + { + return View(); + } + /// + /// 分配宿舍 + /// + /// + [HttpGet] + public ActionResult FormRoom() + { + return View(); + } + /// + /// 床位管理 + /// + /// + [HttpGet] + public ActionResult IndexBed() + { + return View(); + } + /// + /// 床位管理 + /// + /// + [HttpGet] + public ActionResult FormBed() + { + return View(); + } + /// + /// 分类管理 + /// + /// + [HttpGet] + public ActionResult FormClassify() + { + return View(); + } + /// + /// 分类管理 + /// + /// + [HttpGet] + public ActionResult IndexClassify() + { + return View(); + } #endregion @@ -167,6 +234,38 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success(jsonData); } + /// + /// 获取床位数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetBedListByRoomId(string RoomId) + { + var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo); + return Success(data); + } + /// + /// 获取分类数据 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassifyList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = accommodationIBLL.GetClassifyList(paginationobj, queryJson).OrderBy(x => x.DNo); + //var jsonData = new + //{ + // rows = data, + // total = paginationobj.total, + // page = paginationobj.page, + // records = paginationobj.records + //}; + return Success(data); + } /// /// 获取宿舍楼数据 @@ -269,6 +368,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers var data = accommodationIBLL.GetTreeNew(); return Success(data); } + /// + /// 获取上级树形数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassifyTree() + { + var data = accommodationIBLL.GetClassifyTree(); + return Success(data); + } + + #endregion #region 提交数据 @@ -286,6 +398,18 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success("删除成功！"); } /// + /// 删除 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteBed(string keyValue, string ParentID) + { + accommodationIBLL.DeleteBed(keyValue, ParentID); + return Success("删除成功！"); + } + /// /// 保存实体数据（新增、修改） /// 主键 /// @@ -299,7 +423,54 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers accommodationIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) + { + Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); + return Success("保存成功！"); + } + /// + /// 寝室分配系 + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveDeptClass(string keyValue, string strEntity, int type) + { + Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + accommodationIBLL.SaveDeptClass(keyValue, entity, type); + return Success("保存成功！"); + } + + /// + /// 寝室分配床位 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveRoom(string RoomId, List list) + { + //List list = strEntity.ToObject>(); + string res = accommodationIBLL.SaveRoom(RoomId, list); + if (!string.IsNullOrEmpty(res)) + { + return Fail(res); + } + + return Success("保存成功！"); + } /// /// 学生宿舍的单元、楼层、房间、床位添加 @@ -312,11 +483,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult DormitoryAdd(string keyValue, string strEntity) { - //dynamic entity = JsonConvert.DeserializeObject(strEntity); - //var ElementNum = entity.ElementNum; - //var FloorNum = entity.FloorNum; - //var RoomNum = entity.RoomNUm; - //var BedNum = entity.BedNum; JObject jsonEntity = JObject.Parse(strEntity); var elementNum = int.Parse(jsonEntity["ElementNum"].ToString()); @@ -344,7 +510,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers } - + /// /// 同步宿舍信息数据 /// @@ -353,10 +519,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { accommodationIBLL.SyncData(); return Success("同步成功"); - - } - //public ActionResult DormitoryAdd(string a,string ) #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs new file mode 100644 index 000000000..10d1f7135 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs @@ -0,0 +1,245 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System.Linq; +using System; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnController : MvcControllerBase + { + private DormitoryReturnIBLL dormitoryReturnIBLL = new DormitoryReturnBLL(); + private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormOut() + { + return View(); + } + + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormReturn() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult IndexReport() + { + return View(); + } + + #endregion + + #region 获取数据 + /// + /// 获取左侧树形数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetTree() + { + var data = dormitoryReturnIBLL.GetTree(); + return Success(data); + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = dormitoryReturnIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Acc_DormitoryReturnData = dormitoryReturnIBLL.GetAcc_DormitoryReturnEntity(keyValue); + var jsonData = new + { + Acc_DormitoryReturn = Acc_DormitoryReturnData, + }; + return Success(jsonData); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetDept() + { + var data = accommodationIBLL.GetDept(); + + return Success(data); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetMajor(string strWhere) + { + var data = accommodationIBLL.GetMajor(strWhere); + + return Success(data); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetClass(string strWhere) + { + var data = accommodationIBLL.GetClass(strWhere); + + return Success(data); + } + + [HttpGet] + public ActionResult GetReportList(string queryJson) + { + List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); + var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); + List list2 = new List(); + foreach (var item in list) + { + var name = item.Key == 1 ? "已归宿" : "未归宿"; + list2.Add(new { name = name, value = item.num }); + + } + return JsonResult(list2); + } + + /// + /// + /// + /// + public ActionResult GetReportData(string queryJson) + { + List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); + var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); + List list2 = new List(); + List list1 = new List(); + foreach (var item in list) + { + var name = item.Key == 1 ? "已归宿" : "未归宿"; + list2.Add(new { name = name, value = item.num }); + list1.Add(name); + + } + return Success(new { list1, list2 }); + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + dormitoryReturnIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveData(string keyValue, string strEntity) + { + Acc_DormitoryReturnEntity entity = strEntity.ToObject(); + dormitoryReturnIBLL.SaveData(keyValue, entity); + + return Success("保存成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string type, string strEntity) + { + Acc_DormitoryReturnEntity entity = strEntity.ToObject(); + dormitoryReturnIBLL.SaveEntity(type, entity); + + return Success("保存成功！"); + } + + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml new file mode 100644 index 000000000..100ee31f8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍晚归规则"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
      +
      +
      晚归时间*
      + +
      +
      +
      推送人*
      +
      +
      +
      +
      推送班主任*
      +
      +
      +
      +
      推送时间点*
      + +
      +
      +
      启用*
      +
      +
      +
      +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js new file mode 100644 index 000000000..2dab9f792 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js @@ -0,0 +1,62 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-03-14 12:05 + * 描 述：宿舍晚归规则 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#PushUser').lrDataSourceSelect({ + code: 'teacheruserdata', value: 'f_userid', text: 'f_realname', type: 'multiple' + }); + + $('#ClassDiredctor').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#IsEnable').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml new file mode 100644 index 000000000..ebbd5409c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍晚归规则"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +  新增 +  编辑 +  删除 +  打印 +
      +
      +
      +
      +
      +
      +
      +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js new file mode 100644 index 000000000..4b81ce7c9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js @@ -0,0 +1,139 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-03-14 12:05 + * 描 述：宿舍晚归规则 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetPageList', + headData: [ + { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" }, + { + label: "推送人", name: "PushUser", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + if (value.indexOf(',') != -1) { + var content = ''; + var timearr = value.split(','); + for (var i = 0; i < timearr.length; i++) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: timearr[i], + keyId: 'f_userid', + callback: function (_data) { + content += _data['f_realname']; + } + }); + } + content = content.substring(0, content.length - 1); + callback(content); + } else { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + } + }, + { + label: "推送班主任", name: "ClassDiredctor", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "推送时间点", name: "PushHour", width: 100, align: "left" }, + { + label: "启用", name: "IsEnable", width: 100, align: "left", + formatter: function (cellvalue, rowObject) { + return cellvalue == 1 ? "" : ""; + } + + }, + ], + mainId: 'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml index 76b48d7ef..a6de56ca7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml @@ -58,11 +58,7 @@
      {{dormitoryName}}{{unitName}}
      @@ -76,7 +72,9 @@
      -
      {{floor.dormitory.Name}}
      {{floor.dormitory.Sex | filter_sex}}
      +
      {{floor.dormitory.Name}} + @*
      {{floor.dormitory.Sex | filter_sex}}
      *@ +
      {{floor.RoomNum}}间 {{floor.BedNum}}床
      @@ -344,7 +342,7 @@ }, addFloor: function () { var url = ""; - url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.unitID + '&ParentName=' + this.unitName; + url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?ParentID=' + this.unitID + '&ParentName=' + this.unitName; top.learun.layerForm({ id: 'form', title: '新增', @@ -361,7 +359,7 @@ top.learun.layerForm({ id: 'form', title: '编辑', - url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id, + url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id, width: 600, height: 400, callBack: function (id) { @@ -393,7 +391,7 @@ '
      ' + '
      ' + this.dormitoryName + '  ' + this.unitName + '
      ' + '
      ' + floor.dormitory.Name + - this.filter_sex(floor.dormitory.Sex) + + '' + this.filter_sex(floor.dormitory.Sex) + '' + '
      ' + '
      ' + '
      负 责 人' + floor.dormitory.Functionary + '
      负责人电话' + floor.dormitory.Phone + '
      ' + @@ -403,14 +401,14 @@ '
      ' + '
      ' + '
        ' + - '
      • 编     号' + floor.dormitory.Name + '
        • ' + - '
      • 价     格' + floor.dormitory.Price + ' 元
        • ' + + '
      • 编     号' + floor.dormitory.DNo + '
        • ' + + '
      • 价     格' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' 元
        • ' + '
      • 房     间' + floor.RoomNum + ' 间
        • ' + '
      • 入     住' + floor.HasStudentNum + ' 人
        • ' + '
      • 空     床' + floor.NoStudentNum + ' 床
        • ' + '
      • 床     位' + floor.BedNum + ' 个
        • ' + - '
      • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
        • ' + - '
      • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
        • ' + + //'
      • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
        • ' + + //'
      • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
        • ' + '
      ' + '
      ' + //'' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml index b9a5635ac..b85a292ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml @@ -62,11 +62,7 @@
      @@ -118,155 +114,6 @@ +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js new file mode 100644 index 000000000..7f8aec873 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js @@ -0,0 +1,131 @@ +var bootstrap = function ($, learun) { + "use strict"; + var year = ""; + var page = { + init: function () { + page.bind(); + page.initGrid(); + page.initChart(); + }, + bind: function () { + $('#Dept').lrselect({ + width: '150px', + placeholder: "请选择系部", + allowSearch: true, + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetDept', + value: 'Dept', + text: 'DeptName', + select: function (item) { + if (item) { + $('#Major').lrselectRefresh({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', + param: { strWhere: "m.deptno='" + item.Dept + "'" } + }); + $('#Class').lrselectRefresh({ + //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', + //param: { strWhere: "c.majorno=''" } + }); + } + } + }); + $('#Major').lrselect({ + width: '150px', + placeholder: "请选择专业", + allowSearch: true, + //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', + value: 'Major', + text: 'MajorName', + select: function (item) { + if (item) { + $('#Class').lrselectRefresh({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', + param: { strWhere: "c.majorno='" + item.Major + "'" } + }); + } + } + }); + $('#Class').lrselect({ + width: '150px', + placeholder: "请选择班级", + allowSearch: true, + value: 'Class', + text: 'ClassName' + }); + + //查询 + $('#btn_Search').on('click', function () { + page.search({ Dept: $('#Dept').lrselectGet(), Major: $('#Major').lrselectGet(), Class: $('#Class').lrselectGet() }); + }); + + }, + initGrid: function () { + $(".lr-layout-grid").height($(window).height() - 110); + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportList', + headData: [ + { name: "name", label: "状态", width: 100, align: "center" }, + { name: "value", label: "人数", width: 150, align: "center" } + + ] + }); + page.search(); + }, + initChart: function (queryJson) { + var myChart1 = echarts.init(document.getElementById('main')); + //var myChart2 = echarts.init(document.getElementById('main1')); + queryJson = { + Dept: $('#Dept').lrselectGet(), + Major: $('#Major').lrselectGet(), + Class: $('#Class').lrselectGet() + }; + //console.log('queryJson', queryJson); + learun.httpAsyncPost(top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportData', { queryJson: JSON.stringify(queryJson) }, function (res) { + if (res.code == 200) { + var option = { + title: { + text: '学生归宿统计', + x: 'center' + }, + tooltip: { + trigger: 'item', + formatter: "{a}
      {b} : {c} ({d}%)" + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.list1 + }, + series: [ + { + name: '学生归宿', + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: res.data.list2, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + + myChart1.setOption(option); + + } + }); + + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + page.initChart(param); + } + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs index 2b26e1d62..93f48ee5d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs @@ -85,6 +85,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return View(); } /// + /// 班级课程表【教务】 + /// + /// + [HttpGet] + public ActionResult ClassIndexInEducation() + { + return View(); + } + /// /// 课程表【教学调度】 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml new file mode 100644 index 000000000..4a794077d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml @@ -0,0 +1,159 @@ +@{ + ViewBag.Title = "班级课程表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      + 查询 +
      + +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
        +
      • 节次/星期
        • +
      • 星期一
        • +
      • 星期二
        • +
      • 星期三
        • +
      • 星期四
        • +
      • 星期五
        • +
      • 星期六
        • +
      • 星期日
        • +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js") + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js new file mode 100644 index 000000000..472359edf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js @@ -0,0 +1,202 @@ +var refreshGirdData; +var bootstrap = function ($, learun) { + var startTime; + var endTime; + var page = { + init: function () { + page.bind(); + page.bindSelect(); + }, + loadData: function (param) { + $.lrSetFormWithParam(top.$.rootUrl + '/PersonnelManagement/TimeTable/GetDataInEducation', param, + function (data) { + // 数据处理 + var html = ''; + var weekLists = data.weekList; + for (var i = 1; i < 11; i++) { + (function (arg) { + var args = arg - 1; + var datas = flogs(arg, weekLists, 'time'); + html += ' ' + arg + '节'; + if (datas) { + var lists = datas.list; + html += tdHandles(lists); + } else { + html += tdHandle(arg); + } + html += ''; + })(i); //调用时参数 + } + $('.personT').text(data.schoolName); + $('.perSemester').text(data.semester); + $('.perFestivalsBox table').html(html); + + function flogs(num, data, obj) { + var flog = false; + $.each(data, + function (i, n) { + if (n[obj] == num) { + flog = n; + return; + } + }) + return flog; + } + function flogs2(num, data, obj) { + var arr = new Array(); + $.each(data, + function (i, n) { + if (n[obj] == num) { + arr.push(n); + } + }) + return arr; + } + + //某节课空 + function tdHandle() { + var html = ''; + for (var j = 0; j < 7; j++) { + html += '
      '; + } + return html; + } + + //某节课不空 + function tdHandles(lists) { + var html = ''; + for (var k = 1; k < 8; k++) { + (function (arg) { + var args = arg - 1; + var datas = flogs2(arg, lists, 'day'); + if (datas.length > 0) { + html += ''; + $.each(datas, function (i, item) { + if (i > 0) { + html += '
      '; + } + html += '
      课程：' + + item.curriculum + + '
      ' + + '
      教师：' + + item.teacher + + '
      ' + + '
      班级：' + + item.className + + '
      ' + + '
      教室：' + + item.classRoom + + '
      '; + }); + html += ''; + + } else { + html += '
      '; + } + + })(k); + } + return html; + } + }); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + $('#datesearch').lrdate({ + dfdata: [ + { + name: '上周', + begin: function () { return learun.getTime(7); }, + end: function () { + return learun.getTime(1); + } + }, + { + name: '本周', + begin: function () { return learun.getTime(0); }, + end: function () { + return learun.getTime(-6); + } + }, + { + name: '下周', + begin: function () { return learun.getTime(-7); }, + end: function () { + return learun.getTime(-13); + } + }], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: 'currentWeek', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + //查询 + $('#lr_search').on('click', function () { + var p = {}; + p.schoolId = $('#F_SchoolId').lrselectGet(); + p.ClassNo = $('#ClassNo').lrselectGet(); + page.search(p); + }); + }, + bindSelect: function () { + //校区 + $('#F_SchoolId').lrDataSourceSelect({ + code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { + if (!!item) { + // 班级 + $('#ClassNo').lrselectRefresh({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + param: { schoolId: item.f_companyid }, + value: 'value', + text: 'text' + }); + } else { + //班级 + $('#ClassNo').lrselectRefresh({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + param: { schoolId: "" }, + value: 'value', + text: 'text' + }); + } + } + }); + //班级 + $('#ClassNo').lrselect({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + value: 'value', + text: 'text' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + page.loadData(param); + } + }; + page.init(); +}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index 4c8044023..06b7dfc2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -557,6 +557,11 @@ namespace Learun.Application.Web.Controllers { return Success(new { pwd = true }); } + //每月1号强制用户修改密码 + if (DateTime.Now.Day == 1 && up == "false") + { + return Success(new { pwd = true }); + } //是否30天未修改密码验证 //获取开关显示配置中“30天未修改密码登录后提示修改”项的配置 if (teachSwitchIBLL.FindFirst("modifypwdtip")) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 22cc7ede4..50fc8bfa3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -822,6 +822,10 @@ + + + + @@ -6436,6 +6440,22 @@ + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js index 9e0bbba79..f6370ac69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js @@ -35,6 +35,7 @@ var bootstrap = function ($, learun) { } if ($this.val() != $('#NewPwd').val()) { learun.alert.error("两次密码输入不一样"); + return false; } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js index e78391a95..767cc70ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js @@ -2203,6 +2203,7 @@ dfop.rows = 1000000; data = data || dfop.param || {}; dfop.param = data.param || data; + dfop.running.pageparam.page = 1; _jfgrid.reload($self, dfop); break; case 'refresh': diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js index a617e48ef..d3bd95e31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js @@ -61,6 +61,12 @@ callBack: function (id) { return top[id].acceptClick(); }, + end: function () { + if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) { + learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30; + learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload'); + } + }, btn: ['导出Excel', '关闭'] }); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index f542e9f12..469130f66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -34,6 +34,7 @@ + @@ -78,6 +79,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 9592e4aee..2aaaf7c6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -143,9 +143,9 @@ - + - + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index a5634307c..13908fea8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -212,6 +212,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs new file mode 100644 index 000000000..08c563989 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using Learun.Util; +using Nancy; +using Newtonsoft.Json; + +namespace Learun.Application.WebApi.Modules +{ + public class StuScoreApi : BaseNoLoginApi + { + public StuScoreApi() + : base("/Learun/adms/EducationalAdministration/StuScore") + { + Get["/scoreListByStuInfo"] = GetScoreListByStuInfo; + + } + + private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); + private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); + private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); + private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); + + /// + /// 全院学生成绩查看-打印成绩单 + /// + /// + /// + private Response GetScoreListByStuInfo(dynamic _) + { + var param = this.GetReq(); + + ScoreListByStuInfo result = new ScoreListByStuInfo(); + + var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(param.StuNo); + if (stuInfoBasicEntity != null) + { + result.StuNo = stuInfoBasicEntity.StuNo; + result.StuName = stuInfoBasicEntity.StuName; + result.MajorNo = stuInfoBasicEntity.MajorNo; + result.ClassNo = stuInfoBasicEntity.ClassNo; + if (!string.IsNullOrEmpty(stuInfoBasicEntity.MajorNo)) + { + result.MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo)?.MajorName; + } + if (!string.IsNullOrEmpty(stuInfoBasicEntity.ClassNo)) + { + result.ClassName = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo)?.ClassName; + } + } + var queryJson = JsonConvert.SerializeObject(param); + + var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); + var dataTemp = data.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new ScoreList() + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + StuScoreEntityList = x.Select(y => new StuScoreModel() + { + AcademicYearNo = y.AcademicYearNo, + Semester = y.Semester, + LessonSortNo = y.LessonSortNo, + LessonSortName = y.LessonSortName, + LessonNo = y.LessonNo, + LessonName = y.LessonName, + StudyScore = y.StudyScore, + Score = y.Score, + ScoreOfNotPass = y.ScoreOfNotPass, + ScoreOfNotPassTwo = y.ScoreOfNotPassTwo + }).OrderBy(a=>a.LessonSortNo).ThenBy(a=>a.LessonNo).ToList() + }).ToList().OrderByDescending(x=>x.AcademicYearNo).ThenByDescending(x=>x.Semester); + result.ScoreList = dataTemp.ToList(); + + return Success(result); + + } + + public class Model + { + /// + /// 学年（18-19） + /// + public string AcademicYearNo { get; set; } + /// + /// 学期（1） + /// + public string Semester { get; set; } + /// + /// 学号 + /// + public string StuNo { get; set; } + + } + public class ScoreListByStuInfo { + public string StuNo { get; set; } + public string StuName { get; set; } + public string MajorNo { get; set; } + public string MajorName { get; set; } + public string ClassNo { get; set; } + public string ClassName { get; set; } + public List ScoreList { get; set; } + } + public class ScoreList { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public List StuScoreEntityList { get; set; } + } + public class StuScoreModel { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + /// + /// 课程类别码 + /// + public string LessonSortNo { get; set; } + /// + /// 课程类别名称 + /// + public string LessonSortName { get; set; } + public string LessonNo { get; set; } + public string LessonName { get; set; } + /// + /// 学分 + /// + public decimal? StudyScore { get; set; } + /// + /// 成绩 + /// + public decimal? Score { get; set; } + /// + /// 第一次补考成绩 + /// + public string ScoreOfNotPass { get; set; } + /// + /// 第二次补考成绩 + /// + public string ScoreOfNotPassTwo { get; set; } + + } + + } +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 65df96b5e..457e01c62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -13,7 +13,7 @@ using Nancy; namespace Learun.Application.WebApi.Modules { - public class TimeTable : BaseApi + public class TimeTable : BaseNoLoginApi { public TimeTable() : base("/learun/adms/timetable") @@ -21,6 +21,7 @@ namespace Learun.Application.WebApi.Modules Get["/list"] = GetList; Get["/StuList"] = GetStuInfo; Get["/StuLessonInfo"] = GetStuLessonInfo; + Get["/timeTableData"] = GetTimeTableData; } private ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL(); private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL(); @@ -111,6 +112,68 @@ namespace Learun.Application.WebApi.Modules } + + /// + /// 全院课程表【按班级分组】 + /// + /// + /// + private Response GetTimeTableData(dynamic _) + { + var param = this.GetReq(); + + TimeTableData result = new TimeTableData(); + + //开始时间 + var startdate = string.IsNullOrEmpty(param.StartDate) ? DateTime.Today : Convert.ToDateTime(param.StartDate); + var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd"); + var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd"); + result.StartDate = startDate; + result.EndDate = endDate; + + var semesterAndYear = Common.GetSemesterAndYear(startDate); + result.AcademicYearNo = semesterAndYear.AcademicYearLong; + result.Semester = semesterAndYear.Semester; + + //课程表数据 + var timeTableList = new List(); + //必修课课程表 + var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + timeTableList.AddRange(data); + //选修课课程表 + var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + timeTableList.AddRange(dataOfElective); + var dataTemp = timeTableList.GroupBy(x => new { x.TeachClassNo, x.ClassName, x.LessonSortNo }).Select(x => new ClassDataList() + { + ClassNo = x.Key.TeachClassNo, + ClassName = x.Key.ClassName, + LessonSortNo = x.Key.LessonSortNo, + TimeTableList = x.Select(y => new TwoDevelopment.EducationalAdministration.TimeTable() + { + AcademicYear = y.AcademicYear, + Semester = y.Semester, + DeptNo = y.DeptNo, + MajorNo = y.MajorNo, + F_SchoolId = y.F_SchoolId, + LessonNo = y.LessonNo, + LessonName = y.LessonName, + LessonDate = y.LessonDate, + LessonTime = y.LessonTime, + EmpNo = y.EmpNo, + EmpName = y.EmpName, + TeachClassNo = y.TeachClassNo, + ClassName = y.ClassName, + ClassRoomNo = y.ClassRoomNo, + ClassroomName = y.ClassroomName, + LessonSortNo = y.LessonSortNo + }).OrderBy(a => a.LessonTime.Substring(0, 1)).ThenBy(a => a.LessonTime.Substring(1)).ToList() + }).OrderBy(x => x.LessonSortNo).ThenBy(x => x.ClassNo).ToList(); + + result.ClassDataList = dataTemp; + + return Success(result); + + } /// /// 数字转中文 @@ -166,6 +229,30 @@ namespace Learun.Application.WebApi.Modules { public string StartDate { get; set; } public string EndDate { get; set; } + /// + /// 班级编号 + /// + public string ClassNo { get; set; } + /// + /// 教师编号 + /// + public string EmpNo { get; set; } } + public class TimeTableData + { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public string StartDate { get; set; } + public string EndDate { get; set; } + public List ClassDataList { get; set; } + } + public class ClassDataList + { + public string ClassNo { get; set; } + public string ClassName { get; set; } + public string LessonSortNo { get; set; } + public List TimeTableList { get; set; } + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs index 4d9dec5ce..a6ac7efe5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs @@ -514,9 +514,9 @@ namespace Learun.Application.Base.AuthorizeModule case 8: // ѧϵ { var empinfo = dataAuthorizeService.GetEmpInfoEntityByNo(userInfo.account); - if (empinfo != null&&!string.IsNullOrEmpty(empinfo.DeptNo)) + if (empinfo != null&&empinfo.Rows.Count>0&&empinfo.Rows[0]["DeptNo"]!=null) { - text = empinfo.DeptNo; + text = empinfo.Rows[0]["DeptNo"].ToString(); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs index 3c3870537..a96feced9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs @@ -2,6 +2,7 @@ using Learun.DataBase.Repository; using Learun.Util; using System; using System.Collections.Generic; +using System.Data; using System.Text; namespace Learun.Application.Base.AuthorizeModule @@ -265,11 +266,11 @@ namespace Learun.Application.Base.AuthorizeModule #endregion - public dynamic GetEmpInfoEntityByNo(string keyValue) + public DataTable GetEmpInfoEntityByNo(string keyValue) { try { - return this.BaseRepository("CollegeMIS").FindEntity("select * from EmpInfo where EmpNo='"+keyValue+"'"); + return this.BaseRepository("CollegeMIS").FindTable("select * from EmpInfo where EmpNo='"+keyValue+"'"); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs index 1e3296b7e..1948b9075 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs @@ -902,6 +902,11 @@ namespace Learun.Application.Form queryParamTemp.Add("lrend", queryParam["lrend"].ToDate()); querySql += " AND (" + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " >=@lrbegin AND " + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " <=@lrend ) "; } + //自定义sql查询条件 + else if (queryParam != null && !queryParam["sqlwhere"].IsEmpty()) + { + querySql += " "+ queryParam["sqlwhere"].ToString(); + } else if (queryParam != null) // 复合条件查询 { @@ -932,7 +937,7 @@ namespace Learun.Application.Form { queryParam.Add(item.Key, item.Value); } - + return querySql; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs new file mode 100644 index 000000000..9eeeea5b6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanMap : EntityTypeConfiguration + { + public Exam_ExamPlanMap() + { + #region 表、主键 + //表 + this.ToTable("EXAM_EXAMPLAN"); + //主键 + this.HasKey(t => t.EPId); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 412f8b965..4e681e02f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -103,6 +103,8 @@ + + @@ -561,6 +563,16 @@ + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs new file mode 100644 index 000000000..912286693 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class Acc_DormitoryReturnMap : EntityTypeConfiguration + { + public Acc_DormitoryReturnMap() + { + #region 表、主键 + //表 + this.ToTable("ACC_DORMITORYRETURN"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs new file mode 100644 index 000000000..f56e03bcd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleMap : EntityTypeConfiguration + { + public Acc_DormitoryRuleMap() + { + #region 表、主键 + //表 + this.ToTable("ACC_DORMITORYRULE"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + 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 058d33054..12e74d8e0 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 @@ -74,15 +74,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { //参考写法 - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(fieldSql); - strSql.Append(" FROM ArrangeLessonTerm t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + strSql.Append(" FROM ArrangeLessonTerm t where 1=1 "); + + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.DeptNo = @DeptNo "); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); + strSql.Append(" AND t.MajorNo = @MajorNo "); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); + strSql.Append(" AND t.LessonNo = @LessonNo "); + } + if (!queryParam["TeachClassNo"].IsEmpty()) + { + dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String); + strSql.Append(" AND t.TeachClassNo like @TeachClassNo "); + } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); + strSql.Append(" AND t.EmpNo = @EmpNo "); + } + if (!queryParam["ClassroomNo"].IsEmpty()) + { + dp.Add("ClassroomNo", queryParam["ClassroomNo"].ToString(), DbType.String); + strSql.Append(" AND t.ClassroomNo = @ClassroomNo "); + } + + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); } catch (Exception ex) { @@ -684,7 +726,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest 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` - WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); + WHERE 1=1 AND c.number IS NOT NULL AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); if (LessonList.Count() > 0) { @@ -758,7 +800,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_curriculum curriculum ON curriculum.id = a.curriculum LEFT JOIN tb_classroom room ON room.id = a.classroom LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher - WHERE semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); + WHERE a.type='1' and semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync(@"SELECT * FROM TeachClass WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); @@ -847,7 +889,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_course cour ON cour.id= p.`course` LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester - + "' AND sc.sid = '" + entity.F_SchoolId + "' ORDER BY p.`major` "); + + "' AND sc.sid = '" + entity.F_SchoolId + "' AND curr.`ification` ='1' ORDER BY p.`major` "); var majorData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); var lessonData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); 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/ElectiveMajor/ElectiveMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs index 4152e37ad..106cc3bd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs @@ -4,6 +4,7 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Text; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -261,18 +262,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var now = DateTime.Now; var loginInfo = LoginUserInfo.Get(); + var list = db.FindList(x => x.OLPOEId == olpoeId); //添加 foreach (var item in dataList) { - var entity = new ElectiveMajorEntity(); - entity.Create(); - entity.OLPOEId = olpoeId; - entity.MajorId = item.ID; - entity.Grade = item.Grade; - entity.CreateUserId = loginInfo.userId; - entity.CreateUserName = loginInfo.realName; - entity.CreateDate = now; - db.Insert(entity); + //判断是否已选 + if (list.Where(x => x.MajorId == item.ID).Count() <= 0) + { + var entity = new ElectiveMajorEntity(); + entity.Create(); + entity.OLPOEId = olpoeId; + entity.MajorId = item.ID; + entity.Grade = item.Grade; + entity.CreateUserId = loginInfo.userId; + entity.CreateUserName = loginInfo.realName; + entity.CreateDate = now; + db.Insert(entity); + } } db.Commit(); } 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/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index def26cb76..0e1492ada 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -792,10 +792,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - //if (!string.IsNullOrEmpty(entity.DeptNo)) - //{ - // model.DeptNo = entity.DeptNo; - //} + if (!string.IsNullOrEmpty(entity.DeptNo)) + { + model.DeptNo = entity.DeptNo; + } db.Update(model); } } @@ -814,10 +814,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - //if (!string.IsNullOrEmpty(entity.DeptNo)) - //{ - // model.DeptNo = entity.DeptNo; - //} + if (!string.IsNullOrEmpty(entity.DeptNo)) + { + model.DeptNo = entity.DeptNo; + } db.Update(model); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs new file mode 100644 index 000000000..8fd0c72b6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanBLL : Exam_ExamPlanIBLL + { + private Exam_ExamPlanService exam_ExamPlanService = new Exam_ExamPlanService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return exam_ExamPlanService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Exam_ExamPlan表实体数据 + /// + /// 主键 + /// + public Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue) + { + try + { + return exam_ExamPlanService.GetExam_ExamPlanEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + exam_ExamPlanService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Exam_ExamPlanEntity entity) + { + try + { + exam_ExamPlanService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs new file mode 100644 index 000000000..33f884d50 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanEntity + { + #region 实体成员 + /// + /// EPId + /// + [Column("EPID")] + public string EPId { get; set; } + /// + /// 学年 + /// + [Column("ACADEMICYEARNO")] + public string AcademicYearNo { get; set; } + /// + /// 学期 + /// + [Column("SEMESTER")] + public int? Semester { get; set; } + /// + /// 排考名称 + /// + [Column("PLANNAME")] + public string PlanName { get; set; } + /// + /// 排考类型 + /// + [Column("PLANTYPE")] + public string PlanType { get; set; } + /// + /// 排考编号 + /// + [Column("PLANCODE")] + public string PlanCode { get; set; } + /// + /// 排考总人数 + /// + [Column("EPSTUCOUNT")] + public int? EPStuCount { get; set; } + /// + /// 是否随机生成座位 + /// + [Column("EPRANDOM")] + public bool? EPRandom { get; set; } + /// + /// 是否已生成 + /// + [Column("EPGENARATE")] + public bool? EPGenarate { get; set; } + /// + /// 排序号 + /// + [Column("EPORDER")] + public int? EPOrder { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.EPId = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.EPId = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs new file mode 100644 index 000000000..2775b00cc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public interface Exam_ExamPlanIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Exam_ExamPlan表实体数据 + /// + /// 主键 + /// + Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Exam_ExamPlanEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs new file mode 100644 index 000000000..88bd8b7c0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs @@ -0,0 +1,188 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.EPId, + t.AcademicYearNo, + t.Semester, + t.PlanName, + t.PlanType, + t.PlanCode, + t.EPStuCount, + t.EPRandom, + t.EPGenarate, + t.EPOrder + "); + strSql.Append(" FROM Exam_ExamPlan t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo",queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester",queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + if (!queryParam["PlanName"].IsEmpty()) + { + dp.Add("PlanName", "%" + queryParam["PlanName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.PlanName Like @PlanName "); + } + if (!queryParam["PlanType"].IsEmpty()) + { + dp.Add("PlanType",queryParam["PlanType"].ToString(), DbType.String); + strSql.Append(" AND t.PlanType = @PlanType "); + } + if (!queryParam["PlanCode"].IsEmpty()) + { + dp.Add("PlanCode", "%" + queryParam["PlanCode"].ToString() + "%", DbType.String); + strSql.Append(" AND t.PlanCode Like @PlanCode "); + } + if (!queryParam["EPRandom"].IsEmpty()) + { + dp.Add("EPRandom",queryParam["EPRandom"].ToString(), DbType.String); + strSql.Append(" AND t.EPRandom = @EPRandom "); + } + if (!queryParam["EPGenarate"].IsEmpty()) + { + dp.Add("EPGenarate",queryParam["EPGenarate"].ToString(), DbType.String); + strSql.Append(" AND t.EPGenarate = @EPGenarate "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Exam_ExamPlan表实体数据 + /// + /// 主键 + /// + public Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t=>t.EPId == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, Exam_ExamPlanEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs index 2dd7f2d23..1bdfcc200 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs @@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetLessonByMajorNo(string majorNo) + { + try + { + return lessonInfoService.GetLessonByMajorNo(majorNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs index bb89e6e35..9e56b4fd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs @@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetLessonByMajorNo(string majorNo); /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 2bbbdb6c8..96e49ebe8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs @@ -100,6 +100,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetLessonByMajorNo(string majorNo) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.TeachMajorNo == majorNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + internal bool GetAny() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs index 3f3730287..c7b3e472e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs @@ -222,6 +222,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string LessonNo2 { get; set; } [NotMapped] public string EmpNo2 { get; set; } + [NotMapped] public string LessonTypeId { get; set; } + /// /// 选课专业列表 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index c2ec1f140..6e76ce297 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -100,9 +100,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1"); var strSql = new StringBuilder(); - strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id + strSql.Append(@"select b.*,leif.LessonTypeId,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo - left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo + left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo left join LessonInfo leif on b.LessonNo=leif.LessonNo where not exists ( "); //不显示与已选课程 相同课程名称相同教师的课程 strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id "); @@ -359,7 +359,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { list = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); } - + //选课专业 + var majorSql = + @"SELECT t.MajorName,t.MajorNo,a.* FROM ElectiveMajor a left join CdMajor t on a.majorid=t.id"; + var electiveMajorList = this.BaseRepository("CollegeMIS").FindList(majorSql); foreach (var item in list) { //模式二：正式选课 @@ -381,6 +384,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration item.StuNumPre = aaa.Where(x => x.Status == 2).Count(); + //选课专业 + item.ElectiveMajorList = electiveMajorList.Where(x => x.OLPOEId == item.Id).ToList(); } return list; @@ -415,14 +420,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EmId = db.FindEntity(x => x.OLPOEId == OLPEIdOne)?.EmId; var OLPEIdTwo = db.FindEntity(x => x.EmId == EmId && x.OLPOEId != OLPEIdOne).OLPOEId; var lessonInfoEntity = db.FindEntity(x => x.LessonNo == entity.AfterLessonNo); + //选修课开课计划 + db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdOne}' "); - db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdOne}' "); - db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); + //学生选课表 + db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where OLPEId='{OLPEIdOne}' "); db.ExecuteBySql($"update StuSelectLessonListOfElectivePre set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); - db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where EmId='{EmId}' "); - db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}' where EMId='{EmId}' "); - db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdTwo}' "); - db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); + //选修合班明细 + db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where EmId='{EmId}' "); + //合班合并结果 + db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}' where EMId='{EmId}' "); + //合班异动数据记录 + db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdTwo}' "); + //选修课程表 + db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); db.Commit(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs index 280180925..690b6a29c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs @@ -107,6 +107,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string EmpNo { get; set; } [NotMapped] public string ClassRoomNo { get; set; } + [NotMapped] + public string AfterLessonName { get; set; } + [NotMapped] + public string AfterEmpName { get; set; } + [NotMapped] + public string AfterClassRoomName { get; set; } #endregion } 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() { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs index 9fc249220..f311eb7a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs @@ -677,6 +677,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + public IEnumerable GetScoreListByStuInfo(string queryJson) + { + try + { + return stuScoreService.GetScoreListByStuInfo(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetStuGraduateInfo(string queryJson) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs index 5b3681e63..4be5477b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs @@ -388,11 +388,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// - /// 成绩格式化(补)(重) + /// 成绩格式化(补)(重)(选修) /// [NotMapped] public string ScoreFormat { get; set; } + /// + /// 补考成绩 + /// + [NotMapped] + public string ScoreOfNotPass { get; set; } + /// + /// 二次补考成绩 + /// + [NotMapped] + public string ScoreOfNotPassTwo { get; set; } + /// + /// 课程类别名称 + /// + /// + [NotMapped] + public string LessonSortName { get; set; } + /// + /// 专业名称 + /// + [NotMapped] + public string MajorName { get; set; } + /// + /// 专业排名 + /// + [NotMapped] + public int RankInMajor { get; set; } + /// + /// 班级排名 + /// + [NotMapped] + public int RankInClass { get; set; } + + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs index 1943c15b9..7e987896c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs @@ -182,6 +182,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetScoreListByStuNo(string queryJson); + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + IEnumerable GetScoreListByStuInfo(string queryJson); /// /// 获取个人成绩列表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index d80ecc687..c10ba0ced 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1839,7 +1839,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var strSql = new StringBuilder(); strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName "); strSql.Append(" ,case when bb.LessonSortNo='2' then bb.Score else (case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end) end as Score "); - strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score) else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); + strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score)+'(选修)' else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); strSql.Append(" from ( "); strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); @@ -1876,5 +1876,125 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad } } } + + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + public IEnumerable GetScoreListByStuInfo(string queryJson) + { + try + { + //参考写法 + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var tableName = "StuScore"; + if (!queryParam["TableName"].IsEmpty()) + { + tableName = queryParam["TableName"].ToString(); + } + var strSql = new StringBuilder(); + strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,bb.Score,sp.Score as ScoreOfNotPass,spt.Score as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); + strSql.Append(" from ( "); + strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); + strSql.Append(" where 1=1 and s.CheckMark='1' "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" and s.AcademicYearNo=@AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" and s.Semester=@Semester "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); + strSql.Append(" and s.StuNo=@StuNo "); + } + if (!queryParam["StuName"].IsEmpty()) + { + dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); + strSql.Append(" and s.StuName=@StuName "); + } + strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo ) as bb "); + strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); + strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); + strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); + strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' "); + strSql.Append(" left join CdMajor cm on bb.MajorNo= cm.MajorNo and cm.CheckMark='1' "); + strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' "); + + var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + + //计算专业排名，班级排名 + if (result.Any()) + { + var temp = result.GroupBy(x=>new { x.AcademicYearNo,x.Semester}).Select(x => new StuScoreEntity() + { + AcademicYearNo=x.Key.AcademicYearNo, + Semester=x.Key.Semester, + StuNo=x.FirstOrDefault().StuNo, + ClassNo=x.FirstOrDefault().ClassNo, + MajorNo=x.FirstOrDefault().MajorNo + }).ToList(); + if (temp.Any()) + { + foreach (var item in temp) + { + //专业排名 + var ml = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.MajorNo == item.MajorNo && x.CheckMark == "1"); + var mlGroup = ml.GroupBy(x => x.StuNo).Select(x => new + { + StuNo = x.Key, + TotalScore = x.Select(y => y.Score).Sum() + }).OrderByDescending(x => x.TotalScore); + if (mlGroup.Any()) + { + var rank = mlGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); + item.RankInMajor = rank + 1; + } + //班级排名 + var cl = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.ClassNo == item.ClassNo && x.CheckMark == "1"); + var clGroup = cl.GroupBy(x => x.StuNo).Select(x => new + { + StuNo = x.Key, + TotalScore = x.Select(y => y.Score).Sum() + }).OrderByDescending(x => x.TotalScore); + if (clGroup.Any()) + { + var rank = clGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); + item.RankInClass = rank + 1; + } + } + } + foreach (var ii in result) + { + ii.RankInMajor = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInMajor; + ii.RankInClass = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInClass; + } + + } + + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs index b083b6586..06edde13f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs @@ -65,6 +65,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + return stuScoreNotPassService.GetPageListForUnpass(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取实体数据 /// 主键 @@ -187,6 +206,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化补考成绩 + /// + public void InitScore() + { + try + { + stuScoreNotPassService.InitScore(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs index c937dc615..d5a83aac9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs @@ -328,5 +328,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion } + + public class NotPassEntity + { + public string stuno { get; set; } + public string stuname { get; set; } + public string LessonName { get; set; } + public string Grade { get; set; } + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public string classname { get; set; } + public string OrdinaryScore2 { get; set; } + public string TermEndScore2 { get; set; } + public string Score2 { get; set; } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs index 509b479e6..ad1e1472d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs @@ -26,6 +26,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取实体数据 /// 主键 @@ -61,6 +62,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void SaveEntity(string keyValue, StuScoreNotPassEntity entity); + void InitScore(); #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 464fdc255..501189f44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -163,6 +163,67 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) +else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) +else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) +else CONVERT(varchar,a.Score) end as Score2 "); + strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo "); + strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); + } + if (!queryParam["Semester"].IsEmpty()) + { + strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); + } + if (!queryParam["grade"].IsEmpty()) + { + strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); + } + if (!queryParam["ClassNo"].IsEmpty()) + { + strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); + } + + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取实体数据 /// 主键 @@ -342,6 +403,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化补考成绩 + /// + public void InitScore() + { + try + { + string sql = @"insert into StuScoreNotPass +(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, + TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) + select + NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', + '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' + from + ( + select a.* from +StuScore a +left join StuInfoBasic b on b.StuNo=a.StuNo +where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) +and a.StuNo not in ( +select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo +) +) as bb +order by bb.ScoreId"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs index d9169e806..fa7db1635 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs @@ -65,6 +65,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 二次补考名单查看 + /// + /// + /// + /// + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + return stuScoreNotPassTwoService.GetPageListForUnpass(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -164,6 +188,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化二次补考成绩 + /// + public void InitScore() + { + try + { + stuScoreNotPassTwoService.InitScore(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs index bf26394c2..fe3be3622 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs @@ -27,6 +27,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -57,6 +58,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void DeleteEntity(string keyValue); + void InitScore(); /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index e13506595..979fee09a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -249,6 +249,73 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 二次补考成绩查看 + /// + /// + /// + /// + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) +else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) +else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) +else CONVERT(varchar,a.Score) end as Score2 "); + strSql.Append(@" from StuScoreNotPass a left join StuInfoBasic b on b.StuNo=a.StuNo "); + strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); + } + if (!queryParam["Semester"].IsEmpty()) + { + strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); + } + if (!queryParam["grade"].IsEmpty()) + { + strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); + } + if (!queryParam["ClassNo"].IsEmpty()) + { + strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); + } + + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 @@ -310,10 +377,58 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + #endregion #region 扩展数据 + /// + /// 初始化二次补考成绩 + /// + public void InitScore() + { + try + { + string sql = @"insert into StuScoreNotPassTwo +(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, + TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) + select + NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', + '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' + from + ( + select a.* from +StuScoreNotPass a +left join StuInfoBasic b on b.StuNo=a.StuNo +where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) +and a.StuNo not in ( +select StuNo from StuScoreNotPassTwo p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo +) +) as bb +order by bb.ScoreId"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 学年下拉框信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs index 70f099fe1..d27073da4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs @@ -212,6 +212,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 扩展字段 [NotMapped] public string F_SchoolId { get; set; } + [NotMapped] public string LessonTypeId { get; set; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs index 1ff93c134..9bff6fd34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs @@ -29,8 +29,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.* "); - strSql.Append(" FROM StuSelectLessonListOfElective t "); + strSql.Append("SELECT t.*,leif.LessonTypeId "); + strSql.Append(" FROM StuSelectLessonListOfElective t left join LessonInfo leif on t.LessonNo=leif.LessonNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 187108297..3b7c60111 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -279,8 +279,16 @@ + + + + + + + + @@ -1695,34 +1703,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs new file mode 100644 index 000000000..491d215b1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs @@ -0,0 +1,148 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleBLL : Acc_DormitoryRuleIBLL + { + private Acc_DormitoryRuleService acc_DormitoryRuleService = new Acc_DormitoryRuleService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return acc_DormitoryRuleService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) + { + try + { + return acc_DormitoryRuleService.GetAcc_DormitoryRuleEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// + public Acc_DormitoryRuleEntity GetEnableEntity() + { + try + { + return acc_DormitoryRuleService.GetEnableEntity(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + acc_DormitoryRuleService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) + { + try + { + acc_DormitoryRuleService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs new file mode 100644 index 000000000..351f0e912 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 晚归时间 + /// + [Column("LATERETURNTIME")] + public string LateReturnTime { get; set; } + /// + /// 推送人员 + /// + [Column("PUSHUSER")] + public string PushUser { get; set; } + /// + /// 是否推送班主任 + /// + [Column("CLASSDIREDCTOR")] + public int? ClassDiredctor { get; set; } + /// + /// 推送时间点 + /// + [Column("PUSHHOUR")] + public int? PushHour { get; set; } + /// + /// 是否启用 + /// + [Column("ISENABLE")] + public int? IsEnable { get; set; } + /// + /// CreateTime + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// UpdateTime + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + /// + /// UpdateUserId + /// + [Column("UPDATEUSERID")] + public string UpdateUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs new file mode 100644 index 000000000..22b52a86d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs @@ -0,0 +1,49 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public interface Acc_DormitoryRuleIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue); + Acc_DormitoryRuleEntity GetEnableEntity(); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs new file mode 100644 index 000000000..751c2f837 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs @@ -0,0 +1,168 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.* + "); + strSql.Append(" FROM Acc_DormitoryRule t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetEnableEntity() + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(x => x.IsEnable == 1); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs index 8dfc1bb3a..0c0866c1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs @@ -19,12 +19,33 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("ID")] public string ID { get; set; } + /// + /// 编号 + /// + [Column("DNO")] + public string DNo { get; set; } + /// /// 名称 /// [Column("NAME")] public string Name { get; set; } /// + /// 宿舍楼 + /// + [Column("APARTMENTID")] + public string ApartmentId { get; set; } + /// + /// 单元 + /// + [Column("UNITID")] + public string UnitId { get; set; } + /// + /// 楼层 + /// + [Column("FLOORID")] + public string FloorId { get; set; } + /// /// 负责人 /// [Column("FUNCTIONARY")] @@ -145,9 +166,32 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("PLANBEDNUM")] public int? PlanBedNum { get; set; } + + /// + /// 寝室类型（几人寝） + /// + [Column("ROOMTYPE")] + public int? RoomType { get; set; } + /// + /// 入住人数 + /// + [Column("CHECKINSTU")] + public int? CheckInStu { get; set; } + /// + /// 是否归宿 + /// + [Column("ISRETURN")] + public int? IsReturn { get; set; } #endregion #region 扩展字段 + + [NotMapped] + public string ApartmentName { get; set; } + [NotMapped] + public string UnitName { get; set; } + [NotMapped] + public string FloorName { get; set; } /// /// 学生名字 /// @@ -176,6 +220,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [NotMapped] public string bedId { get; set; } + + [NotMapped] + public string DeptName { get; set; } + [NotMapped] + public string MajorName { get; set; } + [NotMapped] + public string ClassName { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs index efb5fe22b..41bda8acd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs @@ -42,6 +42,26 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + + public IEnumerable GetBedListByRoomId(string RoomId) + { + try + { + return accommodationService.GetBedListByRoomId(RoomId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public IEnumerable GetAllList() { try @@ -61,6 +81,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public IEnumerable GetClassifyList(Pagination paginationobj, string queryJson) + { + try + { + return accommodationService.GetClassifyList(paginationobj, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public object GetDormitoryList() { try @@ -179,6 +218,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } + public string GetParentBuildType(string keyValue) + { + try + { + return accommodationService.GetParentBuildType(keyValue); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + + } + /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -251,6 +311,61 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public List GetDept() + { + try + { + return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetMajor(string strWhere) + { + try + { + return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetClass(string strWhere) + { + try + { + return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取左侧树形数据 /// @@ -270,8 +385,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement value = item.ID.ToString(), showcheck = false, checkstate = 0, - isexpand = false, - parentId = item.ParentID == null ? "" : item.ParentID + isexpand = true, + parentId = item.ParentID == null ? "" : item.ParentID, + title = item.BuildType }; @@ -339,9 +455,49 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + public List GetClassifyTree() + { + try + { + List list = accommodationService.GetClassifyTree(); + List treeList = new List(); + foreach (Acc_DormitoryBuildEntity item in list) + { + TreeModel node = new TreeModel + { + id = item.ID.ToString(), + text = item.Name.ToString(), + value = item.ID.ToString(), + showcheck = false, + checkstate = 0, + isexpand = false, + parentId = item.ParentID == null ? "" : item.ParentID, + title = string.IsNullOrEmpty(item.BuildType) ? "" : (Convert.ToInt32(item.BuildType) + 1).ToString(), + }; + treeList.Add(node); + + + } + + + return treeList.ToTree(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 根据父id 获取树形数据 @@ -386,7 +542,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - /// + /// /// 根据父id 获取树形数据 /// /// @@ -431,11 +587,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - public bool MatchDormitoryInfo(string stuNo,string dormitory,string unit,string floor,string room,string bed ,List data) + public bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed, List data) { try { - return accommodationService.MatchDormitoryInfo(stuNo,dormitory,unit,floor,room,bed,data); + return accommodationService.MatchDormitoryInfo(stuNo, dormitory, unit, floor, room, bed, data); } catch (Exception ex) @@ -481,6 +637,31 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteBed(string keyValue, string ParentID) + { + try + { + accommodationService.DeleteBed(keyValue, ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 保存实体数据（新增、修改） /// 主键 @@ -505,6 +686,74 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) + { + try + { + accommodationService.SaveBedEntity(keyValue, ParentID, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + + /// + /// 分配系 + /// + /// + /// + public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) + { + try + { + accommodationService.SaveDeptClass(keyValue, entity, type); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public string SaveRoom(string RoomId, List list) + { + try + { + return accommodationService.SaveRoom(RoomId, list); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 批量添加单元、楼层、宿舍、床位 @@ -581,7 +830,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs index 41cd164b0..2050f1292 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs @@ -21,7 +21,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetBedListByRoomId(string RoomId); IEnumerable GetAllList(); + IEnumerable GetClassifyList(Pagination paginationobj,string queryJson); /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -42,6 +44,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// List GetList(); + List GetDept(); + List GetMajor(string strWhere); + List GetClass(string strWhere); /// /// 获取左侧树形数据 /// @@ -50,6 +55,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement string GetDormitoryInfoByStuNo(string val); List GetTree(); List GetTreeNew(); + List GetClassifyTree(); bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed,List data); @@ -68,7 +74,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void DeleteEntity(string keyValue); + void DeleteBed(string keyValue, string ParentID); string GetBuildType(string parentID); + string GetParentBuildType(string keyValue); /// /// 保存实体数据（新增、修改） @@ -76,7 +84,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void SaveEntity(string keyValue, Acc_DormitoryBuildEntity entity); - + void SaveBedEntity(string keyValue,string ParentID, Acc_DormitoryBuildEntity entity); + void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type); + string SaveRoom(string RoomId, List list); /// /// 批量添加单元、楼层、房间、床位 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index 21b627eb3..ade272d6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -51,10 +51,14 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.ParentID, t.Remark, t.Starred, - t.HasToilet, - stb.StuName + t.HasToilet,t.RoomType, +t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, +a.name as ApartmentName,b.name as UnitName,c.Name as FloorName "); - strSql.Append(" FROM Acc_DormitoryBuild t LEFT JOIN dbo.StuInfoBasic stb ON t.StudentID=stb.StuId"); + strSql.Append(" FROM Acc_DormitoryBuild t "); + strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -64,6 +68,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); strSql.Append(" AND t.ParentID =@ParentID "); } + //else + //{ + // strSql.Append(" AND t.BuildType ='4' "); + //} + + if (!queryParam["ApartmentId"].IsEmpty()) + { + dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.ApartmentId =@ApartmentId "); + } + if (!queryParam["UnitId"].IsEmpty()) + { + dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); + strSql.Append(" AND t.UnitId =@UnitId "); + } + if (!queryParam["FloorId"].IsEmpty()) + { + dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); + strSql.Append(" AND t.FloorId =@FloorId "); + } + if (!queryParam["Name"].IsEmpty()) { dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); @@ -76,18 +101,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } if (!queryParam["Dept"].IsEmpty()) { - dp.Add("Dept", "%" + queryParam["Dept"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Dept Like @Dept "); + dp.Add("Dept", queryParam["Dept"].ToString(), DbType.String); + strSql.Append(" AND t.Dept=@Dept "); } if (!queryParam["Class"].IsEmpty()) { - dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Class Like @Class "); + dp.Add("Class", queryParam["Class"].ToString(), DbType.String); + strSql.Append(" AND t.Class=@Class "); } if (!queryParam["Major"].IsEmpty()) { - dp.Add("Major", "%" + queryParam["Major"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Major Like @Major "); + dp.Add("Major", queryParam["Major"].ToString(), DbType.String); + strSql.Append(" AND t.Major=@Major "); } if (!queryParam["Sex"].IsEmpty()) { @@ -104,6 +129,53 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("Leader", "%" + queryParam["Leader"].ToString() + "%", DbType.String); strSql.Append(" AND t.Leader Like @Leader "); } + + if (!queryParam["NoDistribution"].IsEmpty()) + { + var noDistribution = queryParam["NoDistribution"].ToString(); + if (noDistribution.Contains("dept")) + { + strSql.Append(" AND (t.Dept is null or len(t.Dept)=0) "); + } + if (noDistribution.Contains("major")) + { + strSql.Append(" AND (t.Major is null or len(t.Major)=0) "); + } + if (noDistribution.Contains("class")) + { + strSql.Append(" AND (t.Class is null or len(t.Class)=0) "); + } + if (noDistribution.Contains("room")) + { + strSql.Append(" AND (t.CheckInStu is null or len(t.CheckInStu)=0 or t.CheckInStu=0) "); + } + } + if (!queryParam["Distribution"].IsEmpty()) + { + var distribution = queryParam["Distribution"].ToString(); + if (distribution.Contains("dept")) + { + strSql.Append(" AND len(t.Dept)>0 "); + } + if (distribution.Contains("major")) + { + strSql.Append(" AND len(t.Major)>0 "); + } + if (distribution.Contains("class")) + { + strSql.Append(" AND len(t.Class)>0 "); + } + if (distribution.Contains("room")) + { + strSql.Append(" AND t.CheckInStu>0 "); + } + } + + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).OrderBy(a => a.Name).ThenBy(a => a.Name).ToList(); } catch (Exception ex) @@ -118,6 +190,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + + public IEnumerable GetBedListByRoomId(string RoomId) + { + try + { + string sql = $"select ID,Name,DNo,StudentID from Acc_DormitoryBuild where BuildType='5' and ParentID='{RoomId}'"; + return this.BaseRepository("CollegeMIS").FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public IEnumerable GetAllList() { try @@ -137,11 +230,95 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + public IEnumerable GetClassifyList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.Name, + t.Address, + t.Campus, + t.Dept, + t.BuildType, + t.Major, + t.Class, + t.Sex, + t.Functionary, + t.Phone, + t.Price, + t.Leader, + t.StudentID, + t.PlanStudentID, + t.ParentID, + t.Remark, + t.Starred, + t.HasToilet,t.RoomType, +t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, +a.name as ApartmentName,b.name as UnitName,c.Name as FloorName + "); + strSql.Append(" FROM Acc_DormitoryBuild t "); + strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); + strSql.Append(" WHERE 1=1 and (t.BuildType<>'5' and t.BuildType<>'4') "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["ParentID"].IsEmpty()) + { + dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); + strSql.Append(" AND t.ParentID =@ParentID "); + } + if (!queryParam["keyword"].IsEmpty()) + { + strSql.Append($" AND t.Name like '%{queryParam["keyword"].ToString()}%' "); + } + if (!queryParam["ApartmentId"].IsEmpty()) + { + dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.ApartmentId =@ApartmentId "); + } + if (!queryParam["UnitId"].IsEmpty()) + { + dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); + strSql.Append(" AND t.UnitId =@UnitId "); + } + if (!queryParam["FloorId"].IsEmpty()) + { + dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); + strSql.Append(" AND t.FloorId =@FloorId "); + } + + if (!queryParam["Name"].IsEmpty()) + { + dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Name Like @Name "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); + //return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + internal string GetBuildType(string parentID) { try { - var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ParentID == parentID); + var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ID == parentID); if (null != entity) { return entity.BuildType; @@ -164,6 +341,35 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public string GetParentBuildType(string keyValue) + { + try + { + string sql = $@" select BuildType from [dbo].[Acc_DormitoryBuild] where Id=( + select parentid from [dbo].[Acc_DormitoryBuild] where id='{keyValue}')"; + var data = this.BaseRepository("CollegeMIS").FindObject(sql); + if (data == null) + { + return ""; + } + else + { + return data.ToString(); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + internal object GetRoomList(string parentID) { try @@ -418,7 +624,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement floorInfo.dormitory = bed; if (!string.IsNullOrEmpty(bed.StudentID)) { - floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuId == bed.StudentID); + floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == bed.StudentID); } list.Add(floorInfo); } @@ -510,6 +716,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public List GetClassifyTree() + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => (x.BuildType == "2" || x.BuildType == "1")).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -582,7 +807,44 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { - return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); + return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5" && a.BuildType != "4").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取非空床的系部专业 班级 + /// + /// + public List GetSelectData(string strWhere) + { + try + { + string sql = + @"select distinct dept,d.DeptName,major,m.MajorName,class,c.ClassName from [dbo].[Acc_DormitoryBuild] t +join CdDept d on t.dept=d.deptno +join CdMajor m on t.major=m.majorno +join ClassInfo c on t.class=c.classno +where t.ID in ( +select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +)"; + if (!string.IsNullOrEmpty(strWhere)) + { + sql += " and " + strWhere; + } + + return this.BaseRepository("CollegeMIS").FindList(sql).ToList(); } catch (Exception ex) @@ -598,6 +860,41 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 获取树形数据(学生归宿) + /// + /// + public List GetSqlTreeForReturn() + { + try + { + List list = new List(); + var roomSql = @"select * from [dbo].[Acc_DormitoryBuild] where ID in ( +select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +)"; + List roomList = this.BaseRepository("CollegeMIS") + .FindList(roomSql).ToList(); + list = roomList.Union(list).ToList(); + var apartIds = roomList.Select(x => x.ApartmentId).Distinct().ToList(); + var unitIds = roomList.Select(x => x.UnitId).Distinct().ToList(); + var floorIds = roomList.Select(x => x.FloorId).Distinct().ToList(); + var otherList = this.BaseRepository("CollegeMIS").FindList(x => + apartIds.Contains(x.ID) || unitIds.Contains(x.ID) || floorIds.Contains(x.ID)).ToList(); + list = list.Union(otherList).ToList(); + return list.OrderBy(x => x.DNo).OrderBy(x => x.Name).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 根据父id获取数据 /// @@ -734,6 +1031,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } bedInfo.StudentID = stuInfo.StuId; bedInfo.StuName = stuInfo.StuName; + bedInfo.Dept = stuInfo.DeptNo; + bedInfo.Major = stuInfo.MajorNo; + bedInfo.Class = stuInfo.ClassNo; + bedInfo.Sex = Convert.ToString(stuInfo.GenderNo); this.BaseRepository("CollegeMIS").Update(bedInfo); return true; } @@ -799,6 +1100,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + public void DeleteBed(string keyValue, string ParentID) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); + UpdateCheckInNum(ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public void DeleteAll(string parentid) { var list = this.BaseRepository("CollegeMIS").FindList(a => a.ParentID == parentid).ToList(); @@ -842,7 +1164,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var elementEntity = new Acc_DormitoryBuildEntity { ParentID = keyValue, + ApartmentId = keyValue, Name = i.ToString() + "单元", + DNo = i.ToString(), BuildType = "2",//单元类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -859,6 +1183,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement UpdateTime = DateTime.Now }; elementEntity.Create(); + elementEntity.UnitId = elementEntity.ID; list.Add(elementEntity); //添加楼层 @@ -869,7 +1194,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var floorEntity = new Acc_DormitoryBuildEntity { ParentID = elementEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, Name = j.ToString() + "层", + DNo = j.ToString(), BuildType = "3",//楼层类型, Sex = dormitory.Sex, Address = dormitory.Address, @@ -886,6 +1214,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement UpdateTime = DateTime.Now }; floorEntity.Create(); + floorEntity.FloorId = floorEntity.ID; list.Add(floorEntity); //添加房间 @@ -896,7 +1225,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var roomEntity = new Acc_DormitoryBuildEntity { ParentID = floorEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, + FloorId = floorEntity.ID, Name = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()) + "室", + DNo = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()), BuildType = "4",//房间类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -909,6 +1242,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Major = dormitory.Major, Phone = dormitory.Phone, Price = dormitory.Price, + RoomType = bedNum, UpdateBy = currentUser.realName, UpdateTime = DateTime.Now, Starred = "3", @@ -925,7 +1259,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var bedEntity = new Acc_DormitoryBuildEntity { ParentID = roomEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, + FloorId = floorEntity.ID, Name = m.ToString() + "床", + DNo = m.ToString(), BuildType = "5", Sex = dormitory.Sex, Address = dormitory.Address, @@ -1275,9 +1613,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } else { + entity.Create(); if (entity.BuildType == "1") { - if (string.IsNullOrEmpty(entity.ParentID)) + entity.ApartmentId = entity.ID; + if (string.IsNullOrEmpty(entity.ParentID) || entity.ParentID == "-1") { var rootNode = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ParentID == null); if (rootNode == null) @@ -1291,6 +1631,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement rootEntity.CreateTime = DateTime.Now; rootEntity.UpdateBy = currentUser.realName; rootEntity.UpdateTime = DateTime.Now; + rootEntity.ApartmentId = rootEntity.ID; entity.ParentID = rootEntity.ID; this.BaseRepository("CollegeMIS").Insert(rootEntity); } @@ -1300,7 +1641,33 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } - entity.Create(); + else + { + //上一级 + var parentity = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ID == entity.ParentID); + switch (parentity.BuildType) + { + case "1": + entity.ApartmentId = parentity.ID; + entity.UnitId = entity.ID; + break; + case "2": + { + entity.FloorId = entity.ID; + entity.UnitId = parentity.ID; + entity.ApartmentId = parentity.ApartmentId; + } + break; + case "3": + { + entity.FloorId = parentity.ID; + entity.UnitId = parentity.UnitId; + entity.ApartmentId = parentity.ApartmentId; + } + break; + } + } + entity.CreateBy = currentUser.realName; entity.CreateTime = DateTime.Now; entity.UpdateBy = currentUser.realName; @@ -1321,6 +1688,157 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + db.Update(entity); + } + else + { + var parentEntity = db.FindEntity(ParentID); + entity.Create(); + entity.ApartmentId = parentEntity.ApartmentId; + entity.UnitId = parentEntity.UnitId; + entity.FloorId = parentEntity.FloorId; + entity.ParentID = ParentID; + entity.BuildType = "5"; + db.Insert(entity); + } + db.Commit(); + UpdateCheckInNum(ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + private void UpdateCheckInNum(string ParentID) + { + try + { + string sql = $@"update [dbo].[Acc_DormitoryBuild] set RoomType=( +select count(1) from [dbo].[Acc_DormitoryBuild] where ParentId='{ParentID}' and BuildType='5' +) +where ID='{ParentID}' +"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) + { + try + { + if (keyValue.Contains(",")) + { + keyValue = string.Join("','", keyValue.Split(',')); + } + string sql = $"update Acc_DormitoryBuild set "; + if (type == 1) + { + sql += $" Dept='{entity.Dept}' "; + } + else + { + sql += $"Major='{entity.Major}',Class='{entity.Class}'"; + } + + sql += $" where ID in ('{keyValue}')"; + + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 分配宿舍 + /// + /// + /// + public string SaveRoom(string RoomId, List list) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + foreach (var entity in list) + { + //判断该学生是否已分配 + if (!string.IsNullOrEmpty(entity.StudentID)) + { + var count = db.FindList().Count(x => x.StudentID == entity.StudentID && x.ID != entity.ID); + if (count > 0) + { + var stuname = db.FindEntity(x => x.StuNo == entity.StudentID)?.StuName; + return "学生" + stuname + "已分配床位，不可重复分配！"; + } + } + + //分配床位 + string sql = $"update Acc_DormitoryBuild set StudentID='{entity.StudentID}' where ID='{entity.ID}'"; + db.ExecuteBySql(sql); + } + + int checkInStu = list.Where(x => x.StudentID != null).Count(); + string checkInSql = $"update Acc_DormitoryBuild set CheckInStu='{checkInStu}' where ID='{RoomId}'"; + db.ExecuteBySql(checkInSql); + + db.Commit(); + return ""; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 同步宿舍信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs new file mode 100644 index 000000000..3e91d02ac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs @@ -0,0 +1,104 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class Acc_DormitoryReturnEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 宿舍id，关联Acc_DormitoryBuild表 + /// + [Column("DORMITORYBUILDID")] + public string DormitoryBuildId { get; set; } + /// + /// 床位父级 + /// + [Column("PARENTID")] + public string ParentId { get; set; } + + /// + /// 检查日期 + /// + [Column("CHECKDATE")] + public DateTime? CheckDate { get; set; } + /// + /// 出宿时间 + /// + [Column("OUTTIME")] + public DateTime? OutTime { get; set; } + /// + /// 归宿时间 + /// + [Column("RETURNTIME")] + public DateTime? ReturnTime { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 修改时间 + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + /// + /// 修改人 + /// + [Column("UPDATEUSERID")] + public string UpdateUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.CreateTime = DateTime.Now; + this.CreateUserId = LoginUserInfo.Get().userId; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.UpdateTime = DateTime.Now; + this.UpdateUserId = LoginUserInfo.Get().userId; + } + #endregion + #region 扩展字段 + [NotMapped] + public string Name { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs new file mode 100644 index 000000000..066f0b3e8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs @@ -0,0 +1,210 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; +using System.Linq; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnBLL : DormitoryReturnIBLL + { + private DormitoryReturnService dormitoryReturnService = new DormitoryReturnService(); + private AccommodationService accommodationService = new AccommodationService(); + + #region 获取数据 + + /// + /// 获取左侧树形数据 + /// + /// + public List GetTree() + { + try + { + List list = accommodationService.GetSqlTreeForReturn(); + List treeList = new List(); + foreach (Acc_DormitoryBuildEntity item in list) + { + TreeModel node = new TreeModel + { + id = item.ID.ToString(), + text = item.Name.ToString(), + value = item.ID.ToString(), + showcheck = false, + checkstate = 0, + isexpand = true, + parentId = item.ParentID == null ? "" : item.ParentID, + title = item.BuildType + + }; + + + treeList.Add(node); + + + } + + + return treeList.ToTree(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return dormitoryReturnService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public IEnumerable GetReportList(string queryJson) + { + try + { + return dormitoryReturnService.GetReportList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) + { + try + { + return dormitoryReturnService.GetAcc_DormitoryReturnEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + dormitoryReturnService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) + { + try + { + dormitoryReturnService.SaveEntity(type, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) + { + try + { + dormitoryReturnService.SaveData(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs new file mode 100644 index 000000000..39401c7d1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs @@ -0,0 +1,50 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public interface DormitoryReturnIBLL + { + #region 获取数据 + List GetTree(); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetReportList(string queryJson); + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string type, Acc_DormitoryReturnEntity entity); + void SaveData(string keyValue, Acc_DormitoryReturnEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs new file mode 100644 index 000000000..94249c21b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs @@ -0,0 +1,273 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.*,a.Name + "); + strSql.Append(" FROM Acc_DormitoryReturn t "); + strSql.Append(" join Acc_DormitoryBuild a on t.DormitoryBuildId=a.ID "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.CheckDate >= @startTime AND t.CheckDate <= @endTime ) "); + } + if (!queryParam["OutTime"].IsEmpty()) + { + dp.Add("OutTime", queryParam["OutTime"].ToString(), DbType.String); + strSql.Append(" AND t.OutTime = @OutTime "); + } + if (!queryParam["ParentId"].IsEmpty()) + { + dp.Add("ParentId", queryParam["ParentId"].ToString(), DbType.String); + strSql.Append(" AND t.ParentId = @ParentId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取统计数据 + /// + /// + /// + public IEnumerable GetReportList(string queryJson) + { + try + { + string sql = @"select (case t.isreturn when 1 then 1 else 0 end) as isreturn,a.Dept,a.Major,a.class from +( +select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +) t +join Acc_DormitoryBuild a on a.ID=t.parentid where 1=1 +"; + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Dept"].IsEmpty()) + { + sql += $" AND a.Dept = '{queryParam["Dept"].ToString()}'"; + } + if (!queryParam["Major"].IsEmpty()) + { + sql += $" AND a.Major = '{queryParam["Major"].ToString()}'"; + } + if (!queryParam["Class"].IsEmpty()) + { + sql += $" AND a.Class = '{queryParam["Class"].ToString()}'"; + } + return this.BaseRepository("CollegeMIS").FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + if (type == "1") + { + //学生出宿 + entity.Create(); + entity.CheckDate = Convert.ToDateTime(entity.OutTime.Value.Date); + db.Insert(entity); + + //修改该床位为未归宿 + var sql = $"update Acc_DormitoryBuild set IsReturn=0 where ID='{entity.DormitoryBuildId}'"; + db.ExecuteBySql(sql); + } + else + { + //学生归宿 + //获取今天最后一次出宿的记录 + var outsql = + $"select top 1 * from Acc_DormitoryReturn where DormitoryBuildId='{entity.DormitoryBuildId}' and CheckDate='{DateTime.Now.Date}' order by OutTime desc"; + var model = db.FindList(outsql).FirstOrDefault(); + if (model == null) + { + //新增 + entity.Create(); + entity.ReturnTime = entity.ReturnTime; + entity.CheckDate = Convert.ToDateTime(entity.ReturnTime.Value.Date); + db.Insert(entity); + } + else + { + //修改 + model.ReturnTime = entity.ReturnTime; + model.Remark += " " + entity.Remark; + model.Modify(model.Id); + db.Update(model); + } + + //修改该床位为未归宿 + var sql = $"update Acc_DormitoryBuild set IsReturn=1 where ID='{entity.DormitoryBuildId}'"; + db.ExecuteBySql(sql); + } + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存 + /// + /// + /// + public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs index 5f0ecf4ed..d1e0e9d24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs @@ -7,17 +7,21 @@ using System.Threading.Tasks; namespace Learun.Application.WorkFlow { - public class ArrangeLessonTermAttemperMethod : INodeMethod + public class ArrangeLessonTermAttemperMethod : IWorkFlowMethod { ArrangeLessonTermAttemperIBLL arrangeLessonTermAttemperIBLL = new ArrangeLessonTermAttemperBLL(); - public void Sucess(string processId) + + public void Execute(WfMethodParameter parameter) { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, processId); - } - - public void Fail(string processId) - { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, processId); + if (parameter.code == "agree") + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, parameter.processId); + } + else + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, parameter.processId); + } } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs index f2fdaa45a..0ed02d72b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs @@ -465,7 +465,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo?.account; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account+"("+ operateLogModel.userInfo.realName+ ")"; logEntity.F_OperateUserId = operateLogModel.userInfo?.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; @@ -495,7 +495,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo.account; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account + "(" + operateLogModel.userInfo.realName + ")"; logEntity.F_OperateUserId = operateLogModel.userInfo.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; From 47c4fa71b68a32b5efde757c1bf5d56b6b119086 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 15 Apr 2022 11:19:36 +0800 Subject: [PATCH 40/41] =?UTF-8?q?Revert=20"=E8=80=83=E8=AF=95=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=A1=A8=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 257c467ca43fe5ec7e9963dddba58ecefe0d70fd. --- ...补充接口说明V1.0（塔里木）.docx | Bin 20309 -> 0 bytes .../ArrangeLessonTermController.cs | 16 - .../Controllers/ElectiveMergeController.cs | 5 - .../Controllers/Exam_ExamPlanController.cs | 117 ---- .../Controllers/LessonInfoController.cs | 12 - .../OpenLessonPlanOfElectiveController.cs | 45 -- .../Controllers/StuScoreController.cs | 38 -- .../Controllers/StuScoreNotPassController.cs | 44 +- .../StuScoreNotPassTwoController.cs | 43 -- ...StuSelectLessonListOfElectiveController.cs | 6 - .../Views/ArrangeLessonTermAttemper/Form.js | 43 +- .../ArrangeLessonTermAttemper/FormView.cshtml | 4 +- .../ArrangeLessonTermAttemper/FormView.js | 36 +- .../Views/ArrangeLessonTermAttemper/Index.js | 37 +- .../Views/ElectiveMajor/Index.js | 10 - .../Views/EmpInfo/FormEdit.cshtml | 4 +- .../Views/EmpInfo/FormEdit.js | 2 +- .../Views/Exam_ExamPlan/Form.cshtml | 43 -- .../Views/Exam_ExamPlan/Form.js | 68 -- .../Views/Exam_ExamPlan/Index.cshtml | 66 -- .../Views/Exam_ExamPlan/Index.js | 147 ---- .../OpenLessonPlanOfElective/MergeIndex.js | 43 +- .../StudentIndex.cshtml | 25 +- .../OpenLessonPlanOfElective/StudentIndex.js | 17 +- .../Views/StuInfoFresh/Form.js | 2 +- .../StuScore/AllStuScoreQueryIndex.cshtml | 38 -- .../Views/StuScore/AllStuScoreQueryIndex.js | 108 --- .../StuScore/AllStuScoreQueryPrint.cshtml | 167 ----- .../Views/StuScoreNotPass/IndexUnpass.cshtml | 58 -- .../Views/StuScoreNotPass/IndexUnpass.js | 147 ---- .../StuScoreNotPassTwo/IndexUnpassTwo.cshtml | 58 -- .../StuScoreNotPassTwo/IndexUnpassTwo.js | 143 ---- .../Index.cshtml | 3 - .../StuSelectLessonListOfElective/Index.js | 17 +- .../QueryStuSelectResult.js | 2 +- .../QueryStuSelectResultForTeacher.cshtml | 59 -- .../QueryStuSelectResultForTeacher.js | 218 ------ .../Controllers/CustmerformController.cs | 19 +- .../Views/FormRelation/Form.cshtml | 2 +- .../LR_FormModule/Views/FormRelation/Form.js | 5 +- .../Views/FormRelation/PreviewIndex.js | 6 +- .../Views/NWFProcess/NWFContainerForm.js | 22 +- .../LR_SystemModule/Views/Log/Index.cshtml | 26 +- .../Areas/LR_SystemModule/Views/Log/Index.js | 7 +- .../Acc_DormitoryRuleController.cs | 141 ---- .../Controllers/AccommodationController.cs | 205 +----- .../Controllers/DormitoryReturnController.cs | 245 ------- .../Views/Acc_DormitoryRule/Form.cshtml | 27 - .../Views/Acc_DormitoryRule/Form.js | 62 -- .../Views/Acc_DormitoryRule/Index.cshtml | 27 - .../Views/Acc_DormitoryRule/Index.js | 139 ---- .../Views/Accommodation/Corridor.cshtml | 22 +- .../Views/Accommodation/Dormitory.cshtml | 176 ++++- .../Views/Accommodation/DormitoryAdd.cshtml | 8 +- .../Views/Accommodation/Floor.cshtml | 32 +- .../Views/Accommodation/Form.cshtml | 76 +-- .../Views/Accommodation/Form.js | 1 - .../Views/Accommodation/FormBed.cshtml | 12 - .../Views/Accommodation/FormBed.js | 52 -- .../Views/Accommodation/FormClass.cshtml | 19 - .../Views/Accommodation/FormClass.js | 82 --- .../Views/Accommodation/FormClassify.cshtml | 97 --- .../Views/Accommodation/FormClassify.js | 167 ----- .../Views/Accommodation/FormDept.cshtml | 15 - .../Views/Accommodation/FormDept.js | 56 -- .../Views/Accommodation/FormRoom.cshtml | 26 - .../Views/Accommodation/FormRoom.js | 128 ---- .../Views/Accommodation/Index.cshtml | 82 ++- .../Views/Accommodation/Index.js | 547 ++++----------- .../Views/Accommodation/IndexBed.cshtml | 61 -- .../Views/Accommodation/IndexBed.js | 110 --- .../Views/Accommodation/IndexClassify.cshtml | 69 -- .../Views/Accommodation/IndexClassify.js | 187 ------ .../Accommodation/IndexDistribution.cshtml | 92 --- .../Views/Accommodation/IndexDistribution.js | 625 ------------------ .../Views/Accommodation/Room.cshtml | 12 +- .../Views/Accommodation/Unit.cshtml | 21 +- .../Views/DormitoryReturn/Form.cshtml | 23 - .../Views/DormitoryReturn/Form.js | 59 -- .../Views/DormitoryReturn/FormOut.cshtml | 19 - .../Views/DormitoryReturn/FormOut.js | 61 -- .../Views/DormitoryReturn/FormReturn.cshtml | 19 - .../Views/DormitoryReturn/FormReturn.js | 61 -- .../Views/DormitoryReturn/Index.cshtml | 49 -- .../Views/DormitoryReturn/Index.js | 159 ----- .../Views/DormitoryReturn/IndexReport.cshtml | 49 -- .../Views/DormitoryReturn/IndexReport.js | 131 ---- .../Controllers/TimeTableController.cs | 9 - .../TimeTable/ClassIndexInEducation.cshtml | 159 ----- .../Views/TimeTable/ClassIndexInEducation.js | 202 ------ .../Controllers/LoginController.cs | 5 - .../Learun.Application.Web.csproj | 20 - .../Views/Home/ChangePwd.js | 1 - .../Views/LR_Content/plugin/grid/jfgrid.js | 1 - .../Views/LR_Content/script/lr-excel.js | 6 - .../XmlConfig/ioc.config | 2 - .../XmlConfig/system.config | 4 +- .../Learun.Application.WebApi.csproj | 1 - .../Modules/StuScoreApi.cs | 143 ---- .../Modules/TimeTable.cs | 89 +-- .../DataAuthorize/DataAuthorizeBLL.cs | 4 +- .../DataAuthorize/DataAuthorizeService.cs | 5 +- .../Scheme/FormSchemeBLL.cs | 7 +- .../Exam_ExamPlanMap.cs | 29 - .../Learun.Application.Mapping.csproj | 12 - .../Acc_DormitoryReturnMap.cs | 29 - .../Acc_DormitoryRuleMap.cs | 29 - .../ArrangeLessonTermService.cs | 58 +- .../ArrangeLessonTermOfElectiveService.cs | 19 +- .../ElectiveMajor/ElectiveMajorService.cs | 24 +- .../ElectiveMerge/ElectiveMergeService.cs | 4 +- .../EmpInfo/EmpInfoService.cs | 16 +- .../Exam_ExamPlan/Exam_ExamPlanBLL.cs | 125 ---- .../Exam_ExamPlan/Exam_ExamPlanEntity.cs | 90 --- .../Exam_ExamPlan/Exam_ExamPlanIBLL.cs | 48 -- .../Exam_ExamPlan/Exam_ExamPlanService.cs | 188 ------ .../LessonInfo/LessonInfoBLL.cs | 19 - .../LessonInfo/LessonInfoIBLL.cs | 1 - .../LessonInfo/LessonInfoService.cs | 19 - .../OpenLessonPlanOfElectiveEntity.cs | 2 - .../OpenLessonPlanOfElectiveService.cs | 29 +- .../OpenLessonPlanOfElectiveChangeEntity.cs | 6 - .../EducationalAdministration/SignUpHelper.cs | 6 - .../StuScore/StuScoreBLL.cs | 24 - .../StuScore/StuScoreEntity.cs | 35 +- .../StuScore/StuScoreIBLL.cs | 6 - .../StuScore/StuScoreService.cs | 122 +--- .../StuScoreNotPass/StuScoreNotPassBLL.cs | 40 -- .../StuScoreNotPass/StuScoreNotPassEntity.cs | 14 - .../StuScoreNotPass/StuScoreNotPassIBLL.cs | 2 - .../StuScoreNotPass/StuScoreNotPassService.cs | 107 --- .../StuScoreNotPassTwoBLL.cs | 45 -- .../StuScoreNotPassTwoIBLL.cs | 2 - .../StuScoreNotPassTwoService.cs | 115 ---- .../StuSelectLessonListOfElectiveEntity.cs | 1 - .../StuSelectLessonListOfElectiveService.cs | 4 +- .../Learun.Application.TwoDevelopment.csproj | 92 +-- .../Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs | 148 ----- .../Acc_DormitoryRuleEntity.cs | 90 --- .../Acc_DormitoryRuleIBLL.cs | 49 -- .../Acc_DormitoryRuleService.cs | 168 ----- .../Accommodation/Acc_DormitoryBuildEntity.cs | 51 -- .../Accommodation/AccommodationBLL.cs | 260 +------- .../Accommodation/AccommodationIBLL.cs | 12 +- .../Accommodation/AccommodationService.cs | 546 +-------------- .../Acc_DormitoryReturnEntity.cs | 104 --- .../DormitoryReturn/DormitoryReturnBLL.cs | 210 ------ .../DormitoryReturn/DormitoryReturnIBLL.cs | 50 -- .../DormitoryReturn/DormitoryReturnService.cs | 273 -------- .../ArrangeLessonTermAttemperMethod.cs | 20 +- .../Learun.Util.Operat/OperatorHelper.cs | 4 +- 151 files changed, 669 insertions(+), 9565 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs delete mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs diff --git a/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx b/Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx deleted file mode 100644 index 40c37ee4265dfa734a7717514a06ecd939797d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20309 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 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index cf57f41e4..2b643cac9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -122,22 +122,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = arrangeLessonTermIBLL.GetEntity(keyValue); return Success(data); } - /// - /// 获取调度时间数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonDateList(string queryJson) - { - var data = arrangeLessonTermIBLL.GetList(queryJson).Where(x => x.LessonDate.HasValue).Select(x => x.LessonDate).Distinct().Select(x => new - { - text = x, - value = x - }).OrderBy(x => x.value); - - return Success(data); - } #endregion #region 提交数据 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 8bae3e3f1..d7ffb29b4 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,11 +149,6 @@ 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/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs deleted file mode 100644 index 95ae373a7..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs +++ /dev/null @@ -1,117 +0,0 @@ -using Learun.Util; -using System.Data; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using System.Web.Mvc; -using System.Collections.Generic; - -namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-04-14 18:12 - /// 描 述：考试记录表 - /// - public class Exam_ExamPlanController : MvcControllerBase - { - private Exam_ExamPlanIBLL exam_ExamPlanIBLL = new Exam_ExamPlanBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - #endregion - - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = exam_ExamPlanIBLL.GetPageList(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// - /// 主键 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var Exam_ExamPlanData = exam_ExamPlanIBLL.GetExam_ExamPlanEntity( keyValue ); - var jsonData = new { - Exam_ExamPlan = Exam_ExamPlanData, - }; - return Success(jsonData); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - exam_ExamPlanIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity) - { - Exam_ExamPlanEntity entity = strEntity.ToObject(); - exam_ExamPlanIBLL.SaveEntity(keyValue,entity); - if (string.IsNullOrEmpty(keyValue)) - { - } - return Success("保存成功！"); - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs index d99e78b0a..270d9f43b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs @@ -104,18 +104,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers LessonInfoData.Introduction = WebHelper.HtmlDecode(LessonInfoData.Introduction); return Success(LessonInfoData); } - /// - /// 获取表单数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonByMajorNo(string majorNo) - { - var LessonInfoList = lessonInfoIBLL.GetLessonByMajorNo(majorNo); - return Success(LessonInfoList); - } - #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs index a1a8f1486..622ce156b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs @@ -5,7 +5,6 @@ using System.Web.Mvc; using System.Collections.Generic; using System; using System.Linq; -using Learun.Application.Base.SystemModule; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -26,7 +25,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers CdMajorIBLL CdMajorIBLL = new CdMajorBLL(); private StuSelectLessonListOfElectivePreIBLL stuSelectLessonListOfElectivePreIBLL = new StuSelectLessonListOfElectivePreBLL(); private OpenLessonPlanOfElectiveChangeIBLL openLessonPlanOfElectiveChangeIBLL = new OpenLessonPlanOfElectiveChangeBLL(); - private DataSourceIBLL dataSourceIBLL = new DataSourceBLL(); #region 视图功能 @@ -226,57 +224,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (!string.IsNullOrEmpty(entity.AfterLessonNo)) { model.AfterLessonNo = entity.AfterLessonNo; - var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.AfterLessonNo + "'"); - if (lesson != null && lesson.Rows.Count > 0) - { - model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); - } - } - else - { - var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.LessonNo + "'"); - if (lesson != null && lesson.Rows.Count > 0) - { - model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); - } } - if (!string.IsNullOrEmpty(entity.AfterEmpNo)) { model.AfterEmpNo = entity.AfterEmpNo; - - var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.AfterEmpNo + "'"); - if (emp != null && emp.Rows.Count > 0) - { - model.AfterEmpName = emp.Rows[0]["empname"].ToString(); - } } - else - { - var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.EmpNo + "'"); - if (emp != null && emp.Rows.Count > 0) - { - model.AfterEmpName = emp.Rows[0]["empname"].ToString(); - } - } - if (!string.IsNullOrEmpty(entity.AfterClassRoomNo)) { model.AfterClassRoomNo = entity.AfterClassRoomNo; - - var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.AfterClassRoomNo + "'"); - if (classRoom != null && classRoom.Rows.Count > 0) - { - model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); - } - } - else - { - var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.ClassRoomNo + "'"); - if (classRoom != null && classRoom.Rows.Count > 0) - { - model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); - } } openLessonPlanOfElectiveChangeIBLL.SaveEntity("", model); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 67e843cd9..905be20de 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -5,7 +5,6 @@ using Learun.Util; using Newtonsoft.Json; using System; using System.Collections.Generic; -using System.Configuration; using System.Data; using System.Linq; using System.Web.Mvc; @@ -184,25 +183,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - /// - /// 全院学生成绩查看页面 - /// - /// - [HttpGet] - public ActionResult AllStuScoreQueryIndex() - { - return View(); - } - /// - /// 全院学生成绩打印 - /// - /// - [HttpGet] - public ActionResult AllStuScoreQueryPrint() - { - ViewBag.WebApi = ConfigurationManager.AppSettings["WebApi"]; - return View(); - } #endregion #region 获取数据 @@ -735,24 +715,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(result); } - /// - /// 全院学生成绩查看 - /// - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreListByStuInfo(string queryJson) - { - var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); - if (data.Any()) - { - data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x=>x.LessonSortNo).ThenBy(x => x.LessonNo); - } - - return Success(data); - } - public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo) { var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs index 77e7fec38..ef8c04c8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs @@ -71,16 +71,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - /// - /// 补考名单查看 - /// - /// - [HttpGet] - public ActionResult IndexUnpass() - { - return View(); - } - #endregion #region 获取数据 @@ -116,28 +106,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } - - /// - /// 补考名单查看 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageListForUnpass(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuScoreNotPassIBLL.GetPageListForUnpass(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// /// 获取表单数据 /// 主键 @@ -203,17 +171,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - /// 初始化补考成绩 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult InitScore() - { - stuScoreNotPassIBLL.InitScore(); - return Success("操作成功！"); - } - + #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs index 8eec54f49..380f8dc62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs @@ -71,16 +71,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } - /// - /// 二次补考成绩查看 - /// - /// - [HttpGet] - public ActionResult IndexUnpassTwo() - { - return View(); - } - #endregion #region 获取数据 @@ -156,27 +146,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(data); } - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageListForUnpass(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuScoreNotPassTwoIBLL.GetPageListForUnpass(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } #endregion #region 提交数据 @@ -207,18 +176,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassTwoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - - /// - /// 初始化二次补考成绩 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult InitScore() - { - stuScoreNotPassTwoIBLL.InitScore(); - return Success("操作成功！"); - } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs index cb4b7d1b7..cc47418eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs @@ -34,12 +34,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - - [HttpGet] - public ActionResult QueryStuSelectResultForTeacher() - { - return View(); - } /// /// 教务-审核表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 46e63e24a..3bbd0b3b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), - value: 'value', - text: 'text' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), + value: 'LessonDate', + text: 'LessonDate' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), - value: 'value', - text: 'text' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), + value: 'LessonDate', + text: 'LessonDate' }); } }, @@ -180,9 +180,20 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ allowSearch: true }); + $('#AttemperStartTime').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), + value: 'LessonDate', + text: 'LessonDate' + }); //调度结束时间 - $('#AttemperEndTime').lrselect({ allowSearch: true }); + $('#AttemperEndTime').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), + value: 'LessonDate', + text: 'LessonDate' + }); + }, initData: function () { if (!!keyValue) { @@ -223,10 +234,7 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - var timer = setTimeout(function () { - page.query(); - clearTimeout(timer); - }, 3000) + page.query(); } }); } @@ -260,7 +268,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId, param, callback) { + setFormData = function (processId) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -302,14 +310,9 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - var timer = setTimeout(function () { - page.query(); - clearTimeout(timer); - }, 3000) } }); } - callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -333,7 +336,7 @@ var bootstrap = function ($, learun) { return false; } if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间不能小于调度开始时间！"); + learun.alert.warning("调度结束时间应该大于调度开始时间！"); return false; } } @@ -346,7 +349,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, i); + callBack(res, formData, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index 71071ebdb..d7c970c4e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -126,11 +126,11 @@
      调度开始时间*
      - +
      调度结束时间*
      - +
      调度备注
      diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index e0247da8f..fb37b83ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -41,22 +41,21 @@ var bootstrap = function ($, learun) { p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); - //console.log(p); //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), - value: 'value', - text: 'text' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), + value: 'LessonDate', + text: 'LessonDate' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), - value: 'value', - text: 'text' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), + value: 'LessonDate', + text: 'LessonDate' }); } }, @@ -180,6 +179,20 @@ var bootstrap = function ($, learun) { $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); + //调度开始时间 + $('#AttemperStartTime').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), + value: 'LessonDate', + text: 'LessonDate' + }); + //调度结束时间 + $('#AttemperEndTime').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), + value: 'LessonDate', + text: 'LessonDate' + }); }, initData: function () { @@ -223,7 +236,7 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - + page.query(); } }); } @@ -257,7 +270,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId, param, callback) { + setFormData = function (processId) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -304,7 +317,6 @@ var bootstrap = function ($, learun) { } }); } - callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -324,7 +336,7 @@ var bootstrap = function ($, learun) { } } else if (formData.AttemperType == "01") { //调课：调度时间比较 if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间不能小于调度开始时间！"); + learun.alert.warning("调度结束时间应该大于调度开始时间！"); return false; } } @@ -337,7 +349,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, i); + callBack(res, formData, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index 6b56aca3e..b390431e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -408,36 +408,21 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - //if (res.code == 200) { - // // 发起流程 - // learun.workflowapi.create({ - // isNew: true, - // schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 - // processId: processId, - // processName: '课程异动申请',// 对应流程名称 - // processLevel: '1', - // description: '', - // formData: JSON.stringify(postData), - // callback: function (res, data) { - // } - // }); - // page.search(); - //} - - if (res && res.code && res.code == 200) { + if (res.code == 200) { // 发起流程 - - var postData = { - schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + learun.workflowapi.create({ + isNew: true, + schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 processId: processId, - level: '1', - }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { - learun.loading(false); + processName: '课程异动申请',// 对应流程名称 + processLevel: '1', + description: '', + formData: JSON.stringify(postData), + callback: function (res, data) { + } }); - + page.search(); } - page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js index 6839e2da6..58dfa6639 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js @@ -5,7 +5,6 @@ * 描 述：选课专业 */ var refreshGirdData; -var acceptClick; var OLPOEId = request("OLPOEId"); var bootstrap = function ($, learun) { "use strict"; @@ -130,17 +129,8 @@ var bootstrap = function ($, learun) { $('#gridtablemanagemajor').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; - refreshGirdData = function () { page.search(); }; - - // 保存数据 - acceptClick = function (callBack) { - if (!!callBack) { - learun.layerClose(window.name); - callBack(); - } - }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index d50374b93..a3ce1de60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,10 @@
      部门
      -
      + @*
      系部
      -
      +
      *@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index 9f1bb64ba..ca29ab2d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { } }); $('#F_DepartmentId').lrselect(); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml deleted file mode 100644 index f8810fce8..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml +++ /dev/null @@ -1,43 +0,0 @@ -@{ - ViewBag.Title = "考试记录表"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
      -
      -
      学年*
      -
      -
      -
      -
      学期*
      -
      -
      -
      -
      排考名称*
      - -
      -
      -
      排考类型*
      -
      -
      -
      -
      排考编号*
      - -
      -
      -
      排考总人数*
      - -
      -
      -
      生成座位*
      -
      -
      -
      -
      是否生成*
      -
      -
      -
      -
      排序号*
      - -
      -
      -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js deleted file mode 100644 index 7a12a2cb2..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js +++ /dev/null @@ -1,68 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2022-04-14 18:12 - * 描 述：考试记录表 - */ -var acceptClick; -var keyValue = request('keyValue'); -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - $('.lr-form-wrap').lrscroll(); - page.bind(); - page.initData(); - }, - bind: function () { - $('#AcademicYearNo').lrselect({ - placeholder: "学年", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - //学期 - $('#Semester').lrselect({ - placeholder: "学期", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', - value: 'value', - text: 'text' - }); - $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); - $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); - $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetFormData?keyValue=' + keyValue, function (data) { - for (var id in data) { - if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); - } - else { - $('[data-table="' + id + '"]').lrSetFormData(data[id]); - } - } - }); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('body').lrValidform()) { - return false; - } - var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) - }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml deleted file mode 100644 index 15b62df28..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml +++ /dev/null @@ -1,66 +0,0 @@ -@{ - ViewBag.Title = "考试记录表"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      学年
      -
      -
      -
      -
      学期
      -
      -
      -
      -
      排考名称
      - -
      -
      -
      排考类型
      -
      -
      -
      -
      排考编号
      - -
      -
      -
      生成座位
      -
      -
      -
      -
      是否生成
      -
      -
      -
      -
      -
      -
      -
      -
      - -
      -
      -  新增 -  编辑 -  删除 -  打印 -
      -
      -   生成排考名单 -   清除排考名单 -   安排考试 -
      -
      -
      -
      -
      -
      -
      -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js deleted file mode 100644 index 4a3990b5a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js +++ /dev/null @@ -1,147 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2022-04-14 18:12 - * 描 述：考试记录表 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 220, 400); - $('#AcademicYearNo').lrselect({ - placeholder: "学年", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - //学期 - $('#Semester').lrselect({ - placeholder: "学期", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', - value: 'value', - text: 'text' - }); - $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); - $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); - $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/Form', - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('EPId'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('EPId'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - // 打印 - $('#lr_print').on('click', function () { - $('#gridtable').jqprintTable(); - }); - //  生成排考名单 - $('#lr_generate').on('click', function () { - }); - //  清除排考名单 - $('#lr_cleargenerate').on('click', function () { - }); - //  安排考试 - $('#lr_planks').on('click', function () { - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetPageList', - headData: [ - { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "Semester", width: 100, align: "left" }, - { label: "排考名称", name: "PlanName", width: 100, align: "left" }, - { - label: "排考类型", name: "PlanType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'StudentType', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: "排考编号", name: "PlanCode", width: 100, align: "left" }, - { label: "排考总人数", name: "EPStuCount", width: 100, align: "left" }, - { - label: "生成座位", name: "EPRandom", width: 100, align: "left", - formatter: function (cellvalue) { - return cellvalue == true ? "是" : "否"; - } - }, - { - label: "是否生成", name: "EPGenarate", width: 100, align: "left", - formatter: function (cellvalue) { - return cellvalue == true ? "是" : "否"; - } - }, - { label: "排序号", name: "EPOrder", width: 100, align: "left" }, - ], - mainId: 'EPId', - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} 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 470213e9a..b9446da71 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 @@ -40,10 +40,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/ElectiveMajor/Index?OLPOEId=' + keyValue, width: 1000, height: 700, - //btn: null - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } + btn: null }); } @@ -186,9 +183,8 @@ 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" }, @@ -225,29 +221,18 @@ var bootstrap = function ($, learun) { { label: "通过人数", name: "StuNum", width: 60, align: "left" }, { label: "已报人数(预)", name: "StuNumOfApplyPre", width: 80, align: "left" }, { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" }, - { - label: "是否已选专业", name: "IsElectiveMajor", width: 100, align: "left", formatter: function (cellvalue,row) { - if (!!row.ElectiveMajorList && row.ElectiveMajorList.length > 0) { - return "是"; - } else { - return "否"; - } - } - }, - { - label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left", formatter: function (cellvalue, row) { - var str = ""; - if (!!cellvalue && cellvalue.length > 0) { - for (var i = 0; i < cellvalue.length; i++) { - str += cellvalue[i].Grade + "级" + cellvalue[i].MajorName; - if (i != cellvalue.length - 1) { - str += ","; - } - } - } - return str; - } - } + //{ + // label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) { + // var str = ""; + // for (var i = 0; i < row.ElectiveMajorList.length; i++) { + // str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName; + // if (i != row.ElectiveMajorList.length - 1) { + // str += ","; + // } + // } + // return str; + // } + //} ], mainId: 'Id', isPage: true, 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 ac93283a1..855d8696f 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,24 +26,21 @@ -
      - 选课要求：至少需要选择3门不同的课程 +
      +
      +
      +
      +
      +  报名 +  取消报名
      -
      -
      - -
      -
      -  报名 -  取消报名 -
      -
      -  报名(预) -  取消报名(预) -
      +
      +  报名(预) +  取消报名(预)
      +
      diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js index 3079bf4fd..c426e026f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js @@ -176,7 +176,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').jfGrid({ + $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/GetPageListOfStudent', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, @@ -196,21 +196,6 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "课程类型", name: "LessonTypeId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - console.log(row.LessonTypeId); - - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', - key: row.LessonTypeId, - keyId: 'ltid', - callback: function (_data) { - callback(_data['lessontypename']); - } - }); - } - }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index cc3d59d23..8d45704d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); + $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml deleted file mode 100644 index c612bbfac..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@{ ViewBag.Title = "全院学生成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; } - -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      - -
      -
      -  查询 -
      -
      -
      -
      -  打印 -
      -
      - -
      -
      -
      -
      -
      -
      -
      -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js deleted file mode 100644 index a8553a604..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js +++ /dev/null @@ -1,108 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2019-06-14 11:02 - * 描 述：全院学生成绩查看 - */ -var selectedRow; -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.bind(); - page.bindSelect(); - }, - bind: function () { - // 查询 - $('#btn_Search').on('click', function () { - var p = {}; - p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); - p.Semester = $('#Semester').lrselectGet(); - p.StuNo = $.trim($('#StuNo').val()); - if (p.StuNo == null || p.StuNo == "") { - learun.alert.warning("请输入学号！"); - return; - } - - page.initGird(); - page.search(p); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - //打印 - $('#lr_print').on('click', function () { - var AcademicYearNo = $('#AcademicYearNo').lrselectGet(); - var Semester = $('#Semester').lrselectGet(); - var StuNo = $.trim($('#StuNo').val()); - if (StuNo == null || StuNo == "") { - learun.alert.warning("请输入学号！"); - return; - } - learun.layerForm({ - id: 'AllStuScoreQueryPrint', - title: '学生成绩单', - url: top.$.rootUrl + '/EducationalAdministration/StuScore/AllStuScoreQueryPrint?StuNo=' + StuNo + '&AcademicYearNo=' + AcademicYearNo + '&Semester=' + Semester, - width: 1200, - height: 800, - btn: null - }); - }); - }, - bindSelect: function () { - //学年 - $('#AcademicYearNo').lrselect({ - placeholder: "请选择学年", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData', - value: 'value', - text: 'text' - }); - //学期 - $('#Semester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', - value: 'value', - text: 'text' - }); - }, - initGird: function () { - $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuInfo', - headData: [ - { label: '学号', name: 'StuNo', width: 100, align: "left" }, - { label: '姓名', name: 'StuName', width: 200, align: "left" }, - { label: '专业', name: 'MajorName', width: 100, align: "left" }, - { label: '班级', name: 'ClassName', width: 100, align: "left" }, - { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, - { label: '学期', name: 'Semester', width: 50, align: "left" }, - { label: '科目类型', name: 'LessonSortName', width: 60, align: "left" }, - { label: '科目', name: 'LessonName', width: 300, align: "left" }, - { label: '学分', name: 'StudyScore', width: 50, align: "left" }, - { label: '成绩', name: 'Score', width: 100, align: "left" }, - { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, - { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, - { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, - { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, - ], - mainId: 'StuNo', - isPage: false, - sidx: '', - sord: '', - }); - - //page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - page.search(); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml deleted file mode 100644 index a08a261a5..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - Document - - - - - -
      -

      塔里木职业技术学院学生成绩单

      -
        - -
        - -
        -
        打印
        - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml deleted file mode 100644 index 7f42b08f4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml +++ /dev/null @@ -1,58 +0,0 @@ -@{ - ViewBag.Title = "长阳迎新"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        学年
        -
        -
        -
        -
        学期
        -
        -
        -
        -
        年级
        -
        -
        -
        -
        系部
        -
        -
        -
        -
        专业
        -
        -
        -
        -
        课程
        -
        -
        -
        -
        班级
        -
        -
        -
        -
        -
        -
        -
        -
        - -
        -
        -  初始化补考成绩 -
        -
        -
        -
        -
        -
        -
        -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js deleted file mode 100644 index 672507755..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js +++ /dev/null @@ -1,147 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2021-12-16 10:14 - * 描 述：长阳迎新 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 220, 400); - $('#AcademicYearNo').lrselect({ - placeholder: "学年", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - //学期 - $('#Semester').lrselect({ - placeholder: "学期", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', - value: 'value', - text: 'text' - }); - //年级 - $('#grade').lrselect({ - url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', - value: 'value', - text: 'text' - }); - $('#DeptNo').lrDataSourceSelect({ - allowSearch: true, - code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { - var deptno = ""; - if (val) { - deptno = val.deptno; - } - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, - text: "MajorName", - value: "MajorNo" - }) - } - }); - $('#MajorNo').lrDataSourceSelect({ - allowSearch: true, - code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: - function (val) { - var majorNo = ''; - if (val) { - majorNo = val.MajorNo; - } - $('#ClassNo').lrselectRefresh({ - url: top.$.rootUrl + - '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + - majorNo, - text: "ClassName", - value: "ClassNo" - }); - $('#LessonNo').lrselectRefresh({ - url: top.$.rootUrl + - '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + - majorNo, - text: "LessonName", - value: "LessonNo" - }); - } - }); - $('#ClassNo').lrDataSourceSelect({ - allowSearch: true, - code: 'bjsj', value: 'classno', text: 'classname' - }); - $('#LessonNo').lrDataSourceSelect({ - allowSearch: true, - code: 'LessonInfo', value: 'lessonno', text: 'lessonname' - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 初始化补考成绩 - $('#lr_Init').on('click', function () { - learun.layerConfirm('是否确认初始化补考成绩！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetPageListForUnpass', - headData: [ - { - label: "学号", name: "stuno", width: 80, align: "left" - }, - { - label: "姓名", name: "stuname", width: 100, align: "left" - }, - { label: "课程", name: "LessonName", width: 100, align: "left" }, - { label: "考试年级", name: "Grade", width: 100, align: "left" }, - { - label: "学年", name: "AcademicYearNo", width: 80, align: "left", - //formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'usersex', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - //} - }, - { label: "学期", name: "Semester", width: 150, align: "left" }, - { label: "班级", name: "classname", width: 150, align: "left" }, - { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, - { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, - { label: "成绩", name: "Score2", width: 150, align: "left" }, - ], - mainId: 'ID', - isPage: true, - sidx: 'ClassNo,LessonNo', - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml deleted file mode 100644 index da3304a88..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml +++ /dev/null @@ -1,58 +0,0 @@ -@{ - ViewBag.Title = "二次补考成绩查看"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        学年
        -
        -
        -
        -
        学期
        -
        -
        -
        -
        年级
        -
        -
        -
        -
        系部
        -
        -
        -
        -
        专业
        -
        -
        -
        -
        课程
        -
        -
        -
        -
        班级
        -
        -
        -
        -
        -
        -
        -
        -
        - -
        -
        -  初始化二次补考成绩 -
        -
        -
        -
        -
        -
        -
        -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js deleted file mode 100644 index 2c9f8248a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js +++ /dev/null @@ -1,143 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2021-12-16 10:14 - * 描 述：长阳迎新 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 220, 400); - $('#AcademicYearNo').lrselect({ - placeholder: "学年", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - //学期 - $('#Semester').lrselect({ - placeholder: "学期", - allowSearch: false, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', - value: 'value', - text: 'text' - }); - //年级 - $('#grade').lrselect({ - url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', - value: 'value', - text: 'text' - }); - $('#DeptNo').lrDataSourceSelect({ - code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { - var deptno = ""; - if (val) { - deptno = val.deptno; - } - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, - text: "MajorName", - value: "MajorNo" - }) - } - }); - $('#MajorNo').lrDataSourceSelect({ - code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: - function (val) { - var majorNo = ''; - if (val) { - majorNo = val.MajorNo; - } - $('#ClassNo').lrselectRefresh({ - url: top.$.rootUrl + - '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + - majorNo, - text: "ClassName", - value: "ClassNo" - }); - $('#LessonNo').lrselectRefresh({ - url: top.$.rootUrl + - '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + - majorNo, - text: "LessonName", - value: "LessonNo" - }); - } - }); - $('#ClassNo').lrDataSourceSelect({ - code: 'bjsj', value: 'classno', text: 'classname' - }); - $('#LessonNo').lrDataSourceSelect({ - code: 'LessonInfo', value: 'lessonno', text: 'lessonname' - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 初始化补考成绩 - $('#lr_Init').on('click', function () { - learun.layerConfirm('是否确认初始化二次补考成绩！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetPageListForUnpass', - headData: [ - { - label: "学号", name: "stuno", width: 80, align: "left" - }, - { - label: "姓名", name: "stuname", width: 100, align: "left" - }, - { label: "课程", name: "LessonName", width: 100, align: "left" }, - { label: "考试年级", name: "Grade", width: 100, align: "left" }, - { - label: "学年", name: "AcademicYearNo", width: 80, align: "left", - //formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'usersex', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - //} - }, - { label: "学期", name: "Semester", width: 150, align: "left" }, - { label: "班级", name: "classname", width: 150, align: "left" }, - { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, - { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, - { label: "成绩", name: "Score2", width: 150, align: "left" }, - ], - mainId: 'ID', - isPage: true, - sidx: 'ClassNo,LessonNo', - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} 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 26676a0c3..a3fd15128 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,9 +21,6 @@ -
        - 选课要求：至少需要选择3门不同的课程 -
        diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js index 9da21e054..fa4d52a95 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js @@ -68,7 +68,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').jfGrid({ + $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetPageList', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left"}, @@ -87,21 +87,6 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "课程类型", name: "LessonTypeId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - console.log(row.LessonTypeId); - - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', - key: row.LessonTypeId, - keyId: 'ltid', - callback: function (_data) { - callback(_data['lessontypename']); - } - }); - } - }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js index 48fd142b5..c5f5bb8cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').jfGrid({ + $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', headData: [ { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml deleted file mode 100644 index f7c8f9b3c..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml +++ /dev/null @@ -1,59 +0,0 @@ -@{ - ViewBag.Title = "选修课课程"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        学年
        -
        -
        -
        -
        学期
        -
        -
        -
        -
        校区
        -
        -
        -
        -
        系部
        -
        -
        -
        -
        专业
        -
        -
        -
        -
        班级
        -
        -
        -
        -
        选课状态
        -
        -
        -
        -
        报名状态
        -
        -
        -
        -
        -
        -
        -
        -
        - -
        -
        -
        -
        -
        -
        -
        -@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js deleted file mode 100644 index a773bbc7e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js +++ /dev/null @@ -1,218 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2019-05-15 10:33 - * 描 述：选修课课程 - */ -var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - if ($("#AcademicYearNo").lrselectGet() == "" || $("#AcademicYearNo").lrselectGet() == null || $("#AcademicYearNo").lrselectGet() == undefined) { - top.learun.alert.warning("请先选择学年！"); - return false; - } - if ($("#Semester").lrselectGet() == "" || $("#Semester").lrselectGet() == null || $("#Semester").lrselectGet() == undefined) { - top.learun.alert.warning("请先选择学期！"); - return; - } - page.search(queryJson); - }, 300, 400); - $('#AcademicYearNo').lrselect({ - placeholder: "请选择学年", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - //学期 - $('#Semester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', - value: 'value', - text: 'text' - }); - $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' }); - $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' }); - $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); - $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', - headData: [ - { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, - { label: "学期", name: "Semester", width: 60, align: "left" }, - { - label: "校区", name: "F_SchoolId", width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', - key: value, - keyId: 'f_companyid', - callback: function (_data) { - callback(_data['f_fullname']); - } - }); - } - }, - { - label: "系所", name: "DeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, - { - label: "专业", name: "MajorNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', - key: value, - keyId: 'majorno', - callback: function (_data) { - callback(_data['majorname']); - } - }); - } - }, - { - label: "班级", name: "ClassNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', - key: value, - keyId: 'classno', - callback: function (_data) { - callback(_data['classname']); - } - }); - } - }, - { label: "学号", name: "StuNo", width: 100, align: "left" }, - { label: "姓名", name: "StuName", width: 100, align: "left" }, - { - label: "性别", name: "GenderNo", width: 80, align: "left", - formatter: function (cellvalue) { - return cellvalue == true ? "男" : "女"; - } - }, - { - label: "选课状态", name: "Id", width: 100, align: "left", - formatter: function (cellvalue, row) { - if (cellvalue == null || cellvalue == undefined || cellvalue == "") { - return '未报名'; - } else { - return '已报名'; - } - } - }, - { - label: "报名状态", name: "Status", width: 100, align: "left", - formatter: function (cellvalue, row) { - if (cellvalue == 1) { - return '审核中'; - } else if (cellvalue == 2) { - return '报名成功'; - } else if (cellvalue == 3) { - return '报名失败'; - } else { - return '未报名'; - } - } - }, - { label: "所选课程号", name: "LessonNo", width: 100, align: "left" }, - { - label: "所选课程名称", name: "LessonName", width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: row.LessonNo, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, - { label: "课程学分", name: "StudyScore", width: 100, align: "left" }, - { label: "教师编号", name: "EmpNo", width: 100, align: "left" }, - { - label: "教师姓名", name: "EmpName", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', - key: row.EmpNo, - keyId: 'empno', - callback: function (_data) { - callback(_data['empname']); - } - }); - } - }, - { - label: "上课节次", name: "LessonSection", width: 150, align: "left", - formatter: function (cellvalue, row) { - if (cellvalue != "" && cellvalue != undefined && cellvalue != null) { - if (cellvalue.indexOf(',') == -1) { - return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; - } else { - return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; - } - } - } - }, - { label: "上课时间", name: "LessonTime", width: 180, align: "left" }, - { - label: "教室名称", name: "ClassRoomName", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo', - key: row.ClassRoomNo, - keyId: 'classroomno', - callback: function (_data) { - callback(_data['classroomname']); - } - }); - } - }, - { label: "备注", name: "Remark", width: 100, align: "left" }, - ], - mainId: 'StuId', - isPage: true, - sidx: 'StuNo', - sord: 'asc' - }); - }, - search: function (param) { - param = param || {}; - param.EmpNo = learun.clientdata.get(['userinfo']).enCode; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - page.search(); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs index ddb78929f..50cb98846 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs @@ -1,5 +1,4 @@ -using System; -using Learun.Application.Form; +using Learun.Application.Form; using Learun.Util; using System.Collections.Generic; using System.Web.Mvc; @@ -332,20 +331,12 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers [ValidateInput(false)] public ActionResult SaveInstanceForms(string data) { - try + List list = data.ToObject>(); + foreach (var item in list) { - List list = data.ToObject>(); - foreach (var item in list) - { - formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); - } - return Success("保存成功！"); + formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); } - catch (Exception e) - { - return Fail("输入字段超过限定长度，请精简内容后再试。"); - } - + return Success("保存成功！"); } /// /// 删除自定义表单数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml index d85c010ba..ce5fadf56 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml @@ -64,7 +64,7 @@
        -
        条件筛选Sql语句*
        +
        请填写Sql语句*
        diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js index 4eefbb4dd..883981420 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js @@ -366,18 +366,19 @@ var bootstrap = function ($, learun) { $('#step-1').lrSetFormData(data.module); $('#F_FormId').lrselectSet(data.relation.F_FormId); - $("#F_CloseDoSql").val(data.relation.F_CloseDoSql); + var settingJson = JSON.parse(data.relation.F_SettingJson); $('[name="formOpenType"][value="' + settingJson.layer.opentype + '"]').attr('checked', 'checked'); $('#fromWidth').val(settingJson.layer.width); $('#fromHeight').val(settingJson.layer.height); + $('[name="queryDatetime"][value="' + settingJson.query.isDate + '"]').attr('checked', 'checked'); $('#queryDatetime').lrselectSet(settingJson.query.DateField); $('#queryWidth').val(settingJson.query.width); $('#queryHeight').val(settingJson.query.height); queryData = settingJson.query.fields; - + console.log(queryData); $('#query_girdtable').jfGridSet('refreshdata', queryData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js index 49678ffae..5bd0c94fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js @@ -15,7 +15,6 @@ var relation; var mainTablePk = ""; var mainTable = ""; var mainCompontId = ""; -var sqlwhere = ""; var bootstrap = function ($, learun) { "use strict"; @@ -29,7 +28,7 @@ var bootstrap = function ($, learun) { relation = data.relation; settingJson = JSON.parse(data.relation.F_SettingJson); formScheme = JSON.parse(data.scheme.F_Scheme); - sqlwhere = relation.F_CloseDoSql; + for (var i = 0, l = formScheme.dbTable.length; i < l; i++) { var tabledata = formScheme.dbTable[i]; if (tabledata.relationName == "") { @@ -306,9 +305,6 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - if (!!sqlwhere) { - queryJson.sqlwhere = sqlwhere; - } param.queryJson = JSON.stringify(queryJson); $('#gridtable').jfGridSet('reload', param); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index a66d6452e..090db1c3a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -711,13 +711,13 @@ var bootstrap = function ($, learun) { signUrl: signUrl, stamp: stamp }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { - learun.loading(false); - if (_data) { - learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); - learun.frameTab.close(tabIframeId); - } - }); + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { + learun.loading(false); + if (_data) { + learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close(tabIframeId); + } + }); }); }); } @@ -1721,18 +1721,14 @@ var bootstrap = function ($, learun) { formData[_item.field] = processId; point.formData = JSON.stringify(formData); formDataList.push(point); - //liangkun 修复第一次保存失败报错后第二次直接会update - //_item.isUpdate = true; + + _item.isUpdate = true; } }); if (formDataList.length > 0) { $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForms', { data: JSON.stringify(formDataList) }, function (res) { if (res.code == 200) { - //liangkun 修复第一次保存失败报错后第二次直接会update - $.each(nwfForms, function (_index, _item) { - _item.isUpdate = true; - }); monitorSave(); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml index 2adefd6c2..dac19e036 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml @@ -8,9 +8,9 @@
        • 登录日志
          • -
        • 访问日志
          • -
        • 操作日志
          • -
        • 异常日志
          • +
        • 访问日志
          • +
        • 操作日志
          • +
        • 异常日志
        @@ -23,22 +23,10 @@
        -
        -
        -
        -
        操作用户
        - -
        -
        -
        系统功能
        - -
        -
        -
        操作类型
        - -
        -
        -
        + +
        +
        +  查询
        diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js index f89f0c26f..f0b8e0869 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js @@ -51,9 +51,10 @@ var bootstrap = function ($, learun) { }); }); // 查询 - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 200, 400); + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs deleted file mode 100644 index 043d4af3e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs +++ /dev/null @@ -1,141 +0,0 @@ -using Learun.Util; -using System.Data; -using Learun.Application.TwoDevelopment.LogisticsManagement; -using System.Web.Mvc; -using System.Collections.Generic; -using System; - -namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-14 12:05 - /// 描 述：宿舍晚归规则 - /// - public class Acc_DormitoryRuleController : MvcControllerBase - { - private Acc_DormitoryRuleIBLL acc_DormitoryRuleIBLL = new Acc_DormitoryRuleBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - #endregion - - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = acc_DormitoryRuleIBLL.GetPageList(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// - /// 主键 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var Acc_DormitoryRuleData = acc_DormitoryRuleIBLL.GetAcc_DormitoryRuleEntity(keyValue); - var jsonData = new - { - Acc_DormitoryRule = Acc_DormitoryRuleData, - }; - return Success(jsonData); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - acc_DormitoryRuleIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity) - { - Acc_DormitoryRuleEntity entity = strEntity.ToObject(); - DateTime time; - bool flag = DateTime.TryParse(entity.LateReturnTime, out time); - if (!flag) - { - return Fail("晚归时间格式不正确！"); - } - - if (!(entity.PushHour >= 0 && entity.PushHour <= 23)) - { - return Fail("推送时间点填写不正确！"); - } - - var model = acc_DormitoryRuleIBLL.GetEnableEntity(); - if (entity.IsEnable == 1) - { - if (string.IsNullOrEmpty(keyValue) && model != null) - { - return Fail("只能有一个启用的规则！"); - } - else if (!string.IsNullOrEmpty(keyValue) && model != null && model.Id != keyValue) - { - return Fail("只能有一个启用的规则！"); - } - } - acc_DormitoryRuleIBLL.SaveEntity(keyValue, entity); - - return Success("保存成功！"); - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs index 24e3ad8cf..94c336d32 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs @@ -7,7 +7,6 @@ using System.Web.Helpers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; -using System.Linq; namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { @@ -33,31 +32,26 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { return View(); } - /// - /// 分配宿舍 - /// - /// - [HttpGet] - public ActionResult IndexDistribution() - { - return View(); - } + ///// + ///// 表单页 + ///// + ///// + //[HttpGet] + //public ActionResult Form() + //{ + // return View(); + //} /// /// 带参数的表单页 /// /// [HttpGet] - public ActionResult Form(string ParentID = null, string ParentName = null, string keyValue = null) + public ActionResult Form(string ParentID = null, string ParentName = null) { ViewBag.ParentID = ParentID; ViewBag.ParentName = ParentName; ViewBag.BuildType = accommodationIBLL.GetBuildType(ParentID); - if (!string.IsNullOrEmpty(keyValue)) - { - ViewBag.BuildType = accommodationIBLL.GetParentBuildType(keyValue); - } - return View(); } @@ -143,70 +137,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return View(); } - /// - /// 分配系 - /// - /// - [HttpGet] - public ActionResult FormDept() - { - return View(); - } - /// - /// 分配专业和班级 - /// - /// - [HttpGet] - public ActionResult FormClass() - { - return View(); - } - /// - /// 分配宿舍 - /// - /// - [HttpGet] - public ActionResult FormRoom() - { - return View(); - } - /// - /// 床位管理 - /// - /// - [HttpGet] - public ActionResult IndexBed() - { - return View(); - } - /// - /// 床位管理 - /// - /// - [HttpGet] - public ActionResult FormBed() - { - return View(); - } - /// - /// 分类管理 - /// - /// - [HttpGet] - public ActionResult FormClassify() - { - return View(); - } - /// - /// 分类管理 - /// - /// - [HttpGet] - public ActionResult IndexClassify() - { - return View(); - } + + #endregion @@ -234,38 +167,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success(jsonData); } - /// - /// 获取床位数据 - /// - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetBedListByRoomId(string RoomId) - { - var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo); - return Success(data); - } - /// - /// 获取分类数据 - /// - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetClassifyList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = accommodationIBLL.GetClassifyList(paginationobj, queryJson).OrderBy(x => x.DNo); - //var jsonData = new - //{ - // rows = data, - // total = paginationobj.total, - // page = paginationobj.page, - // records = paginationobj.records - //}; - return Success(data); - } /// /// 获取宿舍楼数据 @@ -368,19 +269,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers var data = accommodationIBLL.GetTreeNew(); return Success(data); } - /// - /// 获取上级树形数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetClassifyTree() - { - var data = accommodationIBLL.GetClassifyTree(); - return Success(data); - } - - #endregion #region 提交数据 @@ -398,18 +286,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success("删除成功！"); } /// - /// 删除 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteBed(string keyValue, string ParentID) - { - accommodationIBLL.DeleteBed(keyValue, ParentID); - return Success("删除成功！"); - } - /// /// 保存实体数据（新增、修改） /// 主键 /// @@ -423,54 +299,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers accommodationIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) - { - Acc_DormitoryBuildEntity entity = strEntity.ToObject(); - accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); - return Success("保存成功！"); - } - /// - /// 寝室分配系 - /// 主键 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveDeptClass(string keyValue, string strEntity, int type) - { - Acc_DormitoryBuildEntity entity = strEntity.ToObject(); - accommodationIBLL.SaveDeptClass(keyValue, entity, type); - return Success("保存成功！"); - } - - /// - /// 寝室分配床位 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveRoom(string RoomId, List list) - { - //List list = strEntity.ToObject>(); - string res = accommodationIBLL.SaveRoom(RoomId, list); - if (!string.IsNullOrEmpty(res)) - { - return Fail(res); - } - - return Success("保存成功！"); - } /// /// 学生宿舍的单元、楼层、房间、床位添加 @@ -483,6 +312,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult DormitoryAdd(string keyValue, string strEntity) { + //dynamic entity = JsonConvert.DeserializeObject(strEntity); + //var ElementNum = entity.ElementNum; + //var FloorNum = entity.FloorNum; + //var RoomNum = entity.RoomNUm; + //var BedNum = entity.BedNum; JObject jsonEntity = JObject.Parse(strEntity); var elementNum = int.Parse(jsonEntity["ElementNum"].ToString()); @@ -510,7 +344,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers } - + /// /// 同步宿舍信息数据 /// @@ -519,7 +353,10 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { accommodationIBLL.SyncData(); return Success("同步成功"); + + } + //public ActionResult DormitoryAdd(string a,string ) #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs deleted file mode 100644 index 10d1f7135..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs +++ /dev/null @@ -1,245 +0,0 @@ -using Learun.Util; -using System.Data; -using Learun.Application.TwoDevelopment.LogisticsManagement; -using System.Web.Mvc; -using System.Collections.Generic; -using System.Linq; -using System; - -namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-10 10:06 - /// 描 述：学生归宿管理 - /// - public class DormitoryReturnController : MvcControllerBase - { - private DormitoryReturnIBLL dormitoryReturnIBLL = new DormitoryReturnBLL(); - private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult FormOut() - { - return View(); - } - - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult FormReturn() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult IndexReport() - { - return View(); - } - - #endregion - - #region 获取数据 - /// - /// 获取左侧树形数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetTree() - { - var data = dormitoryReturnIBLL.GetTree(); - return Success(data); - } - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = dormitoryReturnIBLL.GetPageList(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// - /// 主键 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var Acc_DormitoryReturnData = dormitoryReturnIBLL.GetAcc_DormitoryReturnEntity(keyValue); - var jsonData = new - { - Acc_DormitoryReturn = Acc_DormitoryReturnData, - }; - return Success(jsonData); - } - /// - /// 获取下拉框数据 - /// - /// - [HttpGet] - public ActionResult GetDept() - { - var data = accommodationIBLL.GetDept(); - - return Success(data); - } - /// - /// 获取下拉框数据 - /// - /// - [HttpGet] - public ActionResult GetMajor(string strWhere) - { - var data = accommodationIBLL.GetMajor(strWhere); - - return Success(data); - } - /// - /// 获取下拉框数据 - /// - /// - [HttpGet] - public ActionResult GetClass(string strWhere) - { - var data = accommodationIBLL.GetClass(strWhere); - - return Success(data); - } - - [HttpGet] - public ActionResult GetReportList(string queryJson) - { - List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); - var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); - List list2 = new List(); - foreach (var item in list) - { - var name = item.Key == 1 ? "已归宿" : "未归宿"; - list2.Add(new { name = name, value = item.num }); - - } - return JsonResult(list2); - } - - /// - /// - /// - /// - public ActionResult GetReportData(string queryJson) - { - List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); - var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); - List list2 = new List(); - List list1 = new List(); - foreach (var item in list) - { - var name = item.Key == 1 ? "已归宿" : "未归宿"; - list2.Add(new { name = name, value = item.num }); - list1.Add(name); - - } - return Success(new { list1, list2 }); - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - dormitoryReturnIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveData(string keyValue, string strEntity) - { - Acc_DormitoryReturnEntity entity = strEntity.ToObject(); - dormitoryReturnIBLL.SaveData(keyValue, entity); - - return Success("保存成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string type, string strEntity) - { - Acc_DormitoryReturnEntity entity = strEntity.ToObject(); - dormitoryReturnIBLL.SaveEntity(type, entity); - - return Success("保存成功！"); - } - - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml deleted file mode 100644 index 100ee31f8..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@{ - ViewBag.Title = "宿舍晚归规则"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
        -
        -
        晚归时间*
        - -
        -
        -
        推送人*
        -
        -
        -
        -
        推送班主任*
        -
        -
        -
        -
        推送时间点*
        - -
        -
        -
        启用*
        -
        -
        -
        -@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js deleted file mode 100644 index 2dab9f792..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js +++ /dev/null @@ -1,62 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2022-03-14 12:05 - * 描 述：宿舍晚归规则 - */ -var acceptClick; -var keyValue = request('keyValue'); -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - $('.lr-form-wrap').lrscroll(); - page.bind(); - page.initData(); - }, - bind: function () { - $('#PushUser').lrDataSourceSelect({ - code: 'teacheruserdata', value: 'f_userid', text: 'f_realname', type: 'multiple' - }); - - $('#ClassDiredctor').lrRadioCheckbox({ - type: 'radio', - code: 'YesOrNoInt', - }); - $('#IsEnable').lrRadioCheckbox({ - type: 'radio', - code: 'YesOrNoInt', - }); - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetFormData?keyValue=' + keyValue, function (data) { - for (var id in data) { - if (!!data[id].length && data[id].length > 0) { - $('#' + id).jfGridSet('refreshdata', data[id]); - } - else { - $('[data-table="' + id + '"]').lrSetFormData(data[id]); - } - } - }); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('body').lrValidform()) { - return false; - } - var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) - }; - $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml deleted file mode 100644 index ebbd5409c..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@{ - ViewBag.Title = "宿舍晚归规则"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
        -
        -
        -
        -
        -
        -
        -
        - -
        -
        -  新增 -  编辑 -  删除 -  打印 -
        -
        -
        -
        -
        -
        -
        -@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js deleted file mode 100644 index 4b81ce7c9..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js +++ /dev/null @@ -1,139 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2022-03-14 12:05 - * 描 述：宿舍晚归规则 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form', - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - // 打印 - $('#lr_print').on('click', function () { - $('#gridtable').jqprintTable(); - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetPageList', - headData: [ - { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" }, - { - label: "推送人", name: "PushUser", width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - if (value.indexOf(',') != -1) { - var content = ''; - var timearr = value.split(','); - for (var i = 0; i < timearr.length; i++) { - learun.clientdata.getAsync('custmerData', - { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', - key: timearr[i], - keyId: 'f_userid', - callback: function (_data) { - content += _data['f_realname']; - } - }); - } - content = content.substring(0, content.length - 1); - callback(content); - } else { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', - key: value, - keyId: 'f_userid', - callback: function (_data) { - callback(_data['f_realname']); - } - }); - } - } - }, - { - label: "推送班主任", name: "ClassDiredctor", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'YesOrNoInt', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: "推送时间点", name: "PushHour", width: 100, align: "left" }, - { - label: "启用", name: "IsEnable", width: 100, align: "left", - formatter: function (cellvalue, rowObject) { - return cellvalue == 1 ? "" : ""; - } - - }, - ], - mainId: 'Id', - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml index a6de56ca7..76b48d7ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml @@ -58,7 +58,11 @@
        {{dormitoryName}}{{unitName}}
        @@ -72,9 +76,7 @@
        -
        {{floor.dormitory.Name}} - @*
        {{floor.dormitory.Sex | filter_sex}}
        *@ -
        +
        {{floor.dormitory.Name}}
        {{floor.dormitory.Sex | filter_sex}}
        {{floor.RoomNum}}间 {{floor.BedNum}}床
        @@ -342,7 +344,7 @@ }, addFloor: function () { var url = ""; - url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?ParentID=' + this.unitID + '&ParentName=' + this.unitName; + url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.unitID + '&ParentName=' + this.unitName; top.learun.layerForm({ id: 'form', title: '新增', @@ -359,7 +361,7 @@ top.learun.layerForm({ id: 'form', title: '编辑', - url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id, + url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id, width: 600, height: 400, callBack: function (id) { @@ -391,7 +393,7 @@ '
        ' + '
        ' + this.dormitoryName + '  ' + this.unitName + '
        ' + '
        ' + floor.dormitory.Name + - '' + this.filter_sex(floor.dormitory.Sex) + '' + + this.filter_sex(floor.dormitory.Sex) + '
        ' + '
        ' + '
        负 责 人' + floor.dormitory.Functionary + '
        负责人电话' + floor.dormitory.Phone + '
        ' + @@ -401,14 +403,14 @@ '
        ' + '
        ' + '
          ' + - '
        • 编     号' + floor.dormitory.DNo + '
          • ' + - '
        • 价     格' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' 元
          • ' + + '
        • 编     号' + floor.dormitory.Name + '
          • ' + + '
        • 价     格' + floor.dormitory.Price + ' 元
          • ' + '
        • 房     间' + floor.RoomNum + ' 间
          • ' + '
        • 入     住' + floor.HasStudentNum + ' 人
          • ' + '
        • 空     床' + floor.NoStudentNum + ' 床
          • ' + '
        • 床     位' + floor.BedNum + ' 个
          • ' + - //'
        • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
          • ' + - //'
        • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
          • ' + + '
        • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
          • ' + + '
        • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
          • ' + '
        ' + '
        ' + //'' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml index b85a292ec..b9a5635ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml @@ -62,7 +62,11 @@
        @@ -114,6 +118,155 @@ -@Html.AppendJsFile("/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js deleted file mode 100644 index 7f8aec873..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js +++ /dev/null @@ -1,131 +0,0 @@ -var bootstrap = function ($, learun) { - "use strict"; - var year = ""; - var page = { - init: function () { - page.bind(); - page.initGrid(); - page.initChart(); - }, - bind: function () { - $('#Dept').lrselect({ - width: '150px', - placeholder: "请选择系部", - allowSearch: true, - url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetDept', - value: 'Dept', - text: 'DeptName', - select: function (item) { - if (item) { - $('#Major').lrselectRefresh({ - url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', - param: { strWhere: "m.deptno='" + item.Dept + "'" } - }); - $('#Class').lrselectRefresh({ - //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', - //param: { strWhere: "c.majorno=''" } - }); - } - } - }); - $('#Major').lrselect({ - width: '150px', - placeholder: "请选择专业", - allowSearch: true, - //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', - value: 'Major', - text: 'MajorName', - select: function (item) { - if (item) { - $('#Class').lrselectRefresh({ - url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', - param: { strWhere: "c.majorno='" + item.Major + "'" } - }); - } - } - }); - $('#Class').lrselect({ - width: '150px', - placeholder: "请选择班级", - allowSearch: true, - value: 'Class', - text: 'ClassName' - }); - - //查询 - $('#btn_Search').on('click', function () { - page.search({ Dept: $('#Dept').lrselectGet(), Major: $('#Major').lrselectGet(), Class: $('#Class').lrselectGet() }); - }); - - }, - initGrid: function () { - $(".lr-layout-grid").height($(window).height() - 110); - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportList', - headData: [ - { name: "name", label: "状态", width: 100, align: "center" }, - { name: "value", label: "人数", width: 150, align: "center" } - - ] - }); - page.search(); - }, - initChart: function (queryJson) { - var myChart1 = echarts.init(document.getElementById('main')); - //var myChart2 = echarts.init(document.getElementById('main1')); - queryJson = { - Dept: $('#Dept').lrselectGet(), - Major: $('#Major').lrselectGet(), - Class: $('#Class').lrselectGet() - }; - //console.log('queryJson', queryJson); - learun.httpAsyncPost(top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportData', { queryJson: JSON.stringify(queryJson) }, function (res) { - if (res.code == 200) { - var option = { - title: { - text: '学生归宿统计', - x: 'center' - }, - tooltip: { - trigger: 'item', - formatter: "{a}
        {b} : {c} ({d}%)" - }, - legend: { - orient: 'vertical', - left: 'left', - data: res.data.list1 - }, - series: [ - { - name: '学生归宿', - type: 'pie', - radius: '55%', - center: ['50%', '60%'], - data: res.data.list2, - itemStyle: { - emphasis: { - shadowBlur: 10, - shadowOffsetX: 0, - shadowColor: 'rgba(0, 0, 0, 0.5)' - } - } - } - ] - }; - - myChart1.setOption(option); - - } - }); - - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - page.initChart(param); - } - }; - page.init(); -} - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs index 93f48ee5d..2b26e1d62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs @@ -85,15 +85,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return View(); } /// - /// 班级课程表【教务】 - /// - /// - [HttpGet] - public ActionResult ClassIndexInEducation() - { - return View(); - } - /// /// 课程表【教学调度】 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml deleted file mode 100644 index 4a794077d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml +++ /dev/null @@ -1,159 +0,0 @@ -@{ - ViewBag.Title = "班级课程表"; - Layout = "~/Views/Shared/_Index.cshtml"; -} - - - -
        -
        -
        -
        -
        -
        -
        -
        - -
        -
        -
        -
        -
        -
        -
        - 查询 -
        - -
        -
        -
        - -
        -
        -
        -
        -
        -
        -
        -
        -
          -
        • 节次/星期
          • -
        • 星期一
          • -
        • 星期二
          • -
        • 星期三
          • -
        • 星期四
          • -
        • 星期五
          • -
        • 星期六
          • -
        • 星期日
          • -
        -
        -
        -
        -
        -
        -
        -
        -
        -
        -@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js") - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js deleted file mode 100644 index 472359edf..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js +++ /dev/null @@ -1,202 +0,0 @@ -var refreshGirdData; -var bootstrap = function ($, learun) { - var startTime; - var endTime; - var page = { - init: function () { - page.bind(); - page.bindSelect(); - }, - loadData: function (param) { - $.lrSetFormWithParam(top.$.rootUrl + '/PersonnelManagement/TimeTable/GetDataInEducation', param, - function (data) { - // 数据处理 - var html = ''; - var weekLists = data.weekList; - for (var i = 1; i < 11; i++) { - (function (arg) { - var args = arg - 1; - var datas = flogs(arg, weekLists, 'time'); - html += ' ' + arg + '节'; - if (datas) { - var lists = datas.list; - html += tdHandles(lists); - } else { - html += tdHandle(arg); - } - html += ''; - })(i); //调用时参数 - } - $('.personT').text(data.schoolName); - $('.perSemester').text(data.semester); - $('.perFestivalsBox table').html(html); - - function flogs(num, data, obj) { - var flog = false; - $.each(data, - function (i, n) { - if (n[obj] == num) { - flog = n; - return; - } - }) - return flog; - } - function flogs2(num, data, obj) { - var arr = new Array(); - $.each(data, - function (i, n) { - if (n[obj] == num) { - arr.push(n); - } - }) - return arr; - } - - //某节课空 - function tdHandle() { - var html = ''; - for (var j = 0; j < 7; j++) { - html += '
        '; - } - return html; - } - - //某节课不空 - function tdHandles(lists) { - var html = ''; - for (var k = 1; k < 8; k++) { - (function (arg) { - var args = arg - 1; - var datas = flogs2(arg, lists, 'day'); - if (datas.length > 0) { - html += ''; - $.each(datas, function (i, item) { - if (i > 0) { - html += '
        '; - } - html += '
        课程：' + - item.curriculum + - '
        ' + - '
        教师：' + - item.teacher + - '
        ' + - '
        班级：' + - item.className + - '
        ' + - '
        教室：' + - item.classRoom + - '
        '; - }); - html += ''; - - } else { - html += '
        '; - } - - })(k); - } - return html; - } - }); - }, - bind: function () { - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - $('#datesearch').lrdate({ - dfdata: [ - { - name: '上周', - begin: function () { return learun.getTime(7); }, - end: function () { - return learun.getTime(1); - } - }, - { - name: '本周', - begin: function () { return learun.getTime(0); }, - end: function () { - return learun.getTime(-6); - } - }, - { - name: '下周', - begin: function () { return learun.getTime(-7); }, - end: function () { - return learun.getTime(-13); - } - }], - // 月 - mShow: false, - premShow: false, - // 季度 - jShow: false, - prejShow: false, - // 年 - ysShow: false, - yxShow: false, - preyShow: false, - yShow: false, - // 默认 - dfvalue: 'currentWeek', - selectfn: function (begin, end) { - startTime = begin; - endTime = end; - page.search(); - } - }); - //查询 - $('#lr_search').on('click', function () { - var p = {}; - p.schoolId = $('#F_SchoolId').lrselectGet(); - p.ClassNo = $('#ClassNo').lrselectGet(); - page.search(p); - }); - }, - bindSelect: function () { - //校区 - $('#F_SchoolId').lrDataSourceSelect({ - code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { - if (!!item) { - // 班级 - $('#ClassNo').lrselectRefresh({ - placeholder: "请选择班级", - allowSearch: true, - url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', - param: { schoolId: item.f_companyid }, - value: 'value', - text: 'text' - }); - } else { - //班级 - $('#ClassNo').lrselectRefresh({ - placeholder: "请选择班级", - allowSearch: true, - url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', - param: { schoolId: "" }, - value: 'value', - text: 'text' - }); - } - } - }); - //班级 - $('#ClassNo').lrselect({ - placeholder: "请选择班级", - allowSearch: true, - url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', - value: 'value', - text: 'text' - }); - }, - search: function (param) { - param = param || {}; - param.StartTime = startTime; - param.EndTime = endTime; - page.loadData(param); - } - }; - page.init(); -}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index 06b7dfc2b..4c8044023 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -557,11 +557,6 @@ namespace Learun.Application.Web.Controllers { return Success(new { pwd = true }); } - //每月1号强制用户修改密码 - if (DateTime.Now.Day == 1 && up == "false") - { - return Success(new { pwd = true }); - } //是否30天未修改密码验证 //获取开关显示配置中“30天未修改密码登录后提示修改”项的配置 if (teachSwitchIBLL.FindFirst("modifypwdtip")) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 74e2a3d31..22c6dcb25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -824,10 +824,6 @@ - - - - @@ -6462,22 +6458,6 @@ - - - - - - - - - - - - - - - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js index f6370ac69..9e0bbba79 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js @@ -35,7 +35,6 @@ var bootstrap = function ($, learun) { } if ($this.val() != $('#NewPwd').val()) { learun.alert.error("两次密码输入不一样"); - return false; } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js index 767cc70ed..e78391a95 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js @@ -2203,7 +2203,6 @@ dfop.rows = 1000000; data = data || dfop.param || {}; dfop.param = data.param || data; - dfop.running.pageparam.page = 1; _jfgrid.reload($self, dfop); break; case 'refresh': diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js index d3bd95e31..a617e48ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js @@ -61,12 +61,6 @@ callBack: function (id) { return top[id].acceptClick(); }, - end: function () { - if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) { - learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30; - learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload'); - } - }, btn: ['导出Excel', '关闭'] }); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index 469130f66..f542e9f12 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -34,7 +34,6 @@ - @@ -79,7 +78,6 @@ - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 2aaaf7c6c..9592e4aee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -143,9 +143,9 @@ - + - + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index 13908fea8..a5634307c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -212,7 +212,6 @@ - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs deleted file mode 100644 index 08c563989..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs +++ /dev/null @@ -1,143 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using Learun.Util; -using Nancy; -using Newtonsoft.Json; - -namespace Learun.Application.WebApi.Modules -{ - public class StuScoreApi : BaseNoLoginApi - { - public StuScoreApi() - : base("/Learun/adms/EducationalAdministration/StuScore") - { - Get["/scoreListByStuInfo"] = GetScoreListByStuInfo; - - } - - private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); - private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); - private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); - private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); - - /// - /// 全院学生成绩查看-打印成绩单 - /// - /// - /// - private Response GetScoreListByStuInfo(dynamic _) - { - var param = this.GetReq(); - - ScoreListByStuInfo result = new ScoreListByStuInfo(); - - var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(param.StuNo); - if (stuInfoBasicEntity != null) - { - result.StuNo = stuInfoBasicEntity.StuNo; - result.StuName = stuInfoBasicEntity.StuName; - result.MajorNo = stuInfoBasicEntity.MajorNo; - result.ClassNo = stuInfoBasicEntity.ClassNo; - if (!string.IsNullOrEmpty(stuInfoBasicEntity.MajorNo)) - { - result.MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo)?.MajorName; - } - if (!string.IsNullOrEmpty(stuInfoBasicEntity.ClassNo)) - { - result.ClassName = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo)?.ClassName; - } - } - var queryJson = JsonConvert.SerializeObject(param); - - var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); - var dataTemp = data.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new ScoreList() - { - AcademicYearNo = x.Key.AcademicYearNo, - Semester = x.Key.Semester, - StuScoreEntityList = x.Select(y => new StuScoreModel() - { - AcademicYearNo = y.AcademicYearNo, - Semester = y.Semester, - LessonSortNo = y.LessonSortNo, - LessonSortName = y.LessonSortName, - LessonNo = y.LessonNo, - LessonName = y.LessonName, - StudyScore = y.StudyScore, - Score = y.Score, - ScoreOfNotPass = y.ScoreOfNotPass, - ScoreOfNotPassTwo = y.ScoreOfNotPassTwo - }).OrderBy(a=>a.LessonSortNo).ThenBy(a=>a.LessonNo).ToList() - }).ToList().OrderByDescending(x=>x.AcademicYearNo).ThenByDescending(x=>x.Semester); - result.ScoreList = dataTemp.ToList(); - - return Success(result); - - } - - public class Model - { - /// - /// 学年（18-19） - /// - public string AcademicYearNo { get; set; } - /// - /// 学期（1） - /// - public string Semester { get; set; } - /// - /// 学号 - /// - public string StuNo { get; set; } - - } - public class ScoreListByStuInfo { - public string StuNo { get; set; } - public string StuName { get; set; } - public string MajorNo { get; set; } - public string MajorName { get; set; } - public string ClassNo { get; set; } - public string ClassName { get; set; } - public List ScoreList { get; set; } - } - public class ScoreList { - public string AcademicYearNo { get; set; } - public string Semester { get; set; } - public List StuScoreEntityList { get; set; } - } - public class StuScoreModel { - public string AcademicYearNo { get; set; } - public string Semester { get; set; } - /// - /// 课程类别码 - /// - public string LessonSortNo { get; set; } - /// - /// 课程类别名称 - /// - public string LessonSortName { get; set; } - public string LessonNo { get; set; } - public string LessonName { get; set; } - /// - /// 学分 - /// - public decimal? StudyScore { get; set; } - /// - /// 成绩 - /// - public decimal? Score { get; set; } - /// - /// 第一次补考成绩 - /// - public string ScoreOfNotPass { get; set; } - /// - /// 第二次补考成绩 - /// - public string ScoreOfNotPassTwo { get; set; } - - } - - } -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 457e01c62..65df96b5e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -13,7 +13,7 @@ using Nancy; namespace Learun.Application.WebApi.Modules { - public class TimeTable : BaseNoLoginApi + public class TimeTable : BaseApi { public TimeTable() : base("/learun/adms/timetable") @@ -21,7 +21,6 @@ namespace Learun.Application.WebApi.Modules Get["/list"] = GetList; Get["/StuList"] = GetStuInfo; Get["/StuLessonInfo"] = GetStuLessonInfo; - Get["/timeTableData"] = GetTimeTableData; } private ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL(); private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL(); @@ -112,68 +111,6 @@ namespace Learun.Application.WebApi.Modules } - - /// - /// 全院课程表【按班级分组】 - /// - /// - /// - private Response GetTimeTableData(dynamic _) - { - var param = this.GetReq(); - - TimeTableData result = new TimeTableData(); - - //开始时间 - var startdate = string.IsNullOrEmpty(param.StartDate) ? DateTime.Today : Convert.ToDateTime(param.StartDate); - var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd"); - var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd"); - result.StartDate = startDate; - result.EndDate = endDate; - - var semesterAndYear = Common.GetSemesterAndYear(startDate); - result.AcademicYearNo = semesterAndYear.AcademicYearLong; - result.Semester = semesterAndYear.Semester; - - //课程表数据 - var timeTableList = new List(); - //必修课课程表 - var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); - timeTableList.AddRange(data); - //选修课课程表 - var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); - timeTableList.AddRange(dataOfElective); - var dataTemp = timeTableList.GroupBy(x => new { x.TeachClassNo, x.ClassName, x.LessonSortNo }).Select(x => new ClassDataList() - { - ClassNo = x.Key.TeachClassNo, - ClassName = x.Key.ClassName, - LessonSortNo = x.Key.LessonSortNo, - TimeTableList = x.Select(y => new TwoDevelopment.EducationalAdministration.TimeTable() - { - AcademicYear = y.AcademicYear, - Semester = y.Semester, - DeptNo = y.DeptNo, - MajorNo = y.MajorNo, - F_SchoolId = y.F_SchoolId, - LessonNo = y.LessonNo, - LessonName = y.LessonName, - LessonDate = y.LessonDate, - LessonTime = y.LessonTime, - EmpNo = y.EmpNo, - EmpName = y.EmpName, - TeachClassNo = y.TeachClassNo, - ClassName = y.ClassName, - ClassRoomNo = y.ClassRoomNo, - ClassroomName = y.ClassroomName, - LessonSortNo = y.LessonSortNo - }).OrderBy(a => a.LessonTime.Substring(0, 1)).ThenBy(a => a.LessonTime.Substring(1)).ToList() - }).OrderBy(x => x.LessonSortNo).ThenBy(x => x.ClassNo).ToList(); - - result.ClassDataList = dataTemp; - - return Success(result); - - } /// /// 数字转中文 @@ -229,30 +166,6 @@ namespace Learun.Application.WebApi.Modules { public string StartDate { get; set; } public string EndDate { get; set; } - /// - /// 班级编号 - /// - public string ClassNo { get; set; } - /// - /// 教师编号 - /// - public string EmpNo { get; set; } } - public class TimeTableData - { - public string AcademicYearNo { get; set; } - public string Semester { get; set; } - public string StartDate { get; set; } - public string EndDate { get; set; } - public List ClassDataList { get; set; } - } - public class ClassDataList - { - public string ClassNo { get; set; } - public string ClassName { get; set; } - public string LessonSortNo { get; set; } - public List TimeTableList { get; set; } - } - } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs index a6ac7efe5..4d9dec5ce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs @@ -514,9 +514,9 @@ namespace Learun.Application.Base.AuthorizeModule case 8: // ѧϵ { var empinfo = dataAuthorizeService.GetEmpInfoEntityByNo(userInfo.account); - if (empinfo != null&&empinfo.Rows.Count>0&&empinfo.Rows[0]["DeptNo"]!=null) + if (empinfo != null&&!string.IsNullOrEmpty(empinfo.DeptNo)) { - text = empinfo.Rows[0]["DeptNo"].ToString(); + text = empinfo.DeptNo; } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs index a96feced9..3c3870537 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs @@ -2,7 +2,6 @@ using Learun.DataBase.Repository; using Learun.Util; using System; using System.Collections.Generic; -using System.Data; using System.Text; namespace Learun.Application.Base.AuthorizeModule @@ -266,11 +265,11 @@ namespace Learun.Application.Base.AuthorizeModule #endregion - public DataTable GetEmpInfoEntityByNo(string keyValue) + public dynamic GetEmpInfoEntityByNo(string keyValue) { try { - return this.BaseRepository("CollegeMIS").FindTable("select * from EmpInfo where EmpNo='"+keyValue+"'"); + return this.BaseRepository("CollegeMIS").FindEntity("select * from EmpInfo where EmpNo='"+keyValue+"'"); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs index 1948b9075..1e3296b7e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs @@ -902,11 +902,6 @@ namespace Learun.Application.Form queryParamTemp.Add("lrend", queryParam["lrend"].ToDate()); querySql += " AND (" + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " >=@lrbegin AND " + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " <=@lrend ) "; } - //自定义sql查询条件 - else if (queryParam != null && !queryParam["sqlwhere"].IsEmpty()) - { - querySql += " "+ queryParam["sqlwhere"].ToString(); - } else if (queryParam != null) // 复合条件查询 { @@ -937,7 +932,7 @@ namespace Learun.Application.Form { queryParam.Add(item.Key, item.Value); } - + return querySql; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs deleted file mode 100644 index 9eeeea5b6..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Learun.Application.TwoDevelopment.EducationalAdministration; -using System.Data.Entity.ModelConfiguration; - -namespace Learun.Application.Mapping -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-04-14 18:12 - /// 描 述：考试记录表 - /// - public class Exam_ExamPlanMap : EntityTypeConfiguration - { - public Exam_ExamPlanMap() - { - #region 表、主键 - //表 - this.ToTable("EXAM_EXAMPLAN"); - //主键 - this.HasKey(t => t.EPId); - #endregion - - #region 配置关系 - #endregion - } - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 4e681e02f..412f8b965 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -103,8 +103,6 @@ - - @@ -563,16 +561,6 @@ - - - - - - - - - - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs deleted file mode 100644 index 912286693..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Learun.Application.TwoDevelopment.LogisticsManagement; -using System.Data.Entity.ModelConfiguration; - -namespace Learun.Application.Mapping -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-10 10:06 - /// 描 述：学生归宿管理 - /// - public class Acc_DormitoryReturnMap : EntityTypeConfiguration - { - public Acc_DormitoryReturnMap() - { - #region 表、主键 - //表 - this.ToTable("ACC_DORMITORYRETURN"); - //主键 - this.HasKey(t => t.Id); - #endregion - - #region 配置关系 - #endregion - } - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs deleted file mode 100644 index f56e03bcd..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Learun.Application.TwoDevelopment.LogisticsManagement; -using System.Data.Entity.ModelConfiguration; - -namespace Learun.Application.Mapping -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-14 12:05 - /// 描 述：宿舍晚归规则 - /// - public class Acc_DormitoryRuleMap : EntityTypeConfiguration - { - public Acc_DormitoryRuleMap() - { - #region 表、主键 - //表 - this.ToTable("ACC_DORMITORYRULE"); - //主键 - this.HasKey(t => t.Id); - #endregion - - #region 配置关系 - #endregion - } - } -} - 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 12e74d8e0..058d33054 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 @@ -74,57 +74,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { //参考写法 - var queryParam = queryJson.ToJObject(); + //var queryParam = queryJson.ToJObject(); // 虚拟参数 - var dp = new DynamicParameters(new { }); - + //var dp = new DynamicParameters(new { }); + //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(fieldSql); - strSql.Append(" FROM ArrangeLessonTerm t where 1=1 "); - - if (!queryParam["AcademicYearNo"].IsEmpty()) - { - dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); - strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); - } - if (!queryParam["Semester"].IsEmpty()) - { - dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); - strSql.Append(" AND t.Semester = @Semester "); - } - if (!queryParam["DeptNo"].IsEmpty()) - { - dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); - strSql.Append(" AND t.DeptNo = @DeptNo "); - } - if (!queryParam["MajorNo"].IsEmpty()) - { - dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); - strSql.Append(" AND t.MajorNo = @MajorNo "); - } - if (!queryParam["LessonNo"].IsEmpty()) - { - dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); - strSql.Append(" AND t.LessonNo = @LessonNo "); - } - if (!queryParam["TeachClassNo"].IsEmpty()) - { - dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String); - strSql.Append(" AND t.TeachClassNo like @TeachClassNo "); - } - if (!queryParam["EmpNo"].IsEmpty()) - { - dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); - strSql.Append(" AND t.EmpNo = @EmpNo "); - } - if (!queryParam["ClassroomNo"].IsEmpty()) - { - dp.Add("ClassroomNo", queryParam["ClassroomNo"].ToString(), DbType.String); - strSql.Append(" AND t.ClassroomNo = @ClassroomNo "); - } - - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + strSql.Append(" FROM ArrangeLessonTerm t "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); } catch (Exception ex) { @@ -726,7 +684,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest 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` - WHERE 1=1 AND c.number IS NOT NULL AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); + WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); if (LessonList.Count() > 0) { @@ -800,7 +758,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_curriculum curriculum ON curriculum.id = a.curriculum LEFT JOIN tb_classroom room ON room.id = a.classroom LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher - WHERE a.type='1' and semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); + WHERE semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync(@"SELECT * FROM TeachClass WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); @@ -889,7 +847,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_course cour ON cour.id= p.`course` LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester - + "' AND sc.sid = '" + entity.F_SchoolId + "' AND curr.`ification` ='1' ORDER BY p.`major` "); + + "' AND sc.sid = '" + entity.F_SchoolId + "' ORDER BY p.`major` "); var majorData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); var lessonData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); 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 b95b6846f..b57de4c9d 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,23 +200,6 @@ 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(), @@ -227,7 +210,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration LessonNo = item.paike.curriculunNumber, LessonName = item.paike.curriculunName, LessonSortNo = "2", - LessonTime = tmplessontime, + LessonTime = (item.paike.section == "7" ? "16:20-17:05" : "17:15-18:00"), 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/ElectiveMajor/ElectiveMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs index 106cc3bd4..4152e37ad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs @@ -4,7 +4,6 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Data; -using System.Linq; using System.Text; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -262,23 +261,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var now = DateTime.Now; var loginInfo = LoginUserInfo.Get(); - var list = db.FindList(x => x.OLPOEId == olpoeId); //添加 foreach (var item in dataList) { - //判断是否已选 - if (list.Where(x => x.MajorId == item.ID).Count() <= 0) - { - var entity = new ElectiveMajorEntity(); - entity.Create(); - entity.OLPOEId = olpoeId; - entity.MajorId = item.ID; - entity.Grade = item.Grade; - entity.CreateUserId = loginInfo.userId; - entity.CreateUserName = loginInfo.realName; - entity.CreateDate = now; - db.Insert(entity); - } + var entity = new ElectiveMajorEntity(); + entity.Create(); + entity.OLPOEId = olpoeId; + entity.MajorId = item.ID; + entity.Grade = item.Grade; + entity.CreateUserId = loginInfo.userId; + entity.CreateUserName = loginInfo.realName; + entity.CreateDate = now; + db.Insert(entity); } db.Commit(); } 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 9fe409667..19090038e 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=>Convert.ToInt32(m.LessonSection)); + var deldatalist = db.FindList(m => m.EmId == keyValue).OrderBy(m=>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=>Convert.ToInt32(c.LessonSection)); + ids.Contains(m.Id)).OrderBy(c=>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/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 0e1492ada..def26cb76 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -792,10 +792,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - if (!string.IsNullOrEmpty(entity.DeptNo)) - { - model.DeptNo = entity.DeptNo; - } + //if (!string.IsNullOrEmpty(entity.DeptNo)) + //{ + // model.DeptNo = entity.DeptNo; + //} db.Update(model); } } @@ -814,10 +814,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - if (!string.IsNullOrEmpty(entity.DeptNo)) - { - model.DeptNo = entity.DeptNo; - } + //if (!string.IsNullOrEmpty(entity.DeptNo)) + //{ + // model.DeptNo = entity.DeptNo; + //} db.Update(model); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs deleted file mode 100644 index 8fd0c72b6..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs +++ /dev/null @@ -1,125 +0,0 @@ -using Learun.Util; -using System; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.EducationalAdministration -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-04-14 18:12 - /// 描 述：考试记录表 - /// - public class Exam_ExamPlanBLL : Exam_ExamPlanIBLL - { - private Exam_ExamPlanService exam_ExamPlanService = new Exam_ExamPlanService(); - - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - return exam_ExamPlanService.GetPageList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取Exam_ExamPlan表实体数据 - /// - /// 主键 - /// - public Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue) - { - try - { - return exam_ExamPlanService.GetExam_ExamPlanEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - exam_ExamPlanService.DeleteEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - public void SaveEntity(string keyValue, Exam_ExamPlanEntity entity) - { - try - { - exam_ExamPlanService.SaveEntity(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs deleted file mode 100644 index 33f884d50..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs +++ /dev/null @@ -1,90 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Learun.Application.TwoDevelopment.EducationalAdministration -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-04-14 18:12 - /// 描 述：考试记录表 - /// - public class Exam_ExamPlanEntity - { - #region 实体成员 - /// - /// EPId - /// - [Column("EPID")] - public string EPId { get; set; } - /// - /// 学年 - /// - [Column("ACADEMICYEARNO")] - public string AcademicYearNo { get; set; } - /// - /// 学期 - /// - [Column("SEMESTER")] - public int? Semester { get; set; } - /// - /// 排考名称 - /// - [Column("PLANNAME")] - public string PlanName { get; set; } - /// - /// 排考类型 - /// - [Column("PLANTYPE")] - public string PlanType { get; set; } - /// - /// 排考编号 - /// - [Column("PLANCODE")] - public string PlanCode { get; set; } - /// - /// 排考总人数 - /// - [Column("EPSTUCOUNT")] - public int? EPStuCount { get; set; } - /// - /// 是否随机生成座位 - /// - [Column("EPRANDOM")] - public bool? EPRandom { get; set; } - /// - /// 是否已生成 - /// - [Column("EPGENARATE")] - public bool? EPGenarate { get; set; } - /// - /// 排序号 - /// - [Column("EPORDER")] - public int? EPOrder { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.EPId = Guid.NewGuid().ToString(); - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.EPId = keyValue; - } - #endregion - #region 扩展字段 - #endregion - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs deleted file mode 100644 index 2775b00cc..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Learun.Util; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.EducationalAdministration -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-04-14 18:12 - /// 描 述：考试记录表 - /// - public interface Exam_ExamPlanIBLL - { - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// - IEnumerable GetPageList(Pagination pagination, string queryJson); - /// - /// 获取Exam_ExamPlan表实体数据 - /// - /// 主键 - /// - Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue); - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - void DeleteEntity(string keyValue); - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - void SaveEntity(string keyValue, Exam_ExamPlanEntity entity); - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs deleted file mode 100644 index 88bd8b7c0..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs +++ /dev/null @@ -1,188 +0,0 @@ -using Dapper; -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; - -namespace Learun.Application.TwoDevelopment.EducationalAdministration -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-04-14 18:12 - /// 描 述：考试记录表 - /// - public class Exam_ExamPlanService : RepositoryFactory - { - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.EPId, - t.AcademicYearNo, - t.Semester, - t.PlanName, - t.PlanType, - t.PlanCode, - t.EPStuCount, - t.EPRandom, - t.EPGenarate, - t.EPOrder - "); - strSql.Append(" FROM Exam_ExamPlan t "); - strSql.Append(" WHERE 1=1 "); - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - if (!queryParam["AcademicYearNo"].IsEmpty()) - { - dp.Add("AcademicYearNo",queryParam["AcademicYearNo"].ToString(), DbType.String); - strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); - } - if (!queryParam["Semester"].IsEmpty()) - { - dp.Add("Semester",queryParam["Semester"].ToString(), DbType.String); - strSql.Append(" AND t.Semester = @Semester "); - } - if (!queryParam["PlanName"].IsEmpty()) - { - dp.Add("PlanName", "%" + queryParam["PlanName"].ToString() + "%", DbType.String); - strSql.Append(" AND t.PlanName Like @PlanName "); - } - if (!queryParam["PlanType"].IsEmpty()) - { - dp.Add("PlanType",queryParam["PlanType"].ToString(), DbType.String); - strSql.Append(" AND t.PlanType = @PlanType "); - } - if (!queryParam["PlanCode"].IsEmpty()) - { - dp.Add("PlanCode", "%" + queryParam["PlanCode"].ToString() + "%", DbType.String); - strSql.Append(" AND t.PlanCode Like @PlanCode "); - } - if (!queryParam["EPRandom"].IsEmpty()) - { - dp.Add("EPRandom",queryParam["EPRandom"].ToString(), DbType.String); - strSql.Append(" AND t.EPRandom = @EPRandom "); - } - if (!queryParam["EPGenarate"].IsEmpty()) - { - dp.Add("EPGenarate",queryParam["EPGenarate"].ToString(), DbType.String); - strSql.Append(" AND t.EPGenarate = @EPGenarate "); - } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取Exam_ExamPlan表实体数据 - /// - /// 主键 - /// - public Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t=>t.EPId == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - public void SaveEntity(string keyValue, Exam_ExamPlanEntity entity) - { - try - { - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); - } - else - { - entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs index 1bdfcc200..2dd7f2d23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs @@ -42,25 +42,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public IEnumerable GetLessonByMajorNo(string majorNo) - { - try - { - return lessonInfoService.GetLessonByMajorNo(majorNo); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs index 9e56b4fd0..bb89e6e35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs @@ -21,7 +21,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetLessonByMajorNo(string majorNo); /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 96e49ebe8..2bbbdb6c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs @@ -100,25 +100,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public IEnumerable GetLessonByMajorNo(string majorNo) - { - try - { - return this.BaseRepository("CollegeMIS").FindList(x => x.TeachMajorNo == majorNo); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - internal bool GetAny() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs index c7b3e472e..3f3730287 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs @@ -222,8 +222,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string LessonNo2 { get; set; } [NotMapped] public string EmpNo2 { get; set; } - [NotMapped] public string LessonTypeId { get; set; } - /// /// 选课专业列表 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index 6e76ce297..c2ec1f140 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -100,9 +100,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1"); var strSql = new StringBuilder(); - strSql.Append(@"select b.*,leif.LessonTypeId,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id + strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo - left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo left join LessonInfo leif on b.LessonNo=leif.LessonNo + left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo where not exists ( "); //不显示与已选课程 相同课程名称相同教师的课程 strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id "); @@ -359,10 +359,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { list = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); } - //选课专业 - var majorSql = - @"SELECT t.MajorName,t.MajorNo,a.* FROM ElectiveMajor a left join CdMajor t on a.majorid=t.id"; - var electiveMajorList = this.BaseRepository("CollegeMIS").FindList(majorSql); + foreach (var item in list) { //模式二：正式选课 @@ -384,8 +381,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration item.StuNumPre = aaa.Where(x => x.Status == 2).Count(); - //选课专业 - item.ElectiveMajorList = electiveMajorList.Where(x => x.OLPOEId == item.Id).ToList(); } return list; @@ -420,20 +415,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EmId = db.FindEntity(x => x.OLPOEId == OLPEIdOne)?.EmId; var OLPEIdTwo = db.FindEntity(x => x.EmId == EmId && x.OLPOEId != OLPEIdOne).OLPOEId; var lessonInfoEntity = db.FindEntity(x => x.LessonNo == entity.AfterLessonNo); - //选修课开课计划 - db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdOne}' "); - //学生选课表 - db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where OLPEId='{OLPEIdOne}' "); + db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdOne}' "); + db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); db.ExecuteBySql($"update StuSelectLessonListOfElectivePre set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); - //选修合班明细 - db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where EmId='{EmId}' "); - //合班合并结果 - db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}' where EMId='{EmId}' "); - //合班异动数据记录 - db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdTwo}' "); - //选修课程表 - db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); + db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where EmId='{EmId}' "); + db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}' where EMId='{EmId}' "); + db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdTwo}' "); + db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); db.Commit(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs index 690b6a29c..280180925 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs @@ -107,12 +107,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string EmpNo { get; set; } [NotMapped] public string ClassRoomNo { get; set; } - [NotMapped] - public string AfterLessonName { get; set; } - [NotMapped] - public string AfterEmpName { get; set; } - [NotMapped] - public string AfterClassRoomName { get; set; } #endregion } 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 76bd20839..456fd1771 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,12 +177,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //相同时间不能报名 return; } - //相同课程不能报名 - if (sslleListOfNow1.Where(x => x.LessonNo == olpeEntity.LessonNo).Any()) - { - //相同课程不能报名 - return; - } //新增报名数据 var model = new StuSelectLessonListOfElectiveEntity() { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs index f311eb7a9..9fc249220 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs @@ -677,30 +677,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - /// - /// 根据学号/姓名获取学生成绩列表 - /// - /// - /// - public IEnumerable GetScoreListByStuInfo(string queryJson) - { - try - { - return stuScoreService.GetScoreListByStuInfo(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - public List GetStuGraduateInfo(string queryJson) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs index 4be5477b3..5b3681e63 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs @@ -388,44 +388,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// - /// 成绩格式化(补)(重)(选修) + /// 成绩格式化(补)(重) /// [NotMapped] public string ScoreFormat { get; set; } - /// - /// 补考成绩 - /// - [NotMapped] - public string ScoreOfNotPass { get; set; } - /// - /// 二次补考成绩 - /// - [NotMapped] - public string ScoreOfNotPassTwo { get; set; } - /// - /// 课程类别名称 - /// - /// - [NotMapped] - public string LessonSortName { get; set; } - /// - /// 专业名称 - /// - [NotMapped] - public string MajorName { get; set; } - /// - /// 专业排名 - /// - [NotMapped] - public int RankInMajor { get; set; } - /// - /// 班级排名 - /// - [NotMapped] - public int RankInClass { get; set; } - - } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs index 7e987896c..1943c15b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs @@ -182,12 +182,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetScoreListByStuNo(string queryJson); - /// - /// 根据学号/姓名获取学生成绩列表 - /// - /// - /// - IEnumerable GetScoreListByStuInfo(string queryJson); /// /// 获取个人成绩列表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index c10ba0ced..d80ecc687 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1839,7 +1839,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var strSql = new StringBuilder(); strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName "); strSql.Append(" ,case when bb.LessonSortNo='2' then bb.Score else (case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end) end as Score "); - strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score)+'(选修)' else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); + strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score) else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); strSql.Append(" from ( "); strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); @@ -1876,125 +1876,5 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad } } } - - /// - /// 根据学号/姓名获取学生成绩列表 - /// - /// - /// - public IEnumerable GetScoreListByStuInfo(string queryJson) - { - try - { - //参考写法 - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - var tableName = "StuScore"; - if (!queryParam["TableName"].IsEmpty()) - { - tableName = queryParam["TableName"].ToString(); - } - var strSql = new StringBuilder(); - strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,bb.Score,sp.Score as ScoreOfNotPass,spt.Score as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); - strSql.Append(" from ( "); - strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); - strSql.Append(" where 1=1 and s.CheckMark='1' "); - if (!queryParam["AcademicYearNo"].IsEmpty()) - { - dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); - strSql.Append(" and s.AcademicYearNo=@AcademicYearNo "); - } - if (!queryParam["Semester"].IsEmpty()) - { - dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); - strSql.Append(" and s.Semester=@Semester "); - } - if (!queryParam["StuNo"].IsEmpty()) - { - dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); - strSql.Append(" and s.StuNo=@StuNo "); - } - if (!queryParam["StuName"].IsEmpty()) - { - dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); - strSql.Append(" and s.StuName=@StuName "); - } - strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo ) as bb "); - strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); - strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); - strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); - strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' "); - strSql.Append(" left join CdMajor cm on bb.MajorNo= cm.MajorNo and cm.CheckMark='1' "); - strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' "); - - var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); - - //计算专业排名，班级排名 - if (result.Any()) - { - var temp = result.GroupBy(x=>new { x.AcademicYearNo,x.Semester}).Select(x => new StuScoreEntity() - { - AcademicYearNo=x.Key.AcademicYearNo, - Semester=x.Key.Semester, - StuNo=x.FirstOrDefault().StuNo, - ClassNo=x.FirstOrDefault().ClassNo, - MajorNo=x.FirstOrDefault().MajorNo - }).ToList(); - if (temp.Any()) - { - foreach (var item in temp) - { - //专业排名 - var ml = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.MajorNo == item.MajorNo && x.CheckMark == "1"); - var mlGroup = ml.GroupBy(x => x.StuNo).Select(x => new - { - StuNo = x.Key, - TotalScore = x.Select(y => y.Score).Sum() - }).OrderByDescending(x => x.TotalScore); - if (mlGroup.Any()) - { - var rank = mlGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); - item.RankInMajor = rank + 1; - } - //班级排名 - var cl = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.ClassNo == item.ClassNo && x.CheckMark == "1"); - var clGroup = cl.GroupBy(x => x.StuNo).Select(x => new - { - StuNo = x.Key, - TotalScore = x.Select(y => y.Score).Sum() - }).OrderByDescending(x => x.TotalScore); - if (clGroup.Any()) - { - var rank = clGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); - item.RankInClass = rank + 1; - } - } - } - foreach (var ii in result) - { - ii.RankInMajor = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInMajor; - ii.RankInClass = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInClass; - } - - } - - return result; - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - - } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs index 06edde13f..b083b6586 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs @@ -65,25 +65,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) - { - try - { - return stuScoreNotPassService.GetPageListForUnpass(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// /// 获取实体数据 /// 主键 @@ -206,27 +187,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - /// - /// 初始化补考成绩 - /// - public void InitScore() - { - try - { - stuScoreNotPassService.InitScore(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs index d5a83aac9..c937dc615 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs @@ -328,19 +328,5 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion } - - public class NotPassEntity - { - public string stuno { get; set; } - public string stuname { get; set; } - public string LessonName { get; set; } - public string Grade { get; set; } - public string AcademicYearNo { get; set; } - public string Semester { get; set; } - public string classname { get; set; } - public string OrdinaryScore2 { get; set; } - public string TermEndScore2 { get; set; } - public string Score2 { get; set; } - } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs index ad1e1472d..509b479e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs @@ -26,7 +26,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取实体数据 /// 主键 @@ -62,7 +61,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void SaveEntity(string keyValue, StuScoreNotPassEntity entity); - void InitScore(); #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 501189f44..464fdc255 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -163,67 +163,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) - { - try - { - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - var strSql = new StringBuilder(); - strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) -else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, -case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) -else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, -case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) -else CONVERT(varchar,a.Score) end as Score2 "); - strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo "); - strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); - if (!queryParam["AcademicYearNo"].IsEmpty()) - { - strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); - } - if (!queryParam["Semester"].IsEmpty()) - { - strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); - } - if (!queryParam["grade"].IsEmpty()) - { - strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); - } - if (!queryParam["DeptNo"].IsEmpty()) - { - strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); - } - if (!queryParam["MajorNo"].IsEmpty()) - { - strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); - } - if (!queryParam["LessonNo"].IsEmpty()) - { - strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); - } - if (!queryParam["ClassNo"].IsEmpty()) - { - strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); - } - - strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - /// /// 获取实体数据 /// 主键 @@ -403,52 +342,6 @@ else CONVERT(varchar,a.Score) end as Score2 "); } } - /// - /// 初始化补考成绩 - /// - public void InitScore() - { - try - { - string sql = @"insert into StuScoreNotPass -(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, - OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, - StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, - TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, - IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) - select - NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, - OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, - StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', - '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', - IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' - from - ( - select a.* from -StuScore a -left join StuInfoBasic b on b.StuNo=a.StuNo -where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' -and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) -and a.StuNo not in ( -select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo -) -) as bb -order by bb.ScoreId"; - this.BaseRepository("CollegeMIS").ExecuteBySql(sql); - - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs index fa7db1635..d9169e806 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs @@ -65,30 +65,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - /// - /// 二次补考名单查看 - /// - /// - /// - /// - public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) - { - try - { - return stuScoreNotPassTwoService.GetPageListForUnpass(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -188,27 +164,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - /// - /// 初始化二次补考成绩 - /// - public void InitScore() - { - try - { - stuScoreNotPassTwoService.InitScore(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs index fe3be3622..bf26394c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs @@ -27,7 +27,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -58,7 +57,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void DeleteEntity(string keyValue); - void InitScore(); /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index 979fee09a..e13506595 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -249,73 +249,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - /// - /// 二次补考成绩查看 - /// - /// - /// - /// - public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) - { - try - { - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - var strSql = new StringBuilder(); - strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) -else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, -case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) -else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, -case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) -else CONVERT(varchar,a.Score) end as Score2 "); - strSql.Append(@" from StuScoreNotPass a left join StuInfoBasic b on b.StuNo=a.StuNo "); - strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); - if (!queryParam["AcademicYearNo"].IsEmpty()) - { - strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); - } - if (!queryParam["Semester"].IsEmpty()) - { - strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); - } - if (!queryParam["grade"].IsEmpty()) - { - strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); - } - if (!queryParam["DeptNo"].IsEmpty()) - { - strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); - } - if (!queryParam["MajorNo"].IsEmpty()) - { - strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); - } - if (!queryParam["LessonNo"].IsEmpty()) - { - strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); - } - if (!queryParam["ClassNo"].IsEmpty()) - { - strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); - } - - strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion #region 提交数据 @@ -377,58 +310,10 @@ else CONVERT(varchar,a.Score) end as Score2 "); } } - #endregion #region 扩展数据 - /// - /// 初始化二次补考成绩 - /// - public void InitScore() - { - try - { - string sql = @"insert into StuScoreNotPassTwo -(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, - OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, - StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, - TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, - IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) - select - NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, - OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, - StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', - '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', - IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' - from - ( - select a.* from -StuScoreNotPass a -left join StuInfoBasic b on b.StuNo=a.StuNo -where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' -and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) -and a.StuNo not in ( -select StuNo from StuScoreNotPassTwo p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo -) -) as bb -order by bb.ScoreId"; - this.BaseRepository("CollegeMIS").ExecuteBySql(sql); - - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - /// /// 学年下拉框信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs index d27073da4..70f099fe1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs @@ -212,7 +212,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 扩展字段 [NotMapped] public string F_SchoolId { get; set; } - [NotMapped] public string LessonTypeId { get; set; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs index 9bff6fd34..1ff93c134 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs @@ -29,8 +29,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.*,leif.LessonTypeId "); - strSql.Append(" FROM StuSelectLessonListOfElective t left join LessonInfo leif on t.LessonNo=leif.LessonNo "); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM StuSelectLessonListOfElective t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 3b7c60111..187108297 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -279,16 +279,8 @@ - - - - - - - - @@ -1703,62 +1695,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs deleted file mode 100644 index 491d215b1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs +++ /dev/null @@ -1,148 +0,0 @@ -using Learun.Util; -using System; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-14 12:05 - /// 描 述：宿舍晚归规则 - /// - public class Acc_DormitoryRuleBLL : Acc_DormitoryRuleIBLL - { - private Acc_DormitoryRuleService acc_DormitoryRuleService = new Acc_DormitoryRuleService(); - - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - return acc_DormitoryRuleService.GetPageList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取Acc_DormitoryRule表实体数据 - /// - /// 主键 - /// - public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) - { - try - { - return acc_DormitoryRuleService.GetAcc_DormitoryRuleEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - - /// - /// 获取Acc_DormitoryRule表实体数据 - /// - /// - public Acc_DormitoryRuleEntity GetEnableEntity() - { - try - { - return acc_DormitoryRuleService.GetEnableEntity(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - acc_DormitoryRuleService.DeleteEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) - { - try - { - acc_DormitoryRuleService.SaveEntity(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs deleted file mode 100644 index 351f0e912..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs +++ /dev/null @@ -1,90 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-14 12:05 - /// 描 述：宿舍晚归规则 - /// - public class Acc_DormitoryRuleEntity - { - #region 实体成员 - /// - /// Id - /// - [Column("ID")] - public string Id { get; set; } - /// - /// 晚归时间 - /// - [Column("LATERETURNTIME")] - public string LateReturnTime { get; set; } - /// - /// 推送人员 - /// - [Column("PUSHUSER")] - public string PushUser { get; set; } - /// - /// 是否推送班主任 - /// - [Column("CLASSDIREDCTOR")] - public int? ClassDiredctor { get; set; } - /// - /// 推送时间点 - /// - [Column("PUSHHOUR")] - public int? PushHour { get; set; } - /// - /// 是否启用 - /// - [Column("ISENABLE")] - public int? IsEnable { get; set; } - /// - /// CreateTime - /// - [Column("CREATETIME")] - public DateTime? CreateTime { get; set; } - /// - /// CreateUserId - /// - [Column("CREATEUSERID")] - public string CreateUserId { get; set; } - /// - /// UpdateTime - /// - [Column("UPDATETIME")] - public DateTime? UpdateTime { get; set; } - /// - /// UpdateUserId - /// - [Column("UPDATEUSERID")] - public string UpdateUserId { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.Id = Guid.NewGuid().ToString(); - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.Id = keyValue; - } - #endregion - #region 扩展字段 - #endregion - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs deleted file mode 100644 index 22b52a86d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Learun.Util; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-14 12:05 - /// 描 述：宿舍晚归规则 - /// - public interface Acc_DormitoryRuleIBLL - { - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// - IEnumerable GetPageList(Pagination pagination, string queryJson); - /// - /// 获取Acc_DormitoryRule表实体数据 - /// - /// 主键 - /// - Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue); - Acc_DormitoryRuleEntity GetEnableEntity(); - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - void DeleteEntity(string keyValue); - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity); - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs deleted file mode 100644 index 751c2f837..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs +++ /dev/null @@ -1,168 +0,0 @@ -using Dapper; -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; -using System.Data; -using System.Text; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-14 12:05 - /// 描 述：宿舍晚归规则 - /// - public class Acc_DormitoryRuleService : RepositoryFactory - { - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.* - "); - strSql.Append(" FROM Acc_DormitoryRule t "); - strSql.Append(" WHERE 1=1 "); - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取Acc_DormitoryRule表实体数据 - /// - /// 主键 - /// - public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - - /// - /// 获取Acc_DormitoryRule表实体数据 - /// - /// 主键 - /// - public Acc_DormitoryRuleEntity GetEnableEntity() - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.IsEnable == 1); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) - { - try - { - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); - } - else - { - entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs index 0c0866c1e..8dfc1bb3a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs @@ -19,33 +19,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("ID")] public string ID { get; set; } - /// - /// 编号 - /// - [Column("DNO")] - public string DNo { get; set; } - /// /// 名称 /// [Column("NAME")] public string Name { get; set; } /// - /// 宿舍楼 - /// - [Column("APARTMENTID")] - public string ApartmentId { get; set; } - /// - /// 单元 - /// - [Column("UNITID")] - public string UnitId { get; set; } - /// - /// 楼层 - /// - [Column("FLOORID")] - public string FloorId { get; set; } - /// /// 负责人 /// [Column("FUNCTIONARY")] @@ -166,32 +145,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("PLANBEDNUM")] public int? PlanBedNum { get; set; } - - /// - /// 寝室类型（几人寝） - /// - [Column("ROOMTYPE")] - public int? RoomType { get; set; } - /// - /// 入住人数 - /// - [Column("CHECKINSTU")] - public int? CheckInStu { get; set; } - /// - /// 是否归宿 - /// - [Column("ISRETURN")] - public int? IsReturn { get; set; } #endregion #region 扩展字段 - - [NotMapped] - public string ApartmentName { get; set; } - [NotMapped] - public string UnitName { get; set; } - [NotMapped] - public string FloorName { get; set; } /// /// 学生名字 /// @@ -220,13 +176,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [NotMapped] public string bedId { get; set; } - - [NotMapped] - public string DeptName { get; set; } - [NotMapped] - public string MajorName { get; set; } - [NotMapped] - public string ClassName { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs index 41bda8acd..efb5fe22b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs @@ -42,26 +42,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } - - public IEnumerable GetBedListByRoomId(string RoomId) - { - try - { - return accommodationService.GetBedListByRoomId(RoomId); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - public IEnumerable GetAllList() { try @@ -81,25 +61,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - public IEnumerable GetClassifyList(Pagination paginationobj, string queryJson) - { - try - { - return accommodationService.GetClassifyList(paginationobj, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - public object GetDormitoryList() { try @@ -218,27 +179,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } - public string GetParentBuildType(string keyValue) - { - try - { - return accommodationService.GetParentBuildType(keyValue); - - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - - } - /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -311,61 +251,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - public List GetDept() - { - try - { - return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - public List GetMajor(string strWhere) - { - try - { - return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - public List GetClass(string strWhere) - { - try - { - return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// /// 获取左侧树形数据 /// @@ -385,9 +270,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement value = item.ID.ToString(), showcheck = false, checkstate = 0, - isexpand = true, - parentId = item.ParentID == null ? "" : item.ParentID, - title = item.BuildType + isexpand = false, + parentId = item.ParentID == null ? "" : item.ParentID }; @@ -455,49 +339,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } - public List GetClassifyTree() - { - try - { - List list = accommodationService.GetClassifyTree(); - List treeList = new List(); - foreach (Acc_DormitoryBuildEntity item in list) - { - TreeModel node = new TreeModel - { - id = item.ID.ToString(), - text = item.Name.ToString(), - value = item.ID.ToString(), - showcheck = false, - checkstate = 0, - isexpand = false, - parentId = item.ParentID == null ? "" : item.ParentID, - title = string.IsNullOrEmpty(item.BuildType) ? "" : (Convert.ToInt32(item.BuildType) + 1).ToString(), - }; - treeList.Add(node); - - - } - - - return treeList.ToTree(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// /// 根据父id 获取树形数据 @@ -542,7 +386,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - /// + /// /// 根据父id 获取树形数据 /// /// @@ -587,11 +431,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - public bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed, List data) + public bool MatchDormitoryInfo(string stuNo,string dormitory,string unit,string floor,string room,string bed ,List data) { try { - return accommodationService.MatchDormitoryInfo(stuNo, dormitory, unit, floor, room, bed, data); + return accommodationService.MatchDormitoryInfo(stuNo,dormitory,unit,floor,room,bed,data); } catch (Exception ex) @@ -637,31 +481,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - - /// - /// 删除实体数据 - /// 主键 - /// - /// - public void DeleteBed(string keyValue, string ParentID) - { - try - { - accommodationService.DeleteBed(keyValue, ParentID); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// /// 保存实体数据（新增、修改） /// 主键 @@ -686,74 +505,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) - { - try - { - accommodationService.SaveBedEntity(keyValue, ParentID, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - - - /// - /// 分配系 - /// - /// - /// - public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) - { - try - { - accommodationService.SaveDeptClass(keyValue, entity, type); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - public string SaveRoom(string RoomId, List list) - { - try - { - return accommodationService.SaveRoom(RoomId, list); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } /// /// 批量添加单元、楼层、宿舍、床位 @@ -830,6 +581,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs index 2050f1292..41cd164b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs @@ -21,9 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetBedListByRoomId(string RoomId); IEnumerable GetAllList(); - IEnumerable GetClassifyList(Pagination paginationobj,string queryJson); /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -44,9 +42,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// List GetList(); - List GetDept(); - List GetMajor(string strWhere); - List GetClass(string strWhere); /// /// 获取左侧树形数据 /// @@ -55,7 +50,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement string GetDormitoryInfoByStuNo(string val); List GetTree(); List GetTreeNew(); - List GetClassifyTree(); bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed,List data); @@ -74,9 +68,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void DeleteEntity(string keyValue); - void DeleteBed(string keyValue, string ParentID); string GetBuildType(string parentID); - string GetParentBuildType(string keyValue); /// /// 保存实体数据（新增、修改） @@ -84,9 +76,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void SaveEntity(string keyValue, Acc_DormitoryBuildEntity entity); - void SaveBedEntity(string keyValue,string ParentID, Acc_DormitoryBuildEntity entity); - void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type); - string SaveRoom(string RoomId, List list); + /// /// 批量添加单元、楼层、房间、床位 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index ade272d6d..21b627eb3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -51,14 +51,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.ParentID, t.Remark, t.Starred, - t.HasToilet,t.RoomType, -t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, -a.name as ApartmentName,b.name as UnitName,c.Name as FloorName + t.HasToilet, + stb.StuName "); - strSql.Append(" FROM Acc_DormitoryBuild t "); - strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID - left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID - left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); + strSql.Append(" FROM Acc_DormitoryBuild t LEFT JOIN dbo.StuInfoBasic stb ON t.StudentID=stb.StuId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -68,27 +64,6 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); strSql.Append(" AND t.ParentID =@ParentID "); } - //else - //{ - // strSql.Append(" AND t.BuildType ='4' "); - //} - - if (!queryParam["ApartmentId"].IsEmpty()) - { - dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); - strSql.Append(" AND t.ApartmentId =@ApartmentId "); - } - if (!queryParam["UnitId"].IsEmpty()) - { - dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); - strSql.Append(" AND t.UnitId =@UnitId "); - } - if (!queryParam["FloorId"].IsEmpty()) - { - dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); - strSql.Append(" AND t.FloorId =@FloorId "); - } - if (!queryParam["Name"].IsEmpty()) { dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); @@ -101,18 +76,18 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName } if (!queryParam["Dept"].IsEmpty()) { - dp.Add("Dept", queryParam["Dept"].ToString(), DbType.String); - strSql.Append(" AND t.Dept=@Dept "); + dp.Add("Dept", "%" + queryParam["Dept"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Dept Like @Dept "); } if (!queryParam["Class"].IsEmpty()) { - dp.Add("Class", queryParam["Class"].ToString(), DbType.String); - strSql.Append(" AND t.Class=@Class "); + dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Class Like @Class "); } if (!queryParam["Major"].IsEmpty()) { - dp.Add("Major", queryParam["Major"].ToString(), DbType.String); - strSql.Append(" AND t.Major=@Major "); + dp.Add("Major", "%" + queryParam["Major"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Major Like @Major "); } if (!queryParam["Sex"].IsEmpty()) { @@ -129,53 +104,6 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName dp.Add("Leader", "%" + queryParam["Leader"].ToString() + "%", DbType.String); strSql.Append(" AND t.Leader Like @Leader "); } - - if (!queryParam["NoDistribution"].IsEmpty()) - { - var noDistribution = queryParam["NoDistribution"].ToString(); - if (noDistribution.Contains("dept")) - { - strSql.Append(" AND (t.Dept is null or len(t.Dept)=0) "); - } - if (noDistribution.Contains("major")) - { - strSql.Append(" AND (t.Major is null or len(t.Major)=0) "); - } - if (noDistribution.Contains("class")) - { - strSql.Append(" AND (t.Class is null or len(t.Class)=0) "); - } - if (noDistribution.Contains("room")) - { - strSql.Append(" AND (t.CheckInStu is null or len(t.CheckInStu)=0 or t.CheckInStu=0) "); - } - } - if (!queryParam["Distribution"].IsEmpty()) - { - var distribution = queryParam["Distribution"].ToString(); - if (distribution.Contains("dept")) - { - strSql.Append(" AND len(t.Dept)>0 "); - } - if (distribution.Contains("major")) - { - strSql.Append(" AND len(t.Major)>0 "); - } - if (distribution.Contains("class")) - { - strSql.Append(" AND len(t.Class)>0 "); - } - if (distribution.Contains("room")) - { - strSql.Append(" AND t.CheckInStu>0 "); - } - } - - if (!queryParam["SqlParameter"].IsEmpty()) - { - strSql.Append(queryParam["SqlParameter"].ToString()); - } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).OrderBy(a => a.Name).ThenBy(a => a.Name).ToList(); } catch (Exception ex) @@ -190,27 +118,6 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName } } } - - public IEnumerable GetBedListByRoomId(string RoomId) - { - try - { - string sql = $"select ID,Name,DNo,StudentID from Acc_DormitoryBuild where BuildType='5' and ParentID='{RoomId}'"; - return this.BaseRepository("CollegeMIS").FindList(sql); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - public IEnumerable GetAllList() { try @@ -230,95 +137,11 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName } } - - public IEnumerable GetClassifyList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.Name, - t.Address, - t.Campus, - t.Dept, - t.BuildType, - t.Major, - t.Class, - t.Sex, - t.Functionary, - t.Phone, - t.Price, - t.Leader, - t.StudentID, - t.PlanStudentID, - t.ParentID, - t.Remark, - t.Starred, - t.HasToilet,t.RoomType, -t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, -a.name as ApartmentName,b.name as UnitName,c.Name as FloorName - "); - strSql.Append(" FROM Acc_DormitoryBuild t "); - strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID - left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID - left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); - strSql.Append(" WHERE 1=1 and (t.BuildType<>'5' and t.BuildType<>'4') "); - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - if (!queryParam["ParentID"].IsEmpty()) - { - dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); - strSql.Append(" AND t.ParentID =@ParentID "); - } - if (!queryParam["keyword"].IsEmpty()) - { - strSql.Append($" AND t.Name like '%{queryParam["keyword"].ToString()}%' "); - } - if (!queryParam["ApartmentId"].IsEmpty()) - { - dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); - strSql.Append(" AND t.ApartmentId =@ApartmentId "); - } - if (!queryParam["UnitId"].IsEmpty()) - { - dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); - strSql.Append(" AND t.UnitId =@UnitId "); - } - if (!queryParam["FloorId"].IsEmpty()) - { - dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); - strSql.Append(" AND t.FloorId =@FloorId "); - } - - if (!queryParam["Name"].IsEmpty()) - { - dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Name Like @Name "); - } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); - //return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).ToList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - internal string GetBuildType(string parentID) { try { - var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ID == parentID); + var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ParentID == parentID); if (null != entity) { return entity.BuildType; @@ -341,35 +164,6 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName } } - public string GetParentBuildType(string keyValue) - { - try - { - string sql = $@" select BuildType from [dbo].[Acc_DormitoryBuild] where Id=( - select parentid from [dbo].[Acc_DormitoryBuild] where id='{keyValue}')"; - var data = this.BaseRepository("CollegeMIS").FindObject(sql); - if (data == null) - { - return ""; - } - else - { - return data.ToString(); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - internal object GetRoomList(string parentID) { try @@ -624,7 +418,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName floorInfo.dormitory = bed; if (!string.IsNullOrEmpty(bed.StudentID)) { - floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == bed.StudentID); + floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuId == bed.StudentID); } list.Add(floorInfo); } @@ -716,25 +510,6 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName } } - public List GetClassifyTree() - { - try - { - return this.BaseRepository("CollegeMIS").FindList(x => (x.BuildType == "2" || x.BuildType == "1")).ToList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -807,44 +582,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName { try { - return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5" && a.BuildType != "4").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); - - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取非空床的系部专业 班级 - /// - /// - public List GetSelectData(string strWhere) - { - try - { - string sql = - @"select distinct dept,d.DeptName,major,m.MajorName,class,c.ClassName from [dbo].[Acc_DormitoryBuild] t -join CdDept d on t.dept=d.deptno -join CdMajor m on t.major=m.majorno -join ClassInfo c on t.class=c.classno -where t.ID in ( -select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) -)"; - if (!string.IsNullOrEmpty(strWhere)) - { - sql += " and " + strWhere; - } - - return this.BaseRepository("CollegeMIS").FindList(sql).ToList(); + return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); } catch (Exception ex) @@ -860,41 +598,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student } } - /// - /// 获取树形数据(学生归宿) - /// - /// - public List GetSqlTreeForReturn() - { - try - { - List list = new List(); - var roomSql = @"select * from [dbo].[Acc_DormitoryBuild] where ID in ( -select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) -)"; - List roomList = this.BaseRepository("CollegeMIS") - .FindList(roomSql).ToList(); - list = roomList.Union(list).ToList(); - var apartIds = roomList.Select(x => x.ApartmentId).Distinct().ToList(); - var unitIds = roomList.Select(x => x.UnitId).Distinct().ToList(); - var floorIds = roomList.Select(x => x.FloorId).Distinct().ToList(); - var otherList = this.BaseRepository("CollegeMIS").FindList(x => - apartIds.Contains(x.ID) || unitIds.Contains(x.ID) || floorIds.Contains(x.ID)).ToList(); - list = list.Union(otherList).ToList(); - return list.OrderBy(x => x.DNo).OrderBy(x => x.Name).ToList(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } /// /// 根据父id获取数据 /// @@ -1031,10 +734,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student } bedInfo.StudentID = stuInfo.StuId; bedInfo.StuName = stuInfo.StuName; - bedInfo.Dept = stuInfo.DeptNo; - bedInfo.Major = stuInfo.MajorNo; - bedInfo.Class = stuInfo.ClassNo; - bedInfo.Sex = Convert.ToString(stuInfo.GenderNo); this.BaseRepository("CollegeMIS").Update(bedInfo); return true; } @@ -1100,27 +799,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student } } - - public void DeleteBed(string keyValue, string ParentID) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); - UpdateCheckInNum(ParentID); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - public void DeleteAll(string parentid) { var list = this.BaseRepository("CollegeMIS").FindList(a => a.ParentID == parentid).ToList(); @@ -1164,9 +842,7 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student var elementEntity = new Acc_DormitoryBuildEntity { ParentID = keyValue, - ApartmentId = keyValue, Name = i.ToString() + "单元", - DNo = i.ToString(), BuildType = "2",//单元类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -1183,7 +859,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student UpdateTime = DateTime.Now }; elementEntity.Create(); - elementEntity.UnitId = elementEntity.ID; list.Add(elementEntity); //添加楼层 @@ -1194,10 +869,7 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student var floorEntity = new Acc_DormitoryBuildEntity { ParentID = elementEntity.ID, - ApartmentId = keyValue, - UnitId = elementEntity.ID, Name = j.ToString() + "层", - DNo = j.ToString(), BuildType = "3",//楼层类型, Sex = dormitory.Sex, Address = dormitory.Address, @@ -1214,7 +886,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student UpdateTime = DateTime.Now }; floorEntity.Create(); - floorEntity.FloorId = floorEntity.ID; list.Add(floorEntity); //添加房间 @@ -1225,11 +896,7 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student var roomEntity = new Acc_DormitoryBuildEntity { ParentID = floorEntity.ID, - ApartmentId = keyValue, - UnitId = elementEntity.ID, - FloorId = floorEntity.ID, Name = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()) + "室", - DNo = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()), BuildType = "4",//房间类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -1242,7 +909,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student Major = dormitory.Major, Phone = dormitory.Phone, Price = dormitory.Price, - RoomType = bedNum, UpdateBy = currentUser.realName, UpdateTime = DateTime.Now, Starred = "3", @@ -1259,11 +925,7 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student var bedEntity = new Acc_DormitoryBuildEntity { ParentID = roomEntity.ID, - ApartmentId = keyValue, - UnitId = elementEntity.ID, - FloorId = floorEntity.ID, Name = m.ToString() + "床", - DNo = m.ToString(), BuildType = "5", Sex = dormitory.Sex, Address = dormitory.Address, @@ -1613,11 +1275,9 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student } else { - entity.Create(); if (entity.BuildType == "1") { - entity.ApartmentId = entity.ID; - if (string.IsNullOrEmpty(entity.ParentID) || entity.ParentID == "-1") + if (string.IsNullOrEmpty(entity.ParentID)) { var rootNode = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ParentID == null); if (rootNode == null) @@ -1631,7 +1291,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student rootEntity.CreateTime = DateTime.Now; rootEntity.UpdateBy = currentUser.realName; rootEntity.UpdateTime = DateTime.Now; - rootEntity.ApartmentId = rootEntity.ID; entity.ParentID = rootEntity.ID; this.BaseRepository("CollegeMIS").Insert(rootEntity); } @@ -1641,33 +1300,7 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student } } } - else - { - //上一级 - var parentity = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ID == entity.ParentID); - switch (parentity.BuildType) - { - case "1": - entity.ApartmentId = parentity.ID; - entity.UnitId = entity.ID; - break; - case "2": - { - entity.FloorId = entity.ID; - entity.UnitId = parentity.ID; - entity.ApartmentId = parentity.ApartmentId; - } - break; - case "3": - { - entity.FloorId = parentity.ID; - entity.UnitId = parentity.UnitId; - entity.ApartmentId = parentity.ApartmentId; - } - break; - } - } - + entity.Create(); entity.CreateBy = currentUser.realName; entity.CreateTime = DateTime.Now; entity.UpdateBy = currentUser.realName; @@ -1688,157 +1321,6 @@ select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (student } } - - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) - { - var db = this.BaseRepository("CollegeMIS"); - try - { - db.BeginTrans(); - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - db.Update(entity); - } - else - { - var parentEntity = db.FindEntity(ParentID); - entity.Create(); - entity.ApartmentId = parentEntity.ApartmentId; - entity.UnitId = parentEntity.UnitId; - entity.FloorId = parentEntity.FloorId; - entity.ParentID = ParentID; - entity.BuildType = "5"; - db.Insert(entity); - } - db.Commit(); - UpdateCheckInNum(ParentID); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - private void UpdateCheckInNum(string ParentID) - { - try - { - string sql = $@"update [dbo].[Acc_DormitoryBuild] set RoomType=( -select count(1) from [dbo].[Acc_DormitoryBuild] where ParentId='{ParentID}' and BuildType='5' -) -where ID='{ParentID}' -"; - this.BaseRepository("CollegeMIS").ExecuteBySql(sql); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) - { - try - { - if (keyValue.Contains(",")) - { - keyValue = string.Join("','", keyValue.Split(',')); - } - string sql = $"update Acc_DormitoryBuild set "; - if (type == 1) - { - sql += $" Dept='{entity.Dept}' "; - } - else - { - sql += $"Major='{entity.Major}',Class='{entity.Class}'"; - } - - sql += $" where ID in ('{keyValue}')"; - - this.BaseRepository("CollegeMIS").ExecuteBySql(sql); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 分配宿舍 - /// - /// - /// - public string SaveRoom(string RoomId, List list) - { - var db = this.BaseRepository("CollegeMIS").BeginTrans(); - try - { - foreach (var entity in list) - { - //判断该学生是否已分配 - if (!string.IsNullOrEmpty(entity.StudentID)) - { - var count = db.FindList().Count(x => x.StudentID == entity.StudentID && x.ID != entity.ID); - if (count > 0) - { - var stuname = db.FindEntity(x => x.StuNo == entity.StudentID)?.StuName; - return "学生" + stuname + "已分配床位，不可重复分配！"; - } - } - - //分配床位 - string sql = $"update Acc_DormitoryBuild set StudentID='{entity.StudentID}' where ID='{entity.ID}'"; - db.ExecuteBySql(sql); - } - - int checkInStu = list.Where(x => x.StudentID != null).Count(); - string checkInSql = $"update Acc_DormitoryBuild set CheckInStu='{checkInStu}' where ID='{RoomId}'"; - db.ExecuteBySql(checkInSql); - - db.Commit(); - return ""; - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - /// /// 同步宿舍信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs deleted file mode 100644 index 3e91d02ac..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs +++ /dev/null @@ -1,104 +0,0 @@ -using Learun.Util; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-10 10:06 - /// 描 述：学生归宿管理 - /// - public class Acc_DormitoryReturnEntity - { - #region 实体成员 - /// - /// Id - /// - [Column("ID")] - public string Id { get; set; } - /// - /// 宿舍id，关联Acc_DormitoryBuild表 - /// - [Column("DORMITORYBUILDID")] - public string DormitoryBuildId { get; set; } - /// - /// 床位父级 - /// - [Column("PARENTID")] - public string ParentId { get; set; } - - /// - /// 检查日期 - /// - [Column("CHECKDATE")] - public DateTime? CheckDate { get; set; } - /// - /// 出宿时间 - /// - [Column("OUTTIME")] - public DateTime? OutTime { get; set; } - /// - /// 归宿时间 - /// - [Column("RETURNTIME")] - public DateTime? ReturnTime { get; set; } - - /// - /// 备注 - /// - [Column("REMARK")] - public string Remark { get; set; } - /// - /// 创建人 - /// - [Column("CREATEUSERID")] - public string CreateUserId { get; set; } - /// - /// 创建时间 - /// - [Column("CREATETIME")] - public DateTime? CreateTime { get; set; } - /// - /// 修改时间 - /// - [Column("UPDATETIME")] - public DateTime? UpdateTime { get; set; } - /// - /// 修改人 - /// - [Column("UPDATEUSERID")] - public string UpdateUserId { get; set; } - #endregion - - #region 扩展操作 - /// - /// 新增调用 - /// - public void Create() - { - this.Id = Guid.NewGuid().ToString(); - this.CreateTime = DateTime.Now; - this.CreateUserId = LoginUserInfo.Get().userId; - } - /// - /// 编辑调用 - /// - /// - public void Modify(string keyValue) - { - this.Id = keyValue; - this.UpdateTime = DateTime.Now; - this.UpdateUserId = LoginUserInfo.Get().userId; - } - #endregion - #region 扩展字段 - [NotMapped] - public string Name { get; set; } - - #endregion - } -} - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs deleted file mode 100644 index 066f0b3e8..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs +++ /dev/null @@ -1,210 +0,0 @@ -using Learun.Util; -using System; -using System.Data; -using System.Collections.Generic; -using System.Linq; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-10 10:06 - /// 描 述：学生归宿管理 - /// - public class DormitoryReturnBLL : DormitoryReturnIBLL - { - private DormitoryReturnService dormitoryReturnService = new DormitoryReturnService(); - private AccommodationService accommodationService = new AccommodationService(); - - #region 获取数据 - - /// - /// 获取左侧树形数据 - /// - /// - public List GetTree() - { - try - { - List list = accommodationService.GetSqlTreeForReturn(); - List treeList = new List(); - foreach (Acc_DormitoryBuildEntity item in list) - { - TreeModel node = new TreeModel - { - id = item.ID.ToString(), - text = item.Name.ToString(), - value = item.ID.ToString(), - showcheck = false, - checkstate = 0, - isexpand = true, - parentId = item.ParentID == null ? "" : item.ParentID, - title = item.BuildType - - }; - - - treeList.Add(node); - - - } - - - return treeList.ToTree(); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - /// - /// 获取页面显示列表数据 - /// - /// 分页参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - return dormitoryReturnService.GetPageList(pagination, queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - public IEnumerable GetReportList(string queryJson) - { - try - { - return dormitoryReturnService.GetReportList(queryJson); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 获取Acc_DormitoryReturn表实体数据 - /// - /// 主键 - /// - public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) - { - try - { - return dormitoryReturnService.GetAcc_DormitoryReturnEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - dormitoryReturnService.DeleteEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - /// - public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) - { - try - { - dormitoryReturnService.SaveEntity(type, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - - public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) - { - try - { - dormitoryReturnService.SaveData(keyValue, entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowBusinessException(ex); - } - } - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs deleted file mode 100644 index 39401c7d1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Learun.Util; -using System.Data; -using System.Collections.Generic; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-10 10:06 - /// 描 述：学生归宿管理 - /// - public interface DormitoryReturnIBLL - { - #region 获取数据 - List GetTree(); - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// - IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetReportList(string queryJson); - /// - /// 获取Acc_DormitoryReturn表实体数据 - /// - /// 主键 - /// - Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue); - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - void DeleteEntity(string keyValue); - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - void SaveEntity(string type, Acc_DormitoryReturnEntity entity); - void SaveData(string keyValue, Acc_DormitoryReturnEntity entity); - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs deleted file mode 100644 index 94249c21b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs +++ /dev/null @@ -1,273 +0,0 @@ -using Dapper; -using Learun.DataBase.Repository; -using Learun.Util; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; - -namespace Learun.Application.TwoDevelopment.LogisticsManagement -{ - /// - /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 - /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - /// 创 建：超级管理员 - /// 日 期：2022-03-10 10:06 - /// 描 述：学生归宿管理 - /// - public class DormitoryReturnService : RepositoryFactory - { - #region 获取数据 - - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// 查询参数 - /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) - { - try - { - var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.*,a.Name - "); - strSql.Append(" FROM Acc_DormitoryReturn t "); - strSql.Append(" join Acc_DormitoryBuild a on t.DormitoryBuildId=a.ID "); - strSql.Append(" WHERE 1=1 "); - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) - { - dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); - dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); - strSql.Append(" AND ( t.CheckDate >= @startTime AND t.CheckDate <= @endTime ) "); - } - if (!queryParam["OutTime"].IsEmpty()) - { - dp.Add("OutTime", queryParam["OutTime"].ToString(), DbType.String); - strSql.Append(" AND t.OutTime = @OutTime "); - } - if (!queryParam["ParentId"].IsEmpty()) - { - dp.Add("ParentId", queryParam["ParentId"].ToString(), DbType.String); - strSql.Append(" AND t.ParentId = @ParentId "); - } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取统计数据 - /// - /// - /// - public IEnumerable GetReportList(string queryJson) - { - try - { - string sql = @"select (case t.isreturn when 1 then 1 else 0 end) as isreturn,a.Dept,a.Major,a.class from -( -select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) -) t -join Acc_DormitoryBuild a on a.ID=t.parentid where 1=1 -"; - var queryParam = queryJson.ToJObject(); - // 虚拟参数 - var dp = new DynamicParameters(new { }); - if (!queryParam["Dept"].IsEmpty()) - { - sql += $" AND a.Dept = '{queryParam["Dept"].ToString()}'"; - } - if (!queryParam["Major"].IsEmpty()) - { - sql += $" AND a.Major = '{queryParam["Major"].ToString()}'"; - } - if (!queryParam["Class"].IsEmpty()) - { - sql += $" AND a.Class = '{queryParam["Class"].ToString()}'"; - } - return this.BaseRepository("CollegeMIS").FindList(sql); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 获取Acc_DormitoryReturn表实体数据 - /// - /// 主键 - /// - public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) - { - try - { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// - /// 主键 - public void DeleteEntity(string keyValue) - { - try - { - this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存实体数据（新增、修改） - /// - /// 主键 - /// 实体 - public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) - { - var db = this.BaseRepository("CollegeMIS"); - try - { - db.BeginTrans(); - if (type == "1") - { - //学生出宿 - entity.Create(); - entity.CheckDate = Convert.ToDateTime(entity.OutTime.Value.Date); - db.Insert(entity); - - //修改该床位为未归宿 - var sql = $"update Acc_DormitoryBuild set IsReturn=0 where ID='{entity.DormitoryBuildId}'"; - db.ExecuteBySql(sql); - } - else - { - //学生归宿 - //获取今天最后一次出宿的记录 - var outsql = - $"select top 1 * from Acc_DormitoryReturn where DormitoryBuildId='{entity.DormitoryBuildId}' and CheckDate='{DateTime.Now.Date}' order by OutTime desc"; - var model = db.FindList(outsql).FirstOrDefault(); - if (model == null) - { - //新增 - entity.Create(); - entity.ReturnTime = entity.ReturnTime; - entity.CheckDate = Convert.ToDateTime(entity.ReturnTime.Value.Date); - db.Insert(entity); - } - else - { - //修改 - model.ReturnTime = entity.ReturnTime; - model.Remark += " " + entity.Remark; - model.Modify(model.Id); - db.Update(model); - } - - //修改该床位为未归宿 - var sql = $"update Acc_DormitoryBuild set IsReturn=1 where ID='{entity.DormitoryBuildId}'"; - db.ExecuteBySql(sql); - } - - db.Commit(); - } - catch (Exception ex) - { - db.Rollback(); - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - - /// - /// 保存 - /// - /// - /// - public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) - { - try - { - if (!string.IsNullOrEmpty(keyValue)) - { - entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); - } - else - { - entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); - } - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs index d1e0e9d24..5f0ecf4ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs @@ -7,21 +7,17 @@ using System.Threading.Tasks; namespace Learun.Application.WorkFlow { - public class ArrangeLessonTermAttemperMethod : IWorkFlowMethod + public class ArrangeLessonTermAttemperMethod : INodeMethod { ArrangeLessonTermAttemperIBLL arrangeLessonTermAttemperIBLL = new ArrangeLessonTermAttemperBLL(); - - public void Execute(WfMethodParameter parameter) + public void Sucess(string processId) { - if (parameter.code == "agree") - { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, parameter.processId); - } - else - { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, parameter.processId); - } + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, processId); + } + + public void Fail(string processId) + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, processId); } - } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs index 0ed02d72b..f2fdaa45a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs @@ -465,7 +465,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo?.account+"("+ operateLogModel.userInfo.realName+ ")"; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account; logEntity.F_OperateUserId = operateLogModel.userInfo?.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; @@ -495,7 +495,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo?.account + "(" + operateLogModel.userInfo.realName + ")"; + logEntity.F_OperateAccount = operateLogModel.userInfo.account; logEntity.F_OperateUserId = operateLogModel.userInfo.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; From 3b30272787e68476b46e6c428dc4b99d47a3d530 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 15 Apr 2022 17:38:19 +0800 Subject: [PATCH 41/41] =?UTF-8?q?Revert=20"Revert=20"=E8=80=83=E8=AF=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= =?UTF-8?q?""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 47c4fa71b68a32b5efde757c1bf5d56b6b119086. --- ...补充接口说明V1.0（塔里木）.docx | Bin 0 -> 20309 bytes .../ArrangeLessonTermController.cs | 16 + .../Controllers/ElectiveMergeController.cs | 5 + .../Controllers/Exam_ExamPlanController.cs | 117 ++++ .../Controllers/LessonInfoController.cs | 12 + .../OpenLessonPlanOfElectiveController.cs | 45 ++ .../Controllers/StuScoreController.cs | 38 ++ .../Controllers/StuScoreNotPassController.cs | 44 +- .../StuScoreNotPassTwoController.cs | 43 ++ ...StuSelectLessonListOfElectiveController.cs | 6 + .../Views/ArrangeLessonTermAttemper/Form.js | 43 +- .../ArrangeLessonTermAttemper/FormView.cshtml | 4 +- .../ArrangeLessonTermAttemper/FormView.js | 36 +- .../Views/ArrangeLessonTermAttemper/Index.js | 37 +- .../Views/ElectiveMajor/Index.js | 10 + .../Views/EmpInfo/FormEdit.cshtml | 4 +- .../Views/EmpInfo/FormEdit.js | 2 +- .../Views/Exam_ExamPlan/Form.cshtml | 43 ++ .../Views/Exam_ExamPlan/Form.js | 68 ++ .../Views/Exam_ExamPlan/Index.cshtml | 66 ++ .../Views/Exam_ExamPlan/Index.js | 147 ++++ .../OpenLessonPlanOfElective/MergeIndex.js | 43 +- .../StudentIndex.cshtml | 25 +- .../OpenLessonPlanOfElective/StudentIndex.js | 17 +- .../Views/StuInfoFresh/Form.js | 2 +- .../StuScore/AllStuScoreQueryIndex.cshtml | 38 ++ .../Views/StuScore/AllStuScoreQueryIndex.js | 108 +++ .../StuScore/AllStuScoreQueryPrint.cshtml | 167 +++++ .../Views/StuScoreNotPass/IndexUnpass.cshtml | 58 ++ .../Views/StuScoreNotPass/IndexUnpass.js | 147 ++++ .../StuScoreNotPassTwo/IndexUnpassTwo.cshtml | 58 ++ .../StuScoreNotPassTwo/IndexUnpassTwo.js | 143 ++++ .../Index.cshtml | 3 + .../StuSelectLessonListOfElective/Index.js | 17 +- .../QueryStuSelectResult.js | 2 +- .../QueryStuSelectResultForTeacher.cshtml | 59 ++ .../QueryStuSelectResultForTeacher.js | 218 ++++++ .../Controllers/CustmerformController.cs | 19 +- .../Views/FormRelation/Form.cshtml | 2 +- .../LR_FormModule/Views/FormRelation/Form.js | 5 +- .../Views/FormRelation/PreviewIndex.js | 6 +- .../Views/NWFProcess/NWFContainerForm.js | 22 +- .../LR_SystemModule/Views/Log/Index.cshtml | 26 +- .../Areas/LR_SystemModule/Views/Log/Index.js | 7 +- .../Acc_DormitoryRuleController.cs | 141 ++++ .../Controllers/AccommodationController.cs | 205 +++++- .../Controllers/DormitoryReturnController.cs | 245 +++++++ .../Views/Acc_DormitoryRule/Form.cshtml | 27 + .../Views/Acc_DormitoryRule/Form.js | 62 ++ .../Views/Acc_DormitoryRule/Index.cshtml | 27 + .../Views/Acc_DormitoryRule/Index.js | 139 ++++ .../Views/Accommodation/Corridor.cshtml | 22 +- .../Views/Accommodation/Dormitory.cshtml | 176 +---- .../Views/Accommodation/DormitoryAdd.cshtml | 8 +- .../Views/Accommodation/Floor.cshtml | 32 +- .../Views/Accommodation/Form.cshtml | 76 ++- .../Views/Accommodation/Form.js | 1 + .../Views/Accommodation/FormBed.cshtml | 12 + .../Views/Accommodation/FormBed.js | 52 ++ .../Views/Accommodation/FormClass.cshtml | 19 + .../Views/Accommodation/FormClass.js | 82 +++ .../Views/Accommodation/FormClassify.cshtml | 97 +++ .../Views/Accommodation/FormClassify.js | 167 +++++ .../Views/Accommodation/FormDept.cshtml | 15 + .../Views/Accommodation/FormDept.js | 56 ++ .../Views/Accommodation/FormRoom.cshtml | 26 + .../Views/Accommodation/FormRoom.js | 128 ++++ .../Views/Accommodation/Index.cshtml | 82 +-- .../Views/Accommodation/Index.js | 547 +++++++++++---- .../Views/Accommodation/IndexBed.cshtml | 61 ++ .../Views/Accommodation/IndexBed.js | 110 +++ .../Views/Accommodation/IndexClassify.cshtml | 69 ++ .../Views/Accommodation/IndexClassify.js | 187 ++++++ .../Accommodation/IndexDistribution.cshtml | 92 +++ .../Views/Accommodation/IndexDistribution.js | 625 ++++++++++++++++++ .../Views/Accommodation/Room.cshtml | 12 +- .../Views/Accommodation/Unit.cshtml | 21 +- .../Views/DormitoryReturn/Form.cshtml | 23 + .../Views/DormitoryReturn/Form.js | 59 ++ .../Views/DormitoryReturn/FormOut.cshtml | 19 + .../Views/DormitoryReturn/FormOut.js | 61 ++ .../Views/DormitoryReturn/FormReturn.cshtml | 19 + .../Views/DormitoryReturn/FormReturn.js | 61 ++ .../Views/DormitoryReturn/Index.cshtml | 49 ++ .../Views/DormitoryReturn/Index.js | 159 +++++ .../Views/DormitoryReturn/IndexReport.cshtml | 49 ++ .../Views/DormitoryReturn/IndexReport.js | 131 ++++ .../Controllers/TimeTableController.cs | 9 + .../TimeTable/ClassIndexInEducation.cshtml | 159 +++++ .../Views/TimeTable/ClassIndexInEducation.js | 202 ++++++ .../Controllers/LoginController.cs | 5 + .../Learun.Application.Web.csproj | 20 + .../Views/Home/ChangePwd.js | 1 + .../Views/LR_Content/plugin/grid/jfgrid.js | 1 + .../Views/LR_Content/script/lr-excel.js | 6 + .../XmlConfig/ioc.config | 2 + .../XmlConfig/system.config | 4 +- .../Learun.Application.WebApi.csproj | 1 + .../Modules/StuScoreApi.cs | 143 ++++ .../Modules/TimeTable.cs | 89 ++- .../DataAuthorize/DataAuthorizeBLL.cs | 4 +- .../DataAuthorize/DataAuthorizeService.cs | 5 +- .../Scheme/FormSchemeBLL.cs | 7 +- .../Exam_ExamPlanMap.cs | 29 + .../Learun.Application.Mapping.csproj | 12 + .../Acc_DormitoryReturnMap.cs | 29 + .../Acc_DormitoryRuleMap.cs | 29 + .../ArrangeLessonTermService.cs | 58 +- .../ArrangeLessonTermOfElectiveService.cs | 19 +- .../ElectiveMajor/ElectiveMajorService.cs | 24 +- .../ElectiveMerge/ElectiveMergeService.cs | 4 +- .../EmpInfo/EmpInfoService.cs | 16 +- .../Exam_ExamPlan/Exam_ExamPlanBLL.cs | 125 ++++ .../Exam_ExamPlan/Exam_ExamPlanEntity.cs | 90 +++ .../Exam_ExamPlan/Exam_ExamPlanIBLL.cs | 48 ++ .../Exam_ExamPlan/Exam_ExamPlanService.cs | 188 ++++++ .../LessonInfo/LessonInfoBLL.cs | 19 + .../LessonInfo/LessonInfoIBLL.cs | 1 + .../LessonInfo/LessonInfoService.cs | 19 + .../OpenLessonPlanOfElectiveEntity.cs | 2 + .../OpenLessonPlanOfElectiveService.cs | 29 +- .../OpenLessonPlanOfElectiveChangeEntity.cs | 6 + .../EducationalAdministration/SignUpHelper.cs | 6 + .../StuScore/StuScoreBLL.cs | 24 + .../StuScore/StuScoreEntity.cs | 35 +- .../StuScore/StuScoreIBLL.cs | 6 + .../StuScore/StuScoreService.cs | 122 +++- .../StuScoreNotPass/StuScoreNotPassBLL.cs | 40 ++ .../StuScoreNotPass/StuScoreNotPassEntity.cs | 14 + .../StuScoreNotPass/StuScoreNotPassIBLL.cs | 2 + .../StuScoreNotPass/StuScoreNotPassService.cs | 107 +++ .../StuScoreNotPassTwoBLL.cs | 45 ++ .../StuScoreNotPassTwoIBLL.cs | 2 + .../StuScoreNotPassTwoService.cs | 115 ++++ .../StuSelectLessonListOfElectiveEntity.cs | 1 + .../StuSelectLessonListOfElectiveService.cs | 4 +- .../Learun.Application.TwoDevelopment.csproj | 92 ++- .../Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs | 148 +++++ .../Acc_DormitoryRuleEntity.cs | 90 +++ .../Acc_DormitoryRuleIBLL.cs | 49 ++ .../Acc_DormitoryRuleService.cs | 168 +++++ .../Accommodation/Acc_DormitoryBuildEntity.cs | 51 ++ .../Accommodation/AccommodationBLL.cs | 260 +++++++- .../Accommodation/AccommodationIBLL.cs | 12 +- .../Accommodation/AccommodationService.cs | 546 ++++++++++++++- .../Acc_DormitoryReturnEntity.cs | 104 +++ .../DormitoryReturn/DormitoryReturnBLL.cs | 210 ++++++ .../DormitoryReturn/DormitoryReturnIBLL.cs | 50 ++ .../DormitoryReturn/DormitoryReturnService.cs | 273 ++++++++ .../ArrangeLessonTermAttemperMethod.cs | 20 +- .../Learun.Util.Operat/OperatorHelper.cs | 4 +- 151 files changed, 9565 insertions(+), 669 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园统一身份认证补充接口说明V1.0（塔里木）.docx create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormBed.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClass.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormDept.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexClassify.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs 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/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index 2b643cac9..cf57f41e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -122,6 +122,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = arrangeLessonTermIBLL.GetEntity(keyValue); return Success(data); } + /// + /// 获取调度时间数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonDateList(string queryJson) + { + var data = arrangeLessonTermIBLL.GetList(queryJson).Where(x => x.LessonDate.HasValue).Select(x => x.LessonDate).Distinct().Select(x => new + { + text = x, + value = x + }).OrderBy(x => x.value); + + return Success(data); + } #endregion #region 提交数据 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/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs new file mode 100644 index 000000000..95ae373a7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanController : MvcControllerBase + { + private Exam_ExamPlanIBLL exam_ExamPlanIBLL = new Exam_ExamPlanBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = exam_ExamPlanIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Exam_ExamPlanData = exam_ExamPlanIBLL.GetExam_ExamPlanEntity( keyValue ); + var jsonData = new { + Exam_ExamPlan = Exam_ExamPlanData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + exam_ExamPlanIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Exam_ExamPlanEntity entity = strEntity.ToObject(); + exam_ExamPlanIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs index 270d9f43b..d99e78b0a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/LessonInfoController.cs @@ -104,6 +104,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers LessonInfoData.Introduction = WebHelper.HtmlDecode(LessonInfoData.Introduction); return Success(LessonInfoData); } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonByMajorNo(string majorNo) + { + var LessonInfoList = lessonInfoIBLL.GetLessonByMajorNo(majorNo); + return Success(LessonInfoList); + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs index 622ce156b..a1a8f1486 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Collections.Generic; using System; using System.Linq; +using Learun.Application.Base.SystemModule; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -25,6 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers CdMajorIBLL CdMajorIBLL = new CdMajorBLL(); private StuSelectLessonListOfElectivePreIBLL stuSelectLessonListOfElectivePreIBLL = new StuSelectLessonListOfElectivePreBLL(); private OpenLessonPlanOfElectiveChangeIBLL openLessonPlanOfElectiveChangeIBLL = new OpenLessonPlanOfElectiveChangeBLL(); + private DataSourceIBLL dataSourceIBLL = new DataSourceBLL(); #region 视图功能 @@ -224,14 +226,57 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (!string.IsNullOrEmpty(entity.AfterLessonNo)) { model.AfterLessonNo = entity.AfterLessonNo; + var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.AfterLessonNo + "'"); + if (lesson != null && lesson.Rows.Count > 0) + { + model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); + } + } + else + { + var lesson = dataSourceIBLL.GetDataTable("LessonInfo", "t.lessonno='" + entity.LessonNo + "'"); + if (lesson != null && lesson.Rows.Count > 0) + { + model.AfterLessonName = lesson.Rows[0]["lessonname"].ToString(); + } } + if (!string.IsNullOrEmpty(entity.AfterEmpNo)) { model.AfterEmpNo = entity.AfterEmpNo; + + var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.AfterEmpNo + "'"); + if (emp != null && emp.Rows.Count > 0) + { + model.AfterEmpName = emp.Rows[0]["empname"].ToString(); + } } + else + { + var emp = dataSourceIBLL.GetDataTable("EmpInfo", "t.empno='" + entity.EmpNo + "'"); + if (emp != null && emp.Rows.Count > 0) + { + model.AfterEmpName = emp.Rows[0]["empname"].ToString(); + } + } + if (!string.IsNullOrEmpty(entity.AfterClassRoomNo)) { model.AfterClassRoomNo = entity.AfterClassRoomNo; + + var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.AfterClassRoomNo + "'"); + if (classRoom != null && classRoom.Rows.Count > 0) + { + model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); + } + } + else + { + var classRoom = dataSourceIBLL.GetDataTable("ClassRoomInfo", "t.classroomno='" + entity.ClassRoomNo + "'"); + if (classRoom != null && classRoom.Rows.Count > 0) + { + model.AfterClassRoomName = classRoom.Rows[0]["classroomname"].ToString(); + } } openLessonPlanOfElectiveChangeIBLL.SaveEntity("", model); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 905be20de..67e843cd9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -5,6 +5,7 @@ using Learun.Util; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Configuration; using System.Data; using System.Linq; using System.Web.Mvc; @@ -183,6 +184,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 全院学生成绩查看页面 + /// + /// + [HttpGet] + public ActionResult AllStuScoreQueryIndex() + { + return View(); + } + /// + /// 全院学生成绩打印 + /// + /// + [HttpGet] + public ActionResult AllStuScoreQueryPrint() + { + ViewBag.WebApi = ConfigurationManager.AppSettings["WebApi"]; + return View(); + } #endregion #region 获取数据 @@ -715,6 +735,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(result); } + /// + /// 全院学生成绩查看 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetScoreListByStuInfo(string queryJson) + { + var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); + if (data.Any()) + { + data = data.OrderByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x=>x.LessonSortNo).ThenBy(x => x.LessonNo); + } + + return Success(data); + } + public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo) { var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs index ef8c04c8d..77e7fec38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs @@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 补考名单查看 + /// + /// + [HttpGet] + public ActionResult IndexUnpass() + { + return View(); + } + #endregion #region 获取数据 @@ -106,6 +116,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + /// + /// 补考名单查看 + /// 分页参数 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForUnpass(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreNotPassIBLL.GetPageListForUnpass(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// /// 获取表单数据 /// 主键 @@ -171,7 +203,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } - + /// 初始化补考成绩 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult InitScore() + { + stuScoreNotPassIBLL.InitScore(); + return Success("操作成功！"); + } + #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs index 380f8dc62..8eec54f49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs @@ -71,6 +71,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } + /// + /// 二次补考成绩查看 + /// + /// + [HttpGet] + public ActionResult IndexUnpassTwo() + { + return View(); + } + #endregion #region 获取数据 @@ -146,6 +156,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(data); } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForUnpass(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = stuScoreNotPassTwoIBLL.GetPageListForUnpass(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } #endregion #region 提交数据 @@ -176,6 +207,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuScoreNotPassTwoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + + /// + /// 初始化二次补考成绩 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult InitScore() + { + stuScoreNotPassTwoIBLL.InitScore(); + return Success("操作成功！"); + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs index cc47418eb..cb4b7d1b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuSelectLessonListOfElectiveController.cs @@ -34,6 +34,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + [HttpGet] + public ActionResult QueryStuSelectResultForTeacher() + { + return View(); + } /// /// 教务-审核表单页 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 3bbd0b3b6..46e63e24a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -180,20 +180,9 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperStartTime').lrselect({ allowSearch: true }); //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); - + $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { if (!!keyValue) { @@ -234,7 +223,10 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } @@ -268,7 +260,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -310,9 +302,14 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -336,7 +333,7 @@ var bootstrap = function ($, learun) { return false; } if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } @@ -349,7 +346,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index d7c970c4e..71071ebdb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -126,11 +126,11 @@
        调度开始时间*
        -
        +
        调度结束时间*
        -
        +
        调度备注
        diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index fb37b83ac..e0247da8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -41,21 +41,22 @@ var bootstrap = function ($, learun) { p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); + //console.log(p); //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -179,20 +180,6 @@ var bootstrap = function ($, learun) { $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); - //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); - //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); }, initData: function () { @@ -236,7 +223,7 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); + } }); } @@ -270,7 +257,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -317,6 +304,7 @@ var bootstrap = function ($, learun) { } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -336,7 +324,7 @@ var bootstrap = function ($, learun) { } } else if (formData.AttemperType == "01") { //调课：调度时间比较 if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } @@ -349,7 +337,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index b390431e8..6b56aca3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -408,21 +408,36 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - if (res.code == 200) { + //if (res.code == 200) { + // // 发起流程 + // learun.workflowapi.create({ + // isNew: true, + // schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + // processId: processId, + // processName: '课程异动申请',// 对应流程名称 + // processLevel: '1', + // description: '', + // formData: JSON.stringify(postData), + // callback: function (res, data) { + // } + // }); + // page.search(); + //} + + if (res && res.code && res.code == 200) { // 发起流程 - learun.workflowapi.create({ - isNew: true, - schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + + var postData = { + schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 processId: processId, - processName: '课程异动申请',// 对应流程名称 - processLevel: '1', - description: '', - formData: JSON.stringify(postData), - callback: function (res, data) { - } + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); }); - page.search(); + } + page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js index 58dfa6639..6839e2da6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMajor/Index.js @@ -5,6 +5,7 @@ * 描 述：选课专业 */ var refreshGirdData; +var acceptClick; var OLPOEId = request("OLPOEId"); var bootstrap = function ($, learun) { "use strict"; @@ -129,8 +130,17 @@ var bootstrap = function ($, learun) { $('#gridtablemanagemajor').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; + refreshGirdData = function () { page.search(); }; + + // 保存数据 + acceptClick = function (callBack) { + if (!!callBack) { + learun.layerClose(window.name); + callBack(); + } + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml index a3ce1de60..d50374b93 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml @@ -11,10 +11,10 @@
        部门
        - @*
        +
        系部
        -
        *@ +
        diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js index ca29ab2d4..9f1bb64ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { } }); $('#F_DepartmentId').lrselect(); - //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml new file mode 100644 index 000000000..f8810fce8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.cshtml @@ -0,0 +1,43 @@ +@{ + ViewBag.Title = "考试记录表"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
        +
        +
        学年*
        +
        +
        +
        +
        学期*
        +
        +
        +
        +
        排考名称*
        + +
        +
        +
        排考类型*
        +
        +
        +
        +
        排考编号*
        + +
        +
        +
        排考总人数*
        + +
        +
        +
        生成座位*
        +
        +
        +
        +
        是否生成*
        +
        +
        +
        +
        排序号*
        + +
        +
        +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js new file mode 100644 index 000000000..7a12a2cb2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Form.js @@ -0,0 +1,68 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-04-14 18:12 + * 描 述：考试记录表 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); + $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml new file mode 100644 index 000000000..15b62df28 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml @@ -0,0 +1,66 @@ +@{ + ViewBag.Title = "考试记录表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        学年
        +
        +
        +
        +
        学期
        +
        +
        +
        +
        排考名称
        + +
        +
        +
        排考类型
        +
        +
        +
        +
        排考编号
        + +
        +
        +
        生成座位
        +
        +
        +
        +
        是否生成
        +
        +
        +
        +
        +
        +
        +
        +
        + +
        +
        +  新增 +  编辑 +  删除 +  打印 +
        +
        +   生成排考名单 +   清除排考名单 +   安排考试 +
        +
        +
        +
        +
        +
        +
        +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js new file mode 100644 index 000000000..4a3990b5a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js @@ -0,0 +1,147 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-04-14 18:12 + * 描 述：考试记录表 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); + $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('EPId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('EPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + //  生成排考名单 + $('#lr_generate').on('click', function () { + }); + //  清除排考名单 + $('#lr_cleargenerate').on('click', function () { + }); + //  安排考试 + $('#lr_planks').on('click', function () { + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GetPageList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, + { label: "排考名称", name: "PlanName", width: 100, align: "left" }, + { + label: "排考类型", name: "PlanType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudentType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "排考编号", name: "PlanCode", width: 100, align: "left" }, + { label: "排考总人数", name: "EPStuCount", width: 100, align: "left" }, + { + label: "生成座位", name: "EPRandom", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "是" : "否"; + } + }, + { + label: "是否生成", name: "EPGenarate", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "是" : "否"; + } + }, + { label: "排序号", name: "EPOrder", width: 100, align: "left" }, + ], + mainId: 'EPId', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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..470213e9a 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 @@ -40,7 +40,10 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/ElectiveMajor/Index?OLPOEId=' + keyValue, width: 1000, height: 700, - btn: null + //btn: null + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } }); } @@ -183,8 +186,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" }, @@ -221,18 +225,29 @@ var bootstrap = function ($, learun) { { label: "通过人数", name: "StuNum", width: 60, align: "left" }, { label: "已报人数(预)", name: "StuNumOfApplyPre", width: 80, align: "left" }, { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" }, - //{ - // label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) { - // var str = ""; - // for (var i = 0; i < row.ElectiveMajorList.length; i++) { - // str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName; - // if (i != row.ElectiveMajorList.length - 1) { - // str += ","; - // } - // } - // return str; - // } - //} + { + label: "是否已选专业", name: "IsElectiveMajor", width: 100, align: "left", formatter: function (cellvalue,row) { + if (!!row.ElectiveMajorList && row.ElectiveMajorList.length > 0) { + return "是"; + } else { + return "否"; + } + } + }, + { + label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left", formatter: function (cellvalue, row) { + var str = ""; + if (!!cellvalue && cellvalue.length > 0) { + for (var i = 0; i < cellvalue.length; i++) { + str += cellvalue[i].Grade + "级" + cellvalue[i].MajorName; + if (i != cellvalue.length - 1) { + str += ","; + } + } + } + return str; + } + } ], mainId: 'Id', isPage: true, 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/OpenLessonPlanOfElective/StudentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js index c426e026f..3079bf4fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js @@ -176,7 +176,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/GetPageListOfStudent', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, @@ -196,6 +196,21 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "课程类型", name: "LessonTypeId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + console.log(row.LessonTypeId); + + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', + key: row.LessonTypeId, + keyId: 'ltid', + callback: function (_data) { + callback(_data['lessontypename']); + } + }); + } + }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index 8d45704d1..cc3d59d23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); + $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml new file mode 100644 index 000000000..c612bbfac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.cshtml @@ -0,0 +1,38 @@ +@{ ViewBag.Title = "全院学生成绩查看"; Layout = "~/Views/Shared/_Index.cshtml"; } + +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        + +
        +
        +  查询 +
        +
        +
        +
        +  打印 +
        +
        + +
        +
        +
        +
        +
        +
        +
        +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js new file mode 100644 index 000000000..a8553a604 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryIndex.js @@ -0,0 +1,108 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-06-14 11:02 + * 描 述：全院学生成绩查看 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.bind(); + page.bindSelect(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var p = {}; + p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + p.Semester = $('#Semester').lrselectGet(); + p.StuNo = $.trim($('#StuNo').val()); + if (p.StuNo == null || p.StuNo == "") { + learun.alert.warning("请输入学号！"); + return; + } + + page.initGird(); + page.search(p); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //打印 + $('#lr_print').on('click', function () { + var AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + var Semester = $('#Semester').lrselectGet(); + var StuNo = $.trim($('#StuNo').val()); + if (StuNo == null || StuNo == "") { + learun.alert.warning("请输入学号！"); + return; + } + learun.layerForm({ + id: 'AllStuScoreQueryPrint', + title: '学生成绩单', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/AllStuScoreQueryPrint?StuNo=' + StuNo + '&AcademicYearNo=' + AcademicYearNo + '&Semester=' + Semester, + width: 1200, + height: 800, + btn: null + }); + }); + }, + bindSelect: function () { + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学期", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByStuInfo', + headData: [ + { label: '学号', name: 'StuNo', width: 100, align: "left" }, + { label: '姓名', name: 'StuName', width: 200, align: "left" }, + { label: '专业', name: 'MajorName', width: 100, align: "left" }, + { label: '班级', name: 'ClassName', width: 100, align: "left" }, + { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, + { label: '学期', name: 'Semester', width: 50, align: "left" }, + { label: '科目类型', name: 'LessonSortName', width: 60, align: "left" }, + { label: '科目', name: 'LessonName', width: 300, align: "left" }, + { label: '学分', name: 'StudyScore', width: 50, align: "left" }, + { label: '成绩', name: 'Score', width: 100, align: "left" }, + { label: '第一次补考成绩', name: 'ScoreOfNotPass', width: 100, align: "left" }, + { label: '第二次补考成绩', name: 'ScoreOfNotPassTwo', width: 100, align: "left" }, + { label: '专业排名', name: 'RankInMajor', width: 100, align: "left" }, + { label: '班级排名', name: 'RankInClass', width: 100, align: "left" }, + ], + mainId: 'StuNo', + isPage: false, + sidx: '', + sord: '', + }); + + //page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml new file mode 100644 index 000000000..a08a261a5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/AllStuScoreQueryPrint.cshtml @@ -0,0 +1,167 @@ + + + + + + + + + Document + + + + + +
        +

        塔里木职业技术学院学生成绩单

        +
          + +
          + +
          +
          打印
          + + + + + + + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml new file mode 100644 index 000000000..7f42b08f4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.cshtml @@ -0,0 +1,58 @@ +@{ + ViewBag.Title = "长阳迎新"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          学年
          +
          +
          +
          +
          学期
          +
          +
          +
          +
          年级
          +
          +
          +
          +
          系部
          +
          +
          +
          +
          专业
          +
          +
          +
          +
          课程
          +
          +
          +
          +
          班级
          +
          +
          +
          +
          +
          +
          +
          +
          + +
          +
          +  初始化补考成绩 +
          +
          +
          +
          +
          +
          +
          +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js new file mode 100644 index 000000000..672507755 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js @@ -0,0 +1,147 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-12-16 10:14 + * 描 述：长阳迎新 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + //年级 + $('#grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + allowSearch: true, + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + allowSearch: true, + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + + majorNo, + text: "ClassName", + value: "ClassNo" + }); + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + + majorNo, + text: "LessonName", + value: "LessonNo" + }); + } + }); + $('#ClassNo').lrDataSourceSelect({ + allowSearch: true, + code: 'bjsj', value: 'classno', text: 'classname' + }); + $('#LessonNo').lrDataSourceSelect({ + allowSearch: true, + code: 'LessonInfo', value: 'lessonno', text: 'lessonname' + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 初始化补考成绩 + $('#lr_Init').on('click', function () { + learun.layerConfirm('是否确认初始化补考成绩！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/InitScore', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetPageListForUnpass', + headData: [ + { + label: "学号", name: "stuno", width: 80, align: "left" + }, + { + label: "姓名", name: "stuname", width: 100, align: "left" + }, + { label: "课程", name: "LessonName", width: 100, align: "left" }, + { label: "考试年级", name: "Grade", width: 100, align: "left" }, + { + label: "学年", name: "AcademicYearNo", width: 80, align: "left", + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'usersex', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} + }, + { label: "学期", name: "Semester", width: 150, align: "left" }, + { label: "班级", name: "classname", width: 150, align: "left" }, + { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, + { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, + { label: "成绩", name: "Score2", width: 150, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'ClassNo,LessonNo', + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml new file mode 100644 index 000000000..da3304a88 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.cshtml @@ -0,0 +1,58 @@ +@{ + ViewBag.Title = "二次补考成绩查看"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          学年
          +
          +
          +
          +
          学期
          +
          +
          +
          +
          年级
          +
          +
          +
          +
          系部
          +
          +
          +
          +
          专业
          +
          +
          +
          +
          课程
          +
          +
          +
          +
          班级
          +
          +
          +
          +
          +
          +
          +
          +
          + +
          +
          +  初始化二次补考成绩 +
          +
          +
          +
          +
          +
          +
          +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js new file mode 100644 index 000000000..2c9f8248a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/IndexUnpassTwo.js @@ -0,0 +1,143 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-12-16 10:14 + * 描 述：长阳迎新 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "学年", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "学期", + allowSearch: false, + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + value: 'value', + text: 'text' + }); + //年级 + $('#grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#DeptNo').lrDataSourceSelect({ + code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { + var deptno = ""; + if (val) { + deptno = val.deptno; + } + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, + text: "MajorName", + value: "MajorNo" + }) + } + }); + $('#MajorNo').lrDataSourceSelect({ + code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: + function (val) { + var majorNo = ''; + if (val) { + majorNo = val.MajorNo; + } + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + + majorNo, + text: "ClassName", + value: "ClassNo" + }); + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + + '/EducationalAdministration/LessonInfo/GetLessonByMajorNo?majorNo=' + + majorNo, + text: "LessonName", + value: "LessonNo" + }); + } + }); + $('#ClassNo').lrDataSourceSelect({ + code: 'bjsj', value: 'classno', text: 'classname' + }); + $('#LessonNo').lrDataSourceSelect({ + code: 'LessonInfo', value: 'lessonno', text: 'lessonname' + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 初始化补考成绩 + $('#lr_Init').on('click', function () { + learun.layerConfirm('是否确认初始化二次补考成绩！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/InitScore', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPassTwo/GetPageListForUnpass', + headData: [ + { + label: "学号", name: "stuno", width: 80, align: "left" + }, + { + label: "姓名", name: "stuname", width: 100, align: "left" + }, + { label: "课程", name: "LessonName", width: 100, align: "left" }, + { label: "考试年级", name: "Grade", width: 100, align: "left" }, + { + label: "学年", name: "AcademicYearNo", width: 80, align: "left", + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'usersex', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} + }, + { label: "学期", name: "Semester", width: 150, align: "left" }, + { label: "班级", name: "classname", width: 150, align: "left" }, + { label: "平时成绩", name: "OrdinaryScore2", width: 150, align: "left" }, + { label: "期末成绩", name: "TermEndScore2", width: 150, align: "left" }, + { label: "成绩", name: "Score2", width: 150, align: "left" }, + ], + mainId: 'ID', + isPage: true, + sidx: 'ClassNo,LessonNo', + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js index fa4d52a95..9da21e054 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/Index.js @@ -68,7 +68,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetPageList', headData: [ { label: "学年", name: "AcademicYearNo", width: 100, align: "left"}, @@ -87,6 +87,21 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "课程类型", name: "LessonTypeId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + console.log(row.LessonTypeId); + + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType', + key: row.LessonTypeId, + keyId: 'ltid', + callback: function (_data) { + callback(_data['lessontypename']); + } + }); + } + }, { label: "上课节次", name: "LessonSection", width: 150, align: "left", formatter: function (cellvalue, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js index c5f5bb8cb..48fd142b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', headData: [ { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml new file mode 100644 index 000000000..f7c8f9b3c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.cshtml @@ -0,0 +1,59 @@ +@{ + ViewBag.Title = "选修课课程"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          学年
          +
          +
          +
          +
          学期
          +
          +
          +
          +
          校区
          +
          +
          +
          +
          系部
          +
          +
          +
          +
          专业
          +
          +
          +
          +
          班级
          +
          +
          +
          +
          选课状态
          +
          +
          +
          +
          报名状态
          +
          +
          +
          +
          +
          +
          +
          +
          + +
          +
          +
          +
          +
          +
          +
          +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js new file mode 100644 index 000000000..a773bbc7e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js @@ -0,0 +1,218 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-05-15 10:33 + * 描 述：选修课课程 + */ +var weekChina = ["一", "二", "三", "四", "五", "六", "日"]; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + if ($("#AcademicYearNo").lrselectGet() == "" || $("#AcademicYearNo").lrselectGet() == null || $("#AcademicYearNo").lrselectGet() == undefined) { + top.learun.alert.warning("请先选择学年！"); + return false; + } + if ($("#Semester").lrselectGet() == "" || $("#Semester").lrselectGet() == null || $("#Semester").lrselectGet() == undefined) { + top.learun.alert.warning("请先选择学期！"); + return; + } + page.search(queryJson); + }, 300, 400); + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学期", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', + value: 'value', + text: 'text' + }); + $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' }); + $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' }); + $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); + $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList', + headData: [ + { label: "学年", name: "AcademicYearNo", width: 80, align: "left" }, + { label: "学期", name: "Semester", width: 60, align: "left" }, + { + label: "校区", name: "F_SchoolId", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + callback(_data['f_fullname']); + } + }); + } + }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "选课状态", name: "Id", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == null || cellvalue == undefined || cellvalue == "") { + return '未报名'; + } else { + return '已报名'; + } + } + }, + { + label: "报名状态", name: "Status", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == 1) { + return '审核中'; + } else if (cellvalue == 2) { + return '报名成功'; + } else if (cellvalue == 3) { + return '报名失败'; + } else { + return '未报名'; + } + } + }, + { label: "所选课程号", name: "LessonNo", width: 100, align: "left" }, + { + label: "所选课程名称", name: "LessonName", width: 150, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + key: row.LessonNo, + keyId: 'lessonno', + callback: function (_data) { + callback(_data['lessonname']); + } + }); + } + }, + { label: "课程学分", name: "StudyScore", width: 100, align: "left" }, + { label: "教师编号", name: "EmpNo", width: 100, align: "left" }, + { + label: "教师姓名", name: "EmpName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: row.EmpNo, + keyId: 'empno', + callback: function (_data) { + callback(_data['empname']); + } + }); + } + }, + { + label: "上课节次", name: "LessonSection", width: 150, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue != "" && cellvalue != undefined && cellvalue != null) { + if (cellvalue.indexOf(',') == -1) { + return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节"; + } else { + return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节"; + } + } + } + }, + { label: "上课时间", name: "LessonTime", width: 180, align: "left" }, + { + label: "教室名称", name: "ClassRoomName", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo', + key: row.ClassRoomNo, + keyId: 'classroomno', + callback: function (_data) { + callback(_data['classroomname']); + } + }); + } + }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + ], + mainId: 'StuId', + isPage: true, + sidx: 'StuNo', + sord: 'asc' + }); + }, + search: function (param) { + param = param || {}; + param.EmpNo = learun.clientdata.get(['userinfo']).enCode; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs index 50cb98846..ddb78929f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/CustmerformController.cs @@ -1,4 +1,5 @@ -using Learun.Application.Form; +using System; +using Learun.Application.Form; using Learun.Util; using System.Collections.Generic; using System.Web.Mvc; @@ -331,12 +332,20 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers [ValidateInput(false)] public ActionResult SaveInstanceForms(string data) { - List list = data.ToObject>(); - foreach (var item in list) + try { - formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + List list = data.ToObject>(); + foreach (var item in list) + { + formSchemeIBLL.SaveInstanceForm(item.schemeInfoId, item.processIdName, item.keyValue, item.formData); + } + return Success("保存成功！"); } - return Success("保存成功！"); + catch (Exception e) + { + return Fail("输入字段超过限定长度，请精简内容后再试。"); + } + } /// /// 删除自定义表单数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml index ce5fadf56..d85c010ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.cshtml @@ -64,7 +64,7 @@
          -
          请填写Sql语句*
          +
          条件筛选Sql语句*
          diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js index 883981420..4eefbb4dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/Form.js @@ -366,19 +366,18 @@ var bootstrap = function ($, learun) { $('#step-1').lrSetFormData(data.module); $('#F_FormId').lrselectSet(data.relation.F_FormId); - + $("#F_CloseDoSql").val(data.relation.F_CloseDoSql); var settingJson = JSON.parse(data.relation.F_SettingJson); $('[name="formOpenType"][value="' + settingJson.layer.opentype + '"]').attr('checked', 'checked'); $('#fromWidth').val(settingJson.layer.width); $('#fromHeight').val(settingJson.layer.height); - $('[name="queryDatetime"][value="' + settingJson.query.isDate + '"]').attr('checked', 'checked'); $('#queryDatetime').lrselectSet(settingJson.query.DateField); $('#queryWidth').val(settingJson.query.width); $('#queryHeight').val(settingJson.query.height); queryData = settingJson.query.fields; - console.log(queryData); + $('#query_girdtable').jfGridSet('refreshdata', queryData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js index 5bd0c94fa..49678ffae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js @@ -15,6 +15,7 @@ var relation; var mainTablePk = ""; var mainTable = ""; var mainCompontId = ""; +var sqlwhere = ""; var bootstrap = function ($, learun) { "use strict"; @@ -28,7 +29,7 @@ var bootstrap = function ($, learun) { relation = data.relation; settingJson = JSON.parse(data.relation.F_SettingJson); formScheme = JSON.parse(data.scheme.F_Scheme); - + sqlwhere = relation.F_CloseDoSql; for (var i = 0, l = formScheme.dbTable.length; i < l; i++) { var tabledata = formScheme.dbTable[i]; if (tabledata.relationName == "") { @@ -305,6 +306,9 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (!!sqlwhere) { + queryJson.sqlwhere = sqlwhere; + } param.queryJson = JSON.stringify(queryJson); $('#gridtable').jfGridSet('reload', param); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js index 090db1c3a..a66d6452e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js @@ -711,13 +711,13 @@ var bootstrap = function ($, learun) { signUrl: signUrl, stamp: stamp }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { - learun.loading(false); - if (_data) { - learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); - learun.frameTab.close(tabIframeId); - } - }); + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/AuditFlow', postData, function (_data) { + learun.loading(false); + if (_data) { + learun.frameTab.parentIframe().refreshGirdData && learun.frameTab.parentIframe().refreshGirdData(); + learun.frameTab.close(tabIframeId); + } + }); }); }); } @@ -1721,14 +1721,18 @@ var bootstrap = function ($, learun) { formData[_item.field] = processId; point.formData = JSON.stringify(formData); formDataList.push(point); - - _item.isUpdate = true; + //liangkun 修复第一次保存失败报错后第二次直接会update + //_item.isUpdate = true; } }); if (formDataList.length > 0) { $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForms', { data: JSON.stringify(formDataList) }, function (res) { if (res.code == 200) { + //liangkun 修复第一次保存失败报错后第二次直接会update + $.each(nwfForms, function (_index, _item) { + _item.isUpdate = true; + }); monitorSave(); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml index dac19e036..2adefd6c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml @@ -8,9 +8,9 @@
          • 登录日志
            • -
          • 访问日志
            • -
          • 操作日志
            • -
          • 异常日志
            • +
          • 访问日志
            • +
          • 操作日志
            • +
          • 异常日志
          @@ -23,10 +23,22 @@
          - -
          -
          -  查询 +
          +
          +
          +
          操作用户
          + +
          +
          +
          系统功能
          + +
          +
          +
          操作类型
          + +
          +
          +
          diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js index f0b8e0869..f89f0c26f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.js @@ -51,10 +51,9 @@ var bootstrap = function ($, learun) { }); }); // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs new file mode 100644 index 000000000..043d4af3e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs @@ -0,0 +1,141 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleController : MvcControllerBase + { + private Acc_DormitoryRuleIBLL acc_DormitoryRuleIBLL = new Acc_DormitoryRuleBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = acc_DormitoryRuleIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Acc_DormitoryRuleData = acc_DormitoryRuleIBLL.GetAcc_DormitoryRuleEntity(keyValue); + var jsonData = new + { + Acc_DormitoryRule = Acc_DormitoryRuleData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + acc_DormitoryRuleIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + Acc_DormitoryRuleEntity entity = strEntity.ToObject(); + DateTime time; + bool flag = DateTime.TryParse(entity.LateReturnTime, out time); + if (!flag) + { + return Fail("晚归时间格式不正确！"); + } + + if (!(entity.PushHour >= 0 && entity.PushHour <= 23)) + { + return Fail("推送时间点填写不正确！"); + } + + var model = acc_DormitoryRuleIBLL.GetEnableEntity(); + if (entity.IsEnable == 1) + { + if (string.IsNullOrEmpty(keyValue) && model != null) + { + return Fail("只能有一个启用的规则！"); + } + else if (!string.IsNullOrEmpty(keyValue) && model != null && model.Id != keyValue) + { + return Fail("只能有一个启用的规则！"); + } + } + acc_DormitoryRuleIBLL.SaveEntity(keyValue, entity); + + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs index 94c336d32..24e3ad8cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/AccommodationController.cs @@ -7,6 +7,7 @@ using System.Web.Helpers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; +using System.Linq; namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { @@ -32,26 +33,31 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { return View(); } - ///// - ///// 表单页 - ///// - ///// - //[HttpGet] - //public ActionResult Form() - //{ - // return View(); - //} + /// + /// 分配宿舍 + /// + /// + [HttpGet] + public ActionResult IndexDistribution() + { + return View(); + } /// /// 带参数的表单页 /// /// [HttpGet] - public ActionResult Form(string ParentID = null, string ParentName = null) + public ActionResult Form(string ParentID = null, string ParentName = null, string keyValue = null) { ViewBag.ParentID = ParentID; ViewBag.ParentName = ParentName; ViewBag.BuildType = accommodationIBLL.GetBuildType(ParentID); + if (!string.IsNullOrEmpty(keyValue)) + { + ViewBag.BuildType = accommodationIBLL.GetParentBuildType(keyValue); + } + return View(); } @@ -137,9 +143,70 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return View(); } + /// + /// 分配系 + /// + /// + [HttpGet] + public ActionResult FormDept() + { + return View(); + } - - + /// + /// 分配专业和班级 + /// + /// + [HttpGet] + public ActionResult FormClass() + { + return View(); + } + /// + /// 分配宿舍 + /// + /// + [HttpGet] + public ActionResult FormRoom() + { + return View(); + } + /// + /// 床位管理 + /// + /// + [HttpGet] + public ActionResult IndexBed() + { + return View(); + } + /// + /// 床位管理 + /// + /// + [HttpGet] + public ActionResult FormBed() + { + return View(); + } + /// + /// 分类管理 + /// + /// + [HttpGet] + public ActionResult FormClassify() + { + return View(); + } + /// + /// 分类管理 + /// + /// + [HttpGet] + public ActionResult IndexClassify() + { + return View(); + } #endregion @@ -167,6 +234,38 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success(jsonData); } + /// + /// 获取床位数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetBedListByRoomId(string RoomId) + { + var data = accommodationIBLL.GetBedListByRoomId(RoomId).OrderBy(x => x.DNo); + return Success(data); + } + /// + /// 获取分类数据 + /// + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassifyList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = accommodationIBLL.GetClassifyList(paginationobj, queryJson).OrderBy(x => x.DNo); + //var jsonData = new + //{ + // rows = data, + // total = paginationobj.total, + // page = paginationobj.page, + // records = paginationobj.records + //}; + return Success(data); + } /// /// 获取宿舍楼数据 @@ -269,6 +368,19 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers var data = accommodationIBLL.GetTreeNew(); return Success(data); } + /// + /// 获取上级树形数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassifyTree() + { + var data = accommodationIBLL.GetClassifyTree(); + return Success(data); + } + + #endregion #region 提交数据 @@ -286,6 +398,18 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success("删除成功！"); } /// + /// 删除 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteBed(string keyValue, string ParentID) + { + accommodationIBLL.DeleteBed(keyValue, ParentID); + return Success("删除成功！"); + } + /// /// 保存实体数据（新增、修改） /// 主键 /// @@ -299,7 +423,54 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers accommodationIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveBedForm(string keyValue, string ParentID, string strEntity) + { + Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + accommodationIBLL.SaveBedEntity(keyValue, ParentID, entity); + return Success("保存成功！"); + } + /// + /// 寝室分配系 + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveDeptClass(string keyValue, string strEntity, int type) + { + Acc_DormitoryBuildEntity entity = strEntity.ToObject(); + accommodationIBLL.SaveDeptClass(keyValue, entity, type); + return Success("保存成功！"); + } + + /// + /// 寝室分配床位 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveRoom(string RoomId, List list) + { + //List list = strEntity.ToObject>(); + string res = accommodationIBLL.SaveRoom(RoomId, list); + if (!string.IsNullOrEmpty(res)) + { + return Fail(res); + } + + return Success("保存成功！"); + } /// /// 学生宿舍的单元、楼层、房间、床位添加 @@ -312,11 +483,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult DormitoryAdd(string keyValue, string strEntity) { - //dynamic entity = JsonConvert.DeserializeObject(strEntity); - //var ElementNum = entity.ElementNum; - //var FloorNum = entity.FloorNum; - //var RoomNum = entity.RoomNUm; - //var BedNum = entity.BedNum; JObject jsonEntity = JObject.Parse(strEntity); var elementNum = int.Parse(jsonEntity["ElementNum"].ToString()); @@ -344,7 +510,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers } - + /// /// 同步宿舍信息数据 /// @@ -353,10 +519,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { accommodationIBLL.SyncData(); return Success("同步成功"); - - } - //public ActionResult DormitoryAdd(string a,string ) #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs new file mode 100644 index 000000000..10d1f7135 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/DormitoryReturnController.cs @@ -0,0 +1,245 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Web.Mvc; +using System.Collections.Generic; +using System.Linq; +using System; + +namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnController : MvcControllerBase + { + private DormitoryReturnIBLL dormitoryReturnIBLL = new DormitoryReturnBLL(); + private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormOut() + { + return View(); + } + + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult FormReturn() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult IndexReport() + { + return View(); + } + + #endregion + + #region 获取数据 + /// + /// 获取左侧树形数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetTree() + { + var data = dormitoryReturnIBLL.GetTree(); + return Success(data); + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = dormitoryReturnIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var Acc_DormitoryReturnData = dormitoryReturnIBLL.GetAcc_DormitoryReturnEntity(keyValue); + var jsonData = new + { + Acc_DormitoryReturn = Acc_DormitoryReturnData, + }; + return Success(jsonData); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetDept() + { + var data = accommodationIBLL.GetDept(); + + return Success(data); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetMajor(string strWhere) + { + var data = accommodationIBLL.GetMajor(strWhere); + + return Success(data); + } + /// + /// 获取下拉框数据 + /// + /// + [HttpGet] + public ActionResult GetClass(string strWhere) + { + var data = accommodationIBLL.GetClass(strWhere); + + return Success(data); + } + + [HttpGet] + public ActionResult GetReportList(string queryJson) + { + List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); + var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); + List list2 = new List(); + foreach (var item in list) + { + var name = item.Key == 1 ? "已归宿" : "未归宿"; + list2.Add(new { name = name, value = item.num }); + + } + return JsonResult(list2); + } + + /// + /// + /// + /// + public ActionResult GetReportData(string queryJson) + { + List data = dormitoryReturnIBLL.GetReportList(queryJson).ToList(); + var list = data.GroupBy(a => a.IsReturn).Select(a => new { a.Key, num = a.Count() }).ToList(); + List list2 = new List(); + List list1 = new List(); + foreach (var item in list) + { + var name = item.Key == 1 ? "已归宿" : "未归宿"; + list2.Add(new { name = name, value = item.num }); + list1.Add(name); + + } + return Success(new { list1, list2 }); + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + dormitoryReturnIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveData(string keyValue, string strEntity) + { + Acc_DormitoryReturnEntity entity = strEntity.ToObject(); + dormitoryReturnIBLL.SaveData(keyValue, entity); + + return Success("保存成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string type, string strEntity) + { + Acc_DormitoryReturnEntity entity = strEntity.ToObject(); + dormitoryReturnIBLL.SaveEntity(type, entity); + + return Success("保存成功！"); + } + + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml new file mode 100644 index 000000000..100ee31f8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍晚归规则"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
          +
          +
          晚归时间*
          + +
          +
          +
          推送人*
          +
          +
          +
          +
          推送班主任*
          +
          +
          +
          +
          推送时间点*
          + +
          +
          +
          启用*
          +
          +
          +
          +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js new file mode 100644 index 000000000..2dab9f792 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.js @@ -0,0 +1,62 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-03-14 12:05 + * 描 述：宿舍晚归规则 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#PushUser').lrDataSourceSelect({ + code: 'teacheruserdata', value: 'f_userid', text: 'f_realname', type: 'multiple' + }); + + $('#ClassDiredctor').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#IsEnable').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml new file mode 100644 index 000000000..ebbd5409c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍晚归规则"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
          +
          +
          +
          +
          +
          +
          +
          + +
          +
          +  新增 +  编辑 +  删除 +  打印 +
          +
          +
          +
          +
          +
          +
          +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js new file mode 100644 index 000000000..4b81ce7c9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js @@ -0,0 +1,139 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-03-14 12:05 + * 描 述：宿舍晚归规则 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetPageList', + headData: [ + { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" }, + { + label: "推送人", name: "PushUser", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + if (value.indexOf(',') != -1) { + var content = ''; + var timearr = value.split(','); + for (var i = 0; i < timearr.length; i++) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: timearr[i], + keyId: 'f_userid', + callback: function (_data) { + content += _data['f_realname']; + } + }); + } + content = content.substring(0, content.length - 1); + callback(content); + } else { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + } + }, + { + label: "推送班主任", name: "ClassDiredctor", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoInt', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "推送时间点", name: "PushHour", width: 100, align: "left" }, + { + label: "启用", name: "IsEnable", width: 100, align: "left", + formatter: function (cellvalue, rowObject) { + return cellvalue == 1 ? "" : ""; + } + + }, + ], + mainId: 'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml index 76b48d7ef..a6de56ca7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Corridor.cshtml @@ -58,11 +58,7 @@
          {{dormitoryName}}{{unitName}}
          @@ -76,7 +72,9 @@
          -
          {{floor.dormitory.Name}}
          {{floor.dormitory.Sex | filter_sex}}
          +
          {{floor.dormitory.Name}} + @*
          {{floor.dormitory.Sex | filter_sex}}
          *@ +
          {{floor.RoomNum}}间 {{floor.BedNum}}床
          @@ -344,7 +342,7 @@ }, addFloor: function () { var url = ""; - url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?ParentID=' + this.unitID + '&ParentName=' + this.unitName; + url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?ParentID=' + this.unitID + '&ParentName=' + this.unitName; top.learun.layerForm({ id: 'form', title: '新增', @@ -361,7 +359,7 @@ top.learun.layerForm({ id: 'form', title: '编辑', - url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id, + url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id, width: 600, height: 400, callBack: function (id) { @@ -393,7 +391,7 @@ '
          ' + '
          ' + this.dormitoryName + '  ' + this.unitName + '
          ' + '
          ' + floor.dormitory.Name + - this.filter_sex(floor.dormitory.Sex) + + '' + this.filter_sex(floor.dormitory.Sex) + '' + '
          ' + '
          ' + '
          负 责 人' + floor.dormitory.Functionary + '
          负责人电话' + floor.dormitory.Phone + '
          ' + @@ -403,14 +401,14 @@ '
          ' + '
          ' + '
            ' + - '
          • 编     号' + floor.dormitory.Name + '
            • ' + - '
          • 价     格' + floor.dormitory.Price + ' 元
            • ' + + '
          • 编     号' + floor.dormitory.DNo + '
            • ' + + '
          • 价     格' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' 元
            • ' + '
          • 房     间' + floor.RoomNum + ' 间
            • ' + '
          • 入     住' + floor.HasStudentNum + ' 人
            • ' + '
          • 空     床' + floor.NoStudentNum + ' 床
            • ' + '
          • 床     位' + floor.BedNum + ' 个
            • ' + - '
          • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
            • ' + - '
          • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
            • ' + + //'
          • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
            • ' + + //'
          • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
            • ' + '
          ' + '
          ' + //'' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml index b9a5635ac..b85a292ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Dormitory.cshtml @@ -62,11 +62,7 @@
          @@ -118,155 +114,6 @@ +@Html.AppendJsFile("/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js new file mode 100644 index 000000000..7f8aec873 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/IndexReport.js @@ -0,0 +1,131 @@ +var bootstrap = function ($, learun) { + "use strict"; + var year = ""; + var page = { + init: function () { + page.bind(); + page.initGrid(); + page.initChart(); + }, + bind: function () { + $('#Dept').lrselect({ + width: '150px', + placeholder: "请选择系部", + allowSearch: true, + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetDept', + value: 'Dept', + text: 'DeptName', + select: function (item) { + if (item) { + $('#Major').lrselectRefresh({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', + param: { strWhere: "m.deptno='" + item.Dept + "'" } + }); + $('#Class').lrselectRefresh({ + //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', + //param: { strWhere: "c.majorno=''" } + }); + } + } + }); + $('#Major').lrselect({ + width: '150px', + placeholder: "请选择专业", + allowSearch: true, + //url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetMajor', + value: 'Major', + text: 'MajorName', + select: function (item) { + if (item) { + $('#Class').lrselectRefresh({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetClass', + param: { strWhere: "c.majorno='" + item.Major + "'" } + }); + } + } + }); + $('#Class').lrselect({ + width: '150px', + placeholder: "请选择班级", + allowSearch: true, + value: 'Class', + text: 'ClassName' + }); + + //查询 + $('#btn_Search').on('click', function () { + page.search({ Dept: $('#Dept').lrselectGet(), Major: $('#Major').lrselectGet(), Class: $('#Class').lrselectGet() }); + }); + + }, + initGrid: function () { + $(".lr-layout-grid").height($(window).height() - 110); + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportList', + headData: [ + { name: "name", label: "状态", width: 100, align: "center" }, + { name: "value", label: "人数", width: 150, align: "center" } + + ] + }); + page.search(); + }, + initChart: function (queryJson) { + var myChart1 = echarts.init(document.getElementById('main')); + //var myChart2 = echarts.init(document.getElementById('main1')); + queryJson = { + Dept: $('#Dept').lrselectGet(), + Major: $('#Major').lrselectGet(), + Class: $('#Class').lrselectGet() + }; + //console.log('queryJson', queryJson); + learun.httpAsyncPost(top.$.rootUrl + '/LogisticsManagement/DormitoryReturn/GetReportData', { queryJson: JSON.stringify(queryJson) }, function (res) { + if (res.code == 200) { + var option = { + title: { + text: '学生归宿统计', + x: 'center' + }, + tooltip: { + trigger: 'item', + formatter: "{a}
          {b} : {c} ({d}%)" + }, + legend: { + orient: 'vertical', + left: 'left', + data: res.data.list1 + }, + series: [ + { + name: '学生归宿', + type: 'pie', + radius: '55%', + center: ['50%', '60%'], + data: res.data.list2, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + + myChart1.setOption(option); + + } + }); + + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + page.initChart(param); + } + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs index 2b26e1d62..93f48ee5d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs @@ -85,6 +85,15 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return View(); } /// + /// 班级课程表【教务】 + /// + /// + [HttpGet] + public ActionResult ClassIndexInEducation() + { + return View(); + } + /// /// 课程表【教学调度】 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml new file mode 100644 index 000000000..4a794077d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.cshtml @@ -0,0 +1,159 @@ +@{ + ViewBag.Title = "班级课程表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + + + +
          +
          +
          +
          +
          +
          +
          +
          + +
          +
          +
          +
          +
          +
          +
          + 查询 +
          + +
          +
          +
          + +
          +
          +
          +
          +
          +
          +
          +
          +
            +
          • 节次/星期
            • +
          • 星期一
            • +
          • 星期二
            • +
          • 星期三
            • +
          • 星期四
            • +
          • 星期五
            • +
          • 星期六
            • +
          • 星期日
            • +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js") + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js new file mode 100644 index 000000000..472359edf --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/ClassIndexInEducation.js @@ -0,0 +1,202 @@ +var refreshGirdData; +var bootstrap = function ($, learun) { + var startTime; + var endTime; + var page = { + init: function () { + page.bind(); + page.bindSelect(); + }, + loadData: function (param) { + $.lrSetFormWithParam(top.$.rootUrl + '/PersonnelManagement/TimeTable/GetDataInEducation', param, + function (data) { + // 数据处理 + var html = ''; + var weekLists = data.weekList; + for (var i = 1; i < 11; i++) { + (function (arg) { + var args = arg - 1; + var datas = flogs(arg, weekLists, 'time'); + html += ' ' + arg + '节'; + if (datas) { + var lists = datas.list; + html += tdHandles(lists); + } else { + html += tdHandle(arg); + } + html += ''; + })(i); //调用时参数 + } + $('.personT').text(data.schoolName); + $('.perSemester').text(data.semester); + $('.perFestivalsBox table').html(html); + + function flogs(num, data, obj) { + var flog = false; + $.each(data, + function (i, n) { + if (n[obj] == num) { + flog = n; + return; + } + }) + return flog; + } + function flogs2(num, data, obj) { + var arr = new Array(); + $.each(data, + function (i, n) { + if (n[obj] == num) { + arr.push(n); + } + }) + return arr; + } + + //某节课空 + function tdHandle() { + var html = ''; + for (var j = 0; j < 7; j++) { + html += '
          '; + } + return html; + } + + //某节课不空 + function tdHandles(lists) { + var html = ''; + for (var k = 1; k < 8; k++) { + (function (arg) { + var args = arg - 1; + var datas = flogs2(arg, lists, 'day'); + if (datas.length > 0) { + html += ''; + $.each(datas, function (i, item) { + if (i > 0) { + html += '
          '; + } + html += '
          课程：' + + item.curriculum + + '
          ' + + '
          教师：' + + item.teacher + + '
          ' + + '
          班级：' + + item.className + + '
          ' + + '
          教室：' + + item.classRoom + + '
          '; + }); + html += ''; + + } else { + html += '
          '; + } + + })(k); + } + return html; + } + }); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + $('#datesearch').lrdate({ + dfdata: [ + { + name: '上周', + begin: function () { return learun.getTime(7); }, + end: function () { + return learun.getTime(1); + } + }, + { + name: '本周', + begin: function () { return learun.getTime(0); }, + end: function () { + return learun.getTime(-6); + } + }, + { + name: '下周', + begin: function () { return learun.getTime(-7); }, + end: function () { + return learun.getTime(-13); + } + }], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: 'currentWeek', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + //查询 + $('#lr_search').on('click', function () { + var p = {}; + p.schoolId = $('#F_SchoolId').lrselectGet(); + p.ClassNo = $('#ClassNo').lrselectGet(); + page.search(p); + }); + }, + bindSelect: function () { + //校区 + $('#F_SchoolId').lrDataSourceSelect({ + code: 'company', value: 'f_companyid', text: 'f_fullname', select: function (item) { + if (!!item) { + // 班级 + $('#ClassNo').lrselectRefresh({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + param: { schoolId: item.f_companyid }, + value: 'value', + text: 'text' + }); + } else { + //班级 + $('#ClassNo').lrselectRefresh({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + param: { schoolId: "" }, + value: 'value', + text: 'text' + }); + } + } + }); + //班级 + $('#ClassNo').lrselect({ + placeholder: "请选择班级", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassData', + value: 'value', + text: 'text' + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + page.loadData(param); + } + }; + page.init(); +}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index 4c8044023..06b7dfc2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -557,6 +557,11 @@ namespace Learun.Application.Web.Controllers { return Success(new { pwd = true }); } + //每月1号强制用户修改密码 + if (DateTime.Now.Day == 1 && up == "false") + { + return Success(new { pwd = true }); + } //是否30天未修改密码验证 //获取开关显示配置中“30天未修改密码登录后提示修改”项的配置 if (teachSwitchIBLL.FindFirst("modifypwdtip")) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 22c6dcb25..74e2a3d31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -824,6 +824,10 @@ + + + + @@ -6458,6 +6462,22 @@ + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js index 9e0bbba79..f6370ac69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.js @@ -35,6 +35,7 @@ var bootstrap = function ($, learun) { } if ($this.val() != $('#NewPwd').val()) { learun.alert.error("两次密码输入不一样"); + return false; } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js index e78391a95..767cc70ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js @@ -2203,6 +2203,7 @@ dfop.rows = 1000000; data = data || dfop.param || {}; dfop.param = data.param || data; + dfop.running.pageparam.page = 1; _jfgrid.reload($self, dfop); break; case 'refresh': diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js index a617e48ef..d3bd95e31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js @@ -61,6 +61,12 @@ callBack: function (id) { return top[id].acceptClick(); }, + end: function () { + if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) { + learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30; + learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload'); + } + }, btn: ['导出Excel', '关闭'] }); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index f542e9f12..469130f66 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -34,6 +34,7 @@ + @@ -78,6 +79,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config index 9592e4aee..2aaaf7c6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config @@ -143,9 +143,9 @@ - + - + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index a5634307c..13908fea8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -212,6 +212,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs new file mode 100644 index 000000000..08c563989 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuScoreApi.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using Learun.Util; +using Nancy; +using Newtonsoft.Json; + +namespace Learun.Application.WebApi.Modules +{ + public class StuScoreApi : BaseNoLoginApi + { + public StuScoreApi() + : base("/Learun/adms/EducationalAdministration/StuScore") + { + Get["/scoreListByStuInfo"] = GetScoreListByStuInfo; + + } + + private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); + private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); + private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); + private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); + + /// + /// 全院学生成绩查看-打印成绩单 + /// + /// + /// + private Response GetScoreListByStuInfo(dynamic _) + { + var param = this.GetReq(); + + ScoreListByStuInfo result = new ScoreListByStuInfo(); + + var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(param.StuNo); + if (stuInfoBasicEntity != null) + { + result.StuNo = stuInfoBasicEntity.StuNo; + result.StuName = stuInfoBasicEntity.StuName; + result.MajorNo = stuInfoBasicEntity.MajorNo; + result.ClassNo = stuInfoBasicEntity.ClassNo; + if (!string.IsNullOrEmpty(stuInfoBasicEntity.MajorNo)) + { + result.MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo)?.MajorName; + } + if (!string.IsNullOrEmpty(stuInfoBasicEntity.ClassNo)) + { + result.ClassName = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo)?.ClassName; + } + } + var queryJson = JsonConvert.SerializeObject(param); + + var data = stuScoreIBLL.GetScoreListByStuInfo(queryJson); + var dataTemp = data.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new ScoreList() + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + StuScoreEntityList = x.Select(y => new StuScoreModel() + { + AcademicYearNo = y.AcademicYearNo, + Semester = y.Semester, + LessonSortNo = y.LessonSortNo, + LessonSortName = y.LessonSortName, + LessonNo = y.LessonNo, + LessonName = y.LessonName, + StudyScore = y.StudyScore, + Score = y.Score, + ScoreOfNotPass = y.ScoreOfNotPass, + ScoreOfNotPassTwo = y.ScoreOfNotPassTwo + }).OrderBy(a=>a.LessonSortNo).ThenBy(a=>a.LessonNo).ToList() + }).ToList().OrderByDescending(x=>x.AcademicYearNo).ThenByDescending(x=>x.Semester); + result.ScoreList = dataTemp.ToList(); + + return Success(result); + + } + + public class Model + { + /// + /// 学年（18-19） + /// + public string AcademicYearNo { get; set; } + /// + /// 学期（1） + /// + public string Semester { get; set; } + /// + /// 学号 + /// + public string StuNo { get; set; } + + } + public class ScoreListByStuInfo { + public string StuNo { get; set; } + public string StuName { get; set; } + public string MajorNo { get; set; } + public string MajorName { get; set; } + public string ClassNo { get; set; } + public string ClassName { get; set; } + public List ScoreList { get; set; } + } + public class ScoreList { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public List StuScoreEntityList { get; set; } + } + public class StuScoreModel { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + /// + /// 课程类别码 + /// + public string LessonSortNo { get; set; } + /// + /// 课程类别名称 + /// + public string LessonSortName { get; set; } + public string LessonNo { get; set; } + public string LessonName { get; set; } + /// + /// 学分 + /// + public decimal? StudyScore { get; set; } + /// + /// 成绩 + /// + public decimal? Score { get; set; } + /// + /// 第一次补考成绩 + /// + public string ScoreOfNotPass { get; set; } + /// + /// 第二次补考成绩 + /// + public string ScoreOfNotPassTwo { get; set; } + + } + + } +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 65df96b5e..457e01c62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -13,7 +13,7 @@ using Nancy; namespace Learun.Application.WebApi.Modules { - public class TimeTable : BaseApi + public class TimeTable : BaseNoLoginApi { public TimeTable() : base("/learun/adms/timetable") @@ -21,6 +21,7 @@ namespace Learun.Application.WebApi.Modules Get["/list"] = GetList; Get["/StuList"] = GetStuInfo; Get["/StuLessonInfo"] = GetStuLessonInfo; + Get["/timeTableData"] = GetTimeTableData; } private ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL(); private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL(); @@ -111,6 +112,68 @@ namespace Learun.Application.WebApi.Modules } + + /// + /// 全院课程表【按班级分组】 + /// + /// + /// + private Response GetTimeTableData(dynamic _) + { + var param = this.GetReq(); + + TimeTableData result = new TimeTableData(); + + //开始时间 + var startdate = string.IsNullOrEmpty(param.StartDate) ? DateTime.Today : Convert.ToDateTime(param.StartDate); + var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd"); + var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd"); + result.StartDate = startDate; + result.EndDate = endDate; + + var semesterAndYear = Common.GetSemesterAndYear(startDate); + result.AcademicYearNo = semesterAndYear.AcademicYearLong; + result.Semester = semesterAndYear.Semester; + + //课程表数据 + var timeTableList = new List(); + //必修课课程表 + var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + timeTableList.AddRange(data); + //选修课课程表 + var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + timeTableList.AddRange(dataOfElective); + var dataTemp = timeTableList.GroupBy(x => new { x.TeachClassNo, x.ClassName, x.LessonSortNo }).Select(x => new ClassDataList() + { + ClassNo = x.Key.TeachClassNo, + ClassName = x.Key.ClassName, + LessonSortNo = x.Key.LessonSortNo, + TimeTableList = x.Select(y => new TwoDevelopment.EducationalAdministration.TimeTable() + { + AcademicYear = y.AcademicYear, + Semester = y.Semester, + DeptNo = y.DeptNo, + MajorNo = y.MajorNo, + F_SchoolId = y.F_SchoolId, + LessonNo = y.LessonNo, + LessonName = y.LessonName, + LessonDate = y.LessonDate, + LessonTime = y.LessonTime, + EmpNo = y.EmpNo, + EmpName = y.EmpName, + TeachClassNo = y.TeachClassNo, + ClassName = y.ClassName, + ClassRoomNo = y.ClassRoomNo, + ClassroomName = y.ClassroomName, + LessonSortNo = y.LessonSortNo + }).OrderBy(a => a.LessonTime.Substring(0, 1)).ThenBy(a => a.LessonTime.Substring(1)).ToList() + }).OrderBy(x => x.LessonSortNo).ThenBy(x => x.ClassNo).ToList(); + + result.ClassDataList = dataTemp; + + return Success(result); + + } /// /// 数字转中文 @@ -166,6 +229,30 @@ namespace Learun.Application.WebApi.Modules { public string StartDate { get; set; } public string EndDate { get; set; } + /// + /// 班级编号 + /// + public string ClassNo { get; set; } + /// + /// 教师编号 + /// + public string EmpNo { get; set; } } + public class TimeTableData + { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public string StartDate { get; set; } + public string EndDate { get; set; } + public List ClassDataList { get; set; } + } + public class ClassDataList + { + public string ClassNo { get; set; } + public string ClassName { get; set; } + public string LessonSortNo { get; set; } + public List TimeTableList { get; set; } + } + } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs index 4d9dec5ce..a6ac7efe5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeBLL.cs @@ -514,9 +514,9 @@ namespace Learun.Application.Base.AuthorizeModule case 8: // ѧϵ { var empinfo = dataAuthorizeService.GetEmpInfoEntityByNo(userInfo.account); - if (empinfo != null&&!string.IsNullOrEmpty(empinfo.DeptNo)) + if (empinfo != null&&empinfo.Rows.Count>0&&empinfo.Rows[0]["DeptNo"]!=null) { - text = empinfo.DeptNo; + text = empinfo.Rows[0]["DeptNo"].ToString(); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs index 3c3870537..a96feced9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/DataAuthorize/DataAuthorizeService.cs @@ -2,6 +2,7 @@ using Learun.DataBase.Repository; using Learun.Util; using System; using System.Collections.Generic; +using System.Data; using System.Text; namespace Learun.Application.Base.AuthorizeModule @@ -265,11 +266,11 @@ namespace Learun.Application.Base.AuthorizeModule #endregion - public dynamic GetEmpInfoEntityByNo(string keyValue) + public DataTable GetEmpInfoEntityByNo(string keyValue) { try { - return this.BaseRepository("CollegeMIS").FindEntity("select * from EmpInfo where EmpNo='"+keyValue+"'"); + return this.BaseRepository("CollegeMIS").FindTable("select * from EmpInfo where EmpNo='"+keyValue+"'"); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs index 1e3296b7e..1948b9075 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Form/Scheme/FormSchemeBLL.cs @@ -902,6 +902,11 @@ namespace Learun.Application.Form queryParamTemp.Add("lrend", queryParam["lrend"].ToDate()); querySql += " AND (" + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " >=@lrbegin AND " + formSchemeModel.mainTableName + "tt." + queryParam["lrdateField"].ToString() + " <=@lrend ) "; } + //自定义sql查询条件 + else if (queryParam != null && !queryParam["sqlwhere"].IsEmpty()) + { + querySql += " "+ queryParam["sqlwhere"].ToString(); + } else if (queryParam != null) // 复合条件查询 { @@ -932,7 +937,7 @@ namespace Learun.Application.Form { queryParam.Add(item.Key, item.Value); } - + return querySql; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs new file mode 100644 index 000000000..9eeeea5b6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanMap : EntityTypeConfiguration + { + public Exam_ExamPlanMap() + { + #region 表、主键 + //表 + this.ToTable("EXAM_EXAMPLAN"); + //主键 + this.HasKey(t => t.EPId); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 412f8b965..4e681e02f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -103,6 +103,8 @@ + + @@ -561,6 +563,16 @@ + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs new file mode 100644 index 000000000..912286693 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryReturnMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class Acc_DormitoryReturnMap : EntityTypeConfiguration + { + public Acc_DormitoryReturnMap() + { + #region 表、主键 + //表 + this.ToTable("ACC_DORMITORYRETURN"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs new file mode 100644 index 000000000..f56e03bcd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/Acc_DormitoryRuleMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LogisticsManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleMap : EntityTypeConfiguration + { + public Acc_DormitoryRuleMap() + { + #region 表、主键 + //表 + this.ToTable("ACC_DORMITORYRULE"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + 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 058d33054..12e74d8e0 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 @@ -74,15 +74,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { //参考写法 - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(fieldSql); - strSql.Append(" FROM ArrangeLessonTerm t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + strSql.Append(" FROM ArrangeLessonTerm t where 1=1 "); + + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.DeptNo = @DeptNo "); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); + strSql.Append(" AND t.MajorNo = @MajorNo "); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); + strSql.Append(" AND t.LessonNo = @LessonNo "); + } + if (!queryParam["TeachClassNo"].IsEmpty()) + { + dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String); + strSql.Append(" AND t.TeachClassNo like @TeachClassNo "); + } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); + strSql.Append(" AND t.EmpNo = @EmpNo "); + } + if (!queryParam["ClassroomNo"].IsEmpty()) + { + dp.Add("ClassroomNo", queryParam["ClassroomNo"].ToString(), DbType.String); + strSql.Append(" AND t.ClassroomNo = @ClassroomNo "); + } + + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); } catch (Exception ex) { @@ -684,7 +726,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest 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` - WHERE 1=1 AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); + WHERE 1=1 AND c.number IS NOT NULL AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); if (LessonList.Count() > 0) { @@ -758,7 +800,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_curriculum curriculum ON curriculum.id = a.curriculum LEFT JOIN tb_classroom room ON room.id = a.classroom LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher - WHERE semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); + WHERE a.type='1' and semester.year = '" + entity.AcademicYearNo + "' AND semester.number = '" + entity.Semester + "'"); var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync(@"SELECT * FROM TeachClass WHERE (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "' ")).ToList(); @@ -847,7 +889,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest LEFT JOIN tb_course cour ON cour.id= p.`course` LEFT JOIN tb_curriculum curr ON curr.id=cour.`course` WHERE s.year = '" + entity.AcademicYearNo + "' AND s.number = '" + entity.Semester - + "' AND sc.sid = '" + entity.F_SchoolId + "' ORDER BY p.`major` "); + + "' AND sc.sid = '" + entity.F_SchoolId + "' AND curr.`ification` ='1' ORDER BY p.`major` "); var majorData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); var lessonData = (await BaseRepository("CollegeMIS").FindListAsync()).ToList(); 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/ElectiveMajor/ElectiveMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs index 4152e37ad..106cc3bd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ElectiveMajor/ElectiveMajorService.cs @@ -4,6 +4,7 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Text; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -261,18 +262,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var now = DateTime.Now; var loginInfo = LoginUserInfo.Get(); + var list = db.FindList(x => x.OLPOEId == olpoeId); //添加 foreach (var item in dataList) { - var entity = new ElectiveMajorEntity(); - entity.Create(); - entity.OLPOEId = olpoeId; - entity.MajorId = item.ID; - entity.Grade = item.Grade; - entity.CreateUserId = loginInfo.userId; - entity.CreateUserName = loginInfo.realName; - entity.CreateDate = now; - db.Insert(entity); + //判断是否已选 + if (list.Where(x => x.MajorId == item.ID).Count() <= 0) + { + var entity = new ElectiveMajorEntity(); + entity.Create(); + entity.OLPOEId = olpoeId; + entity.MajorId = item.ID; + entity.Grade = item.Grade; + entity.CreateUserId = loginInfo.userId; + entity.CreateUserName = loginInfo.realName; + entity.CreateDate = now; + db.Insert(entity); + } } db.Commit(); } 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/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index def26cb76..0e1492ada 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -792,10 +792,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - //if (!string.IsNullOrEmpty(entity.DeptNo)) - //{ - // model.DeptNo = entity.DeptNo; - //} + if (!string.IsNullOrEmpty(entity.DeptNo)) + { + model.DeptNo = entity.DeptNo; + } db.Update(model); } } @@ -814,10 +814,10 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi { model.F_DepartmentId = entity.F_DepartmentId; } - //if (!string.IsNullOrEmpty(entity.DeptNo)) - //{ - // model.DeptNo = entity.DeptNo; - //} + if (!string.IsNullOrEmpty(entity.DeptNo)) + { + model.DeptNo = entity.DeptNo; + } db.Update(model); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs new file mode 100644 index 000000000..8fd0c72b6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanBLL : Exam_ExamPlanIBLL + { + private Exam_ExamPlanService exam_ExamPlanService = new Exam_ExamPlanService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return exam_ExamPlanService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Exam_ExamPlan表实体数据 + /// + /// 主键 + /// + public Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue) + { + try + { + return exam_ExamPlanService.GetExam_ExamPlanEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + exam_ExamPlanService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Exam_ExamPlanEntity entity) + { + try + { + exam_ExamPlanService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs new file mode 100644 index 000000000..33f884d50 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanEntity + { + #region 实体成员 + /// + /// EPId + /// + [Column("EPID")] + public string EPId { get; set; } + /// + /// 学年 + /// + [Column("ACADEMICYEARNO")] + public string AcademicYearNo { get; set; } + /// + /// 学期 + /// + [Column("SEMESTER")] + public int? Semester { get; set; } + /// + /// 排考名称 + /// + [Column("PLANNAME")] + public string PlanName { get; set; } + /// + /// 排考类型 + /// + [Column("PLANTYPE")] + public string PlanType { get; set; } + /// + /// 排考编号 + /// + [Column("PLANCODE")] + public string PlanCode { get; set; } + /// + /// 排考总人数 + /// + [Column("EPSTUCOUNT")] + public int? EPStuCount { get; set; } + /// + /// 是否随机生成座位 + /// + [Column("EPRANDOM")] + public bool? EPRandom { get; set; } + /// + /// 是否已生成 + /// + [Column("EPGENARATE")] + public bool? EPGenarate { get; set; } + /// + /// 排序号 + /// + [Column("EPORDER")] + public int? EPOrder { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.EPId = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.EPId = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs new file mode 100644 index 000000000..2775b00cc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public interface Exam_ExamPlanIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Exam_ExamPlan表实体数据 + /// + /// 主键 + /// + Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Exam_ExamPlanEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs new file mode 100644 index 000000000..88bd8b7c0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs @@ -0,0 +1,188 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-04-14 18:12 + /// 描 述：考试记录表 + /// + public class Exam_ExamPlanService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.EPId, + t.AcademicYearNo, + t.Semester, + t.PlanName, + t.PlanType, + t.PlanCode, + t.EPStuCount, + t.EPRandom, + t.EPGenarate, + t.EPOrder + "); + strSql.Append(" FROM Exam_ExamPlan t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo",queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester",queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + if (!queryParam["PlanName"].IsEmpty()) + { + dp.Add("PlanName", "%" + queryParam["PlanName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.PlanName Like @PlanName "); + } + if (!queryParam["PlanType"].IsEmpty()) + { + dp.Add("PlanType",queryParam["PlanType"].ToString(), DbType.String); + strSql.Append(" AND t.PlanType = @PlanType "); + } + if (!queryParam["PlanCode"].IsEmpty()) + { + dp.Add("PlanCode", "%" + queryParam["PlanCode"].ToString() + "%", DbType.String); + strSql.Append(" AND t.PlanCode Like @PlanCode "); + } + if (!queryParam["EPRandom"].IsEmpty()) + { + dp.Add("EPRandom",queryParam["EPRandom"].ToString(), DbType.String); + strSql.Append(" AND t.EPRandom = @EPRandom "); + } + if (!queryParam["EPGenarate"].IsEmpty()) + { + dp.Add("EPGenarate",queryParam["EPGenarate"].ToString(), DbType.String); + strSql.Append(" AND t.EPGenarate = @EPGenarate "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Exam_ExamPlan表实体数据 + /// + /// 主键 + /// + public Exam_ExamPlanEntity GetExam_ExamPlanEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t=>t.EPId == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, Exam_ExamPlanEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs index 2dd7f2d23..1bdfcc200 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs @@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetLessonByMajorNo(string majorNo) + { + try + { + return lessonInfoService.GetLessonByMajorNo(majorNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs index bb89e6e35..9e56b4fd0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs @@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetLessonByMajorNo(string majorNo); /// /// 获取LessonInfo表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 2bbbdb6c8..96e49ebe8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs @@ -100,6 +100,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetLessonByMajorNo(string majorNo) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.TeachMajorNo == majorNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + internal bool GetAny() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs index 3f3730287..c7b3e472e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs @@ -222,6 +222,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [NotMapped] public string LessonNo2 { get; set; } [NotMapped] public string EmpNo2 { get; set; } + [NotMapped] public string LessonTypeId { get; set; } + /// /// 选课专业列表 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index c2ec1f140..6e76ce297 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -100,9 +100,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1"); var strSql = new StringBuilder(); - strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id + strSql.Append(@"select b.*,leif.LessonTypeId,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo - left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo + left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo left join LessonInfo leif on b.LessonNo=leif.LessonNo where not exists ( "); //不显示与已选课程 相同课程名称相同教师的课程 strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id "); @@ -359,7 +359,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { list = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); } - + //选课专业 + var majorSql = + @"SELECT t.MajorName,t.MajorNo,a.* FROM ElectiveMajor a left join CdMajor t on a.majorid=t.id"; + var electiveMajorList = this.BaseRepository("CollegeMIS").FindList(majorSql); foreach (var item in list) { //模式二：正式选课 @@ -381,6 +384,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration item.StuNumPre = aaa.Where(x => x.Status == 2).Count(); + //选课专业 + item.ElectiveMajorList = electiveMajorList.Where(x => x.OLPOEId == item.Id).ToList(); } return list; @@ -415,14 +420,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var EmId = db.FindEntity(x => x.OLPOEId == OLPEIdOne)?.EmId; var OLPEIdTwo = db.FindEntity(x => x.EmId == EmId && x.OLPOEId != OLPEIdOne).OLPOEId; var lessonInfoEntity = db.FindEntity(x => x.LessonNo == entity.AfterLessonNo); + //选修课开课计划 + db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdOne}' "); - db.ExecuteBySql($"update OpenLessonPlanOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdOne}' "); - db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); + //学生选课表 + db.ExecuteBySql($"update StuSelectLessonListOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where OLPEId='{OLPEIdOne}' "); db.ExecuteBySql($"update StuSelectLessonListOfElectivePre set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where OLPEId='{OLPEIdOne}' "); - db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where EmId='{EmId}' "); - db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}' where EMId='{EmId}' "); - db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where Id='{OLPEIdTwo}' "); - db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',EmpNo='{entity.AfterEmpNo}',ClassRoomNo='{entity.AfterClassRoomNo}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); + //选修合班明细 + db.ExecuteBySql($"update ElectiveMergeItem set EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where EmId='{EmId}' "); + //合班合并结果 + db.ExecuteBySql($"update ElectiveMerge set LessonId='{lessonInfoEntity?.LessonId}',LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}' where EMId='{EmId}' "); + //合班异动数据记录 + db.ExecuteBySql($"update OpenLessonPlanOfElectiveDel set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where Id='{OLPEIdTwo}' "); + //选修课程表 + db.ExecuteBySql($"update ArrangeLessonTermOfElective set LessonNo='{entity.AfterLessonNo}',LessonName='{entity.AfterLessonName}',EmpNo='{entity.AfterEmpNo}',EmpName='{entity.AfterEmpName}',ClassRoomNo='{entity.AfterClassRoomNo}',ClassRoomName='{entity.AfterClassRoomName}' where PaiKeId='{OLPEIdOne}' or PaiKeId='{OLPEIdTwo}' "); db.Commit(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs index 280180925..690b6a29c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElectiveChange/OpenLessonPlanOfElectiveChangeEntity.cs @@ -107,6 +107,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string EmpNo { get; set; } [NotMapped] public string ClassRoomNo { get; set; } + [NotMapped] + public string AfterLessonName { get; set; } + [NotMapped] + public string AfterEmpName { get; set; } + [NotMapped] + public string AfterClassRoomName { get; set; } #endregion } 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() { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs index 9fc249220..f311eb7a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs @@ -677,6 +677,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + public IEnumerable GetScoreListByStuInfo(string queryJson) + { + try + { + return stuScoreService.GetScoreListByStuInfo(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetStuGraduateInfo(string queryJson) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs index 5b3681e63..4be5477b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreEntity.cs @@ -388,11 +388,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// - /// 成绩格式化(补)(重) + /// 成绩格式化(补)(重)(选修) /// [NotMapped] public string ScoreFormat { get; set; } + /// + /// 补考成绩 + /// + [NotMapped] + public string ScoreOfNotPass { get; set; } + /// + /// 二次补考成绩 + /// + [NotMapped] + public string ScoreOfNotPassTwo { get; set; } + /// + /// 课程类别名称 + /// + /// + [NotMapped] + public string LessonSortName { get; set; } + /// + /// 专业名称 + /// + [NotMapped] + public string MajorName { get; set; } + /// + /// 专业排名 + /// + [NotMapped] + public int RankInMajor { get; set; } + /// + /// 班级排名 + /// + [NotMapped] + public int RankInClass { get; set; } + + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs index 1943c15b9..7e987896c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs @@ -182,6 +182,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetScoreListByStuNo(string queryJson); + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + IEnumerable GetScoreListByStuInfo(string queryJson); /// /// 获取个人成绩列表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index d80ecc687..c10ba0ced 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -1839,7 +1839,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad var strSql = new StringBuilder(); strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName "); strSql.Append(" ,case when bb.LessonSortNo='2' then bb.Score else (case when bb.Score >=60 then bb.Score else (case when sp.Score>= 60 then sp.Score else (case when spt.Score>=60 then spt.Score else bb.Score end) end) end) end as Score "); - strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score) else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); + strSql.Append(" ,case when bb.LessonSortNo='2' then convert(nvarchar(50),bb.Score)+'(选修)' else (case when bb.Score >=60 then convert(nvarchar(50),bb.Score) else (case when sp.Score>= 60 then convert(nvarchar(50),sp.Score)+'(补)' else (case when spt.Score>=60 then convert(nvarchar(50),spt.Score)+'(重)' else convert(nvarchar(50),bb.Score) end) end) end) end as ScoreFormat "); strSql.Append(" from ( "); strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); strSql.Append(" where 1=1 and s.CheckMark='1' "); @@ -1876,5 +1876,125 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad } } } + + /// + /// 根据学号/姓名获取学生成绩列表 + /// + /// + /// + public IEnumerable GetScoreListByStuInfo(string queryJson) + { + try + { + //参考写法 + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var tableName = "StuScore"; + if (!queryParam["TableName"].IsEmpty()) + { + tableName = queryParam["TableName"].ToString(); + } + var strSql = new StringBuilder(); + strSql.Append(" select bb.AcademicYearNo,bb.Semester,bb.LessonSortNo,bb.LessonNo,bb.LessonName,bb.StuNo,bb.StuName,bb.MajorNo,bb.ClassNo,li.StudyScore,ls.LessonSortName,bb.Score,sp.Score as ScoreOfNotPass,spt.Score as ScoreOfNotPassTwo,cm.MajorName,ci.ClassName "); + strSql.Append(" from ( "); + strSql.Append($"select s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo,Max(s.Score) as Score from {tableName} s left join StuInfoBasic sb on s.StuNo=sb.StuNo "); + strSql.Append(" where 1=1 and s.CheckMark='1' "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" and s.AcademicYearNo=@AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" and s.Semester=@Semester "); + } + if (!queryParam["StuNo"].IsEmpty()) + { + dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String); + strSql.Append(" and s.StuNo=@StuNo "); + } + if (!queryParam["StuName"].IsEmpty()) + { + dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String); + strSql.Append(" and s.StuName=@StuName "); + } + strSql.Append(" group by s.AcademicYearNo,s.Semester,s.LessonSortNo,s.LessonNo,s.LessonName,s.StuNo,sb.StuName,s.MajorNo,s.ClassNo ) as bb "); + strSql.Append(" left join StuScoreNotPass sp on bb.AcademicYearNo=sp.AcademicYearNo and bb.Semester=sp.Semester and bb.LessonSortNo=sp.LessonSortNo and bb.LessonNo=sp.LessonNo and bb.LessonName=sp.LessonName and bb.StuNo=sp.StuNo and sp.CheckMark = '1' "); + strSql.Append(" left join StuScoreNotPassTwo spt on bb.AcademicYearNo=spt.AcademicYearNo and bb.Semester=spt.Semester and bb.LessonSortNo=spt.LessonSortNo and bb.LessonNo=spt.LessonNo and bb.LessonName=spt.LessonName and bb.StuNo=spt.StuNo and spt.CheckMark = '1' "); + strSql.Append(" left join CdLessonSort ls on bb.LessonSortNo= ls.LessonSortNo "); + strSql.Append(" left join LessonInfo li on bb.LessonNo= li.LessonNo and li.CheckMark='1' "); + strSql.Append(" left join CdMajor cm on bb.MajorNo= cm.MajorNo and cm.CheckMark='1' "); + strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' "); + + var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + + //计算专业排名，班级排名 + if (result.Any()) + { + var temp = result.GroupBy(x=>new { x.AcademicYearNo,x.Semester}).Select(x => new StuScoreEntity() + { + AcademicYearNo=x.Key.AcademicYearNo, + Semester=x.Key.Semester, + StuNo=x.FirstOrDefault().StuNo, + ClassNo=x.FirstOrDefault().ClassNo, + MajorNo=x.FirstOrDefault().MajorNo + }).ToList(); + if (temp.Any()) + { + foreach (var item in temp) + { + //专业排名 + var ml = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.MajorNo == item.MajorNo && x.CheckMark == "1"); + var mlGroup = ml.GroupBy(x => x.StuNo).Select(x => new + { + StuNo = x.Key, + TotalScore = x.Select(y => y.Score).Sum() + }).OrderByDescending(x => x.TotalScore); + if (mlGroup.Any()) + { + var rank = mlGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); + item.RankInMajor = rank + 1; + } + //班级排名 + var cl = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == item.AcademicYearNo && x.Semester == item.Semester && x.LessonSortNo == "1" && x.ClassNo == item.ClassNo && x.CheckMark == "1"); + var clGroup = cl.GroupBy(x => x.StuNo).Select(x => new + { + StuNo = x.Key, + TotalScore = x.Select(y => y.Score).Sum() + }).OrderByDescending(x => x.TotalScore); + if (clGroup.Any()) + { + var rank = clGroup.Select(x => x.StuNo).ToList().IndexOf(item.StuNo); + item.RankInClass = rank + 1; + } + } + } + foreach (var ii in result) + { + ii.RankInMajor = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInMajor; + ii.RankInClass = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInClass; + } + + } + + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs index b083b6586..06edde13f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs @@ -65,6 +65,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + return stuScoreNotPassService.GetPageListForUnpass(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取实体数据 /// 主键 @@ -187,6 +206,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化补考成绩 + /// + public void InitScore() + { + try + { + stuScoreNotPassService.InitScore(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs index c937dc615..d5a83aac9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassEntity.cs @@ -328,5 +328,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion } + + public class NotPassEntity + { + public string stuno { get; set; } + public string stuname { get; set; } + public string LessonName { get; set; } + public string Grade { get; set; } + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public string classname { get; set; } + public string OrdinaryScore2 { get; set; } + public string TermEndScore2 { get; set; } + public string Score2 { get; set; } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs index 509b479e6..ad1e1472d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs @@ -26,6 +26,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取实体数据 /// 主键 @@ -61,6 +62,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void SaveEntity(string keyValue, StuScoreNotPassEntity entity); + void InitScore(); #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs index 464fdc255..501189f44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs @@ -163,6 +163,67 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) +else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) +else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) +else CONVERT(varchar,a.Score) end as Score2 "); + strSql.Append(@" from StuScore a left join StuInfoBasic b on b.StuNo=a.StuNo "); + strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); + } + if (!queryParam["Semester"].IsEmpty()) + { + strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); + } + if (!queryParam["grade"].IsEmpty()) + { + strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); + } + if (!queryParam["ClassNo"].IsEmpty()) + { + strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); + } + + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取实体数据 /// 主键 @@ -342,6 +403,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化补考成绩 + /// + public void InitScore() + { + try + { + string sql = @"insert into StuScoreNotPass +(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, + TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) + select + NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', + '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' + from + ( + select a.* from +StuScore a +left join StuInfoBasic b on b.StuNo=a.StuNo +where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) +and a.StuNo not in ( +select StuNo from StuScoreNotPass p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo +) +) as bb +order by bb.ScoreId"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion #region 扩展数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs index d9169e806..fa7db1635 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoBLL.cs @@ -65,6 +65,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 二次补考名单查看 + /// + /// + /// + /// + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + return stuScoreNotPassTwoService.GetPageListForUnpass(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -164,6 +188,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 初始化二次补考成绩 + /// + public void InitScore() + { + try + { + stuScoreNotPassTwoService.InitScore(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs index bf26394c2..fe3be3622 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoIBLL.cs @@ -27,6 +27,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson); /// /// 获取StuScoreNotPassTwo表实体数据 /// 主键 @@ -57,6 +58,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void DeleteEntity(string keyValue); + void InitScore(); /// /// 保存实体数据（新增、修改） /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs index e13506595..979fee09a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPassTwo/StuScoreNotPassTwoService.cs @@ -249,6 +249,73 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 二次补考成绩查看 + /// + /// + /// + /// + public IEnumerable GetPageListForUnpass(Pagination pagination, string queryJson) + { + try + { + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); + strSql.Append(@"select a.*,(select classname from classinfo where a.classno=classno) as classname,case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.OrdinaryScore=ScoreStyleNo) +else CONVERT(varchar,a.OrdinaryScore) end as OrdinaryScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.TermEndScore=ScoreStyleNo) +else CONVERT(varchar,a.TermEndScore) end as TermEndScore2, +case when a.ScoreRecordStyleNo in ('2','3') then (select ScoreName from CdScorePoint where a.ScoreRecordStyleNo=ScoreRecordStyleNo and a.Score=ScoreStyleNo) +else CONVERT(varchar,a.Score) end as Score2 "); + strSql.Append(@" from StuScoreNotPass a left join StuInfoBasic b on b.StuNo=a.StuNo "); + strSql.Append(@"where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + strSql.Append($" and a.AcademicYearNo ='{queryParam["AcademicYearNo"].ToString()}'"); + } + if (!queryParam["Semester"].IsEmpty()) + { + strSql.Append($" and a.Semester ='{queryParam["Semester"].ToString().Trim()}'"); + } + if (!queryParam["grade"].IsEmpty()) + { + strSql.Append($" and a.grade ='{queryParam["grade"].ToString()}'"); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + strSql.Append($" and a.DeptNo ='{queryParam["DeptNo"].ToString()}'"); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + strSql.Append($" and a.MajorNo ='{queryParam["MajorNo"].ToString()}'"); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + strSql.Append($" and a.LessonNo ='{queryParam["LessonNo"].ToString()}'"); + } + if (!queryParam["ClassNo"].IsEmpty()) + { + strSql.Append($" and a.ClassNo ='{queryParam["ClassNo"].ToString()}'"); + } + + strSql.Append(" and (b.AbmormityMoveMark<>'1' or len(b.AbmormityMoveMark)=0 or b.AbmormityMoveMark is null) "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 @@ -310,10 +377,58 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + #endregion #region 扩展数据 + /// + /// 初始化二次补考成绩 + /// + public void InitScore() + { + try + { + string sql = @"insert into StuScoreNotPassTwo +(NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, OrdinaryScore, TermInScore, + TermEndScore, OtherScore, IsInEffect, ConflictLessonNo, IsReStudy, CheckMark, + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, IsEditable) + select + NoticeBookNo, StuNo, DeptNo, MajorNo, ClassNo, StuName, GenderNo, AcademicYearNo, Semester, + OpenLessonDeptNo, OpenLessonMajorNo, LessonNo, LessonName, LessonNameEn, TeachClassNo, LessonSortNo, + StuSortNo, Grade, StudyScore, TotalStudyHour, zysx, TestModeNo, ScoreRecordStyleNo, '0', '0', + '0', '0', IsInEffect, ConflictLessonNo, IsReStudy, '0', + IsPitchOn, EmpNo, TechPlanNo, TestKindNo, PartCode, '1' + from + ( + select a.* from +StuScoreNotPass a +left join StuInfoBasic b on b.StuNo=a.StuNo +where a.LessonSortNo='1' and b.AbmormityMoveMark <> '1' +and ( (a.Score >= 0 and a.Score<60) or a.Score=(-5) or a.Score=(-10) ) +and a.StuNo not in ( +select StuNo from StuScoreNotPassTwo p where p.AcademicYearNo=a.AcademicYearNo and p.Semester=a.Semester and p.LessonNo=a.LessonNo and p.TeachClassNo=a.TeachClassNo and p.LessonSortNo=a.LessonSortNo and p.OpenLessonDeptNo=a.OpenLessonDeptNo and p.OpenLessonMajorNo=a.OpenLessonMajorNo +) +) as bb +order by bb.ScoreId"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 学年下拉框信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs index 70f099fe1..d27073da4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs @@ -212,6 +212,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 扩展字段 [NotMapped] public string F_SchoolId { get; set; } + [NotMapped] public string LessonTypeId { get; set; } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs index 1ff93c134..9bff6fd34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs @@ -29,8 +29,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.* "); - strSql.Append(" FROM StuSelectLessonListOfElective t "); + strSql.Append("SELECT t.*,leif.LessonTypeId "); + strSql.Append(" FROM StuSelectLessonListOfElective t left join LessonInfo leif on t.LessonNo=leif.LessonNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 187108297..3b7c60111 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -279,8 +279,16 @@ + + + + + + + + @@ -1695,34 +1703,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs new file mode 100644 index 000000000..491d215b1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleBLL.cs @@ -0,0 +1,148 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleBLL : Acc_DormitoryRuleIBLL + { + private Acc_DormitoryRuleService acc_DormitoryRuleService = new Acc_DormitoryRuleService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return acc_DormitoryRuleService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) + { + try + { + return acc_DormitoryRuleService.GetAcc_DormitoryRuleEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// + public Acc_DormitoryRuleEntity GetEnableEntity() + { + try + { + return acc_DormitoryRuleService.GetEnableEntity(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + acc_DormitoryRuleService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) + { + try + { + acc_DormitoryRuleService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs new file mode 100644 index 000000000..351f0e912 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 晚归时间 + /// + [Column("LATERETURNTIME")] + public string LateReturnTime { get; set; } + /// + /// 推送人员 + /// + [Column("PUSHUSER")] + public string PushUser { get; set; } + /// + /// 是否推送班主任 + /// + [Column("CLASSDIREDCTOR")] + public int? ClassDiredctor { get; set; } + /// + /// 推送时间点 + /// + [Column("PUSHHOUR")] + public int? PushHour { get; set; } + /// + /// 是否启用 + /// + [Column("ISENABLE")] + public int? IsEnable { get; set; } + /// + /// CreateTime + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// CreateUserId + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// UpdateTime + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + /// + /// UpdateUserId + /// + [Column("UPDATEUSERID")] + public string UpdateUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs new file mode 100644 index 000000000..22b52a86d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleIBLL.cs @@ -0,0 +1,49 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public interface Acc_DormitoryRuleIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue); + Acc_DormitoryRuleEntity GetEnableEntity(); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs new file mode 100644 index 000000000..751c2f837 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs @@ -0,0 +1,168 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-14 12:05 + /// 描 述：宿舍晚归规则 + /// + public class Acc_DormitoryRuleService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.* + "); + strSql.Append(" FROM Acc_DormitoryRule t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetAcc_DormitoryRuleEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + /// + /// 获取Acc_DormitoryRule表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryRuleEntity GetEnableEntity() + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(x => x.IsEnable == 1); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, Acc_DormitoryRuleEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs index 8dfc1bb3a..0c0866c1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs @@ -19,12 +19,33 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("ID")] public string ID { get; set; } + /// + /// 编号 + /// + [Column("DNO")] + public string DNo { get; set; } + /// /// 名称 /// [Column("NAME")] public string Name { get; set; } /// + /// 宿舍楼 + /// + [Column("APARTMENTID")] + public string ApartmentId { get; set; } + /// + /// 单元 + /// + [Column("UNITID")] + public string UnitId { get; set; } + /// + /// 楼层 + /// + [Column("FLOORID")] + public string FloorId { get; set; } + /// /// 负责人 /// [Column("FUNCTIONARY")] @@ -145,9 +166,32 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// [Column("PLANBEDNUM")] public int? PlanBedNum { get; set; } + + /// + /// 寝室类型（几人寝） + /// + [Column("ROOMTYPE")] + public int? RoomType { get; set; } + /// + /// 入住人数 + /// + [Column("CHECKINSTU")] + public int? CheckInStu { get; set; } + /// + /// 是否归宿 + /// + [Column("ISRETURN")] + public int? IsReturn { get; set; } #endregion #region 扩展字段 + + [NotMapped] + public string ApartmentName { get; set; } + [NotMapped] + public string UnitName { get; set; } + [NotMapped] + public string FloorName { get; set; } /// /// 学生名字 /// @@ -176,6 +220,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [NotMapped] public string bedId { get; set; } + + [NotMapped] + public string DeptName { get; set; } + [NotMapped] + public string MajorName { get; set; } + [NotMapped] + public string ClassName { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs index efb5fe22b..41bda8acd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationBLL.cs @@ -42,6 +42,26 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + + public IEnumerable GetBedListByRoomId(string RoomId) + { + try + { + return accommodationService.GetBedListByRoomId(RoomId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public IEnumerable GetAllList() { try @@ -61,6 +81,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public IEnumerable GetClassifyList(Pagination paginationobj, string queryJson) + { + try + { + return accommodationService.GetClassifyList(paginationobj, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public object GetDormitoryList() { try @@ -179,6 +218,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } + public string GetParentBuildType(string keyValue) + { + try + { + return accommodationService.GetParentBuildType(keyValue); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + + } + /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -251,6 +311,61 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public List GetDept() + { + try + { + return accommodationService.GetSelectData("").Select(x => new Acc_DormitoryBuildEntity { Dept = x.Dept, DeptName = x.DeptName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetMajor(string strWhere) + { + try + { + return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Major = x.Major, MajorName = x.MajorName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public List GetClass(string strWhere) + { + try + { + return accommodationService.GetSelectData(strWhere).Select(x => new Acc_DormitoryBuildEntity { Class = x.Class, ClassName = x.ClassName }).Distinct().ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取左侧树形数据 /// @@ -270,8 +385,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement value = item.ID.ToString(), showcheck = false, checkstate = 0, - isexpand = false, - parentId = item.ParentID == null ? "" : item.ParentID + isexpand = true, + parentId = item.ParentID == null ? "" : item.ParentID, + title = item.BuildType }; @@ -339,9 +455,49 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + public List GetClassifyTree() + { + try + { + List list = accommodationService.GetClassifyTree(); + List treeList = new List(); + foreach (Acc_DormitoryBuildEntity item in list) + { + TreeModel node = new TreeModel + { + id = item.ID.ToString(), + text = item.Name.ToString(), + value = item.ID.ToString(), + showcheck = false, + checkstate = 0, + isexpand = false, + parentId = item.ParentID == null ? "" : item.ParentID, + title = string.IsNullOrEmpty(item.BuildType) ? "" : (Convert.ToInt32(item.BuildType) + 1).ToString(), + }; + treeList.Add(node); + + + } + + + return treeList.ToTree(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 根据父id 获取树形数据 @@ -386,7 +542,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - /// + /// /// 根据父id 获取树形数据 /// /// @@ -431,11 +587,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - public bool MatchDormitoryInfo(string stuNo,string dormitory,string unit,string floor,string room,string bed ,List data) + public bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed, List data) { try { - return accommodationService.MatchDormitoryInfo(stuNo,dormitory,unit,floor,room,bed,data); + return accommodationService.MatchDormitoryInfo(stuNo, dormitory, unit, floor, room, bed, data); } catch (Exception ex) @@ -481,6 +637,31 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteBed(string keyValue, string ParentID) + { + try + { + accommodationService.DeleteBed(keyValue, ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 保存实体数据（新增、修改） /// 主键 @@ -505,6 +686,74 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) + { + try + { + accommodationService.SaveBedEntity(keyValue, ParentID, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + + /// + /// 分配系 + /// + /// + /// + public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) + { + try + { + accommodationService.SaveDeptClass(keyValue, entity, type); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public string SaveRoom(string RoomId, List list) + { + try + { + return accommodationService.SaveRoom(RoomId, list); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 批量添加单元、楼层、宿舍、床位 @@ -581,7 +830,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } - #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs index 41cd164b0..2050f1292 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationIBLL.cs @@ -21,7 +21,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetBedListByRoomId(string RoomId); IEnumerable GetAllList(); + IEnumerable GetClassifyList(Pagination paginationobj,string queryJson); /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -42,6 +44,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// List GetList(); + List GetDept(); + List GetMajor(string strWhere); + List GetClass(string strWhere); /// /// 获取左侧树形数据 /// @@ -50,6 +55,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement string GetDormitoryInfoByStuNo(string val); List GetTree(); List GetTreeNew(); + List GetClassifyTree(); bool MatchDormitoryInfo(string stuNo, string dormitory, string unit, string floor, string room, string bed,List data); @@ -68,7 +74,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void DeleteEntity(string keyValue); + void DeleteBed(string keyValue, string ParentID); string GetBuildType(string parentID); + string GetParentBuildType(string keyValue); /// /// 保存实体数据（新增、修改） @@ -76,7 +84,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// /// void SaveEntity(string keyValue, Acc_DormitoryBuildEntity entity); - + void SaveBedEntity(string keyValue,string ParentID, Acc_DormitoryBuildEntity entity); + void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity,int type); + string SaveRoom(string RoomId, List list); /// /// 批量添加单元、楼层、房间、床位 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index 21b627eb3..ade272d6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -51,10 +51,14 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.ParentID, t.Remark, t.Starred, - t.HasToilet, - stb.StuName + t.HasToilet,t.RoomType, +t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, +a.name as ApartmentName,b.name as UnitName,c.Name as FloorName "); - strSql.Append(" FROM Acc_DormitoryBuild t LEFT JOIN dbo.StuInfoBasic stb ON t.StudentID=stb.StuId"); + strSql.Append(" FROM Acc_DormitoryBuild t "); + strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -64,6 +68,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); strSql.Append(" AND t.ParentID =@ParentID "); } + //else + //{ + // strSql.Append(" AND t.BuildType ='4' "); + //} + + if (!queryParam["ApartmentId"].IsEmpty()) + { + dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.ApartmentId =@ApartmentId "); + } + if (!queryParam["UnitId"].IsEmpty()) + { + dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); + strSql.Append(" AND t.UnitId =@UnitId "); + } + if (!queryParam["FloorId"].IsEmpty()) + { + dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); + strSql.Append(" AND t.FloorId =@FloorId "); + } + if (!queryParam["Name"].IsEmpty()) { dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); @@ -76,18 +101,18 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } if (!queryParam["Dept"].IsEmpty()) { - dp.Add("Dept", "%" + queryParam["Dept"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Dept Like @Dept "); + dp.Add("Dept", queryParam["Dept"].ToString(), DbType.String); + strSql.Append(" AND t.Dept=@Dept "); } if (!queryParam["Class"].IsEmpty()) { - dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Class Like @Class "); + dp.Add("Class", queryParam["Class"].ToString(), DbType.String); + strSql.Append(" AND t.Class=@Class "); } if (!queryParam["Major"].IsEmpty()) { - dp.Add("Major", "%" + queryParam["Major"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Major Like @Major "); + dp.Add("Major", queryParam["Major"].ToString(), DbType.String); + strSql.Append(" AND t.Major=@Major "); } if (!queryParam["Sex"].IsEmpty()) { @@ -104,6 +129,53 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("Leader", "%" + queryParam["Leader"].ToString() + "%", DbType.String); strSql.Append(" AND t.Leader Like @Leader "); } + + if (!queryParam["NoDistribution"].IsEmpty()) + { + var noDistribution = queryParam["NoDistribution"].ToString(); + if (noDistribution.Contains("dept")) + { + strSql.Append(" AND (t.Dept is null or len(t.Dept)=0) "); + } + if (noDistribution.Contains("major")) + { + strSql.Append(" AND (t.Major is null or len(t.Major)=0) "); + } + if (noDistribution.Contains("class")) + { + strSql.Append(" AND (t.Class is null or len(t.Class)=0) "); + } + if (noDistribution.Contains("room")) + { + strSql.Append(" AND (t.CheckInStu is null or len(t.CheckInStu)=0 or t.CheckInStu=0) "); + } + } + if (!queryParam["Distribution"].IsEmpty()) + { + var distribution = queryParam["Distribution"].ToString(); + if (distribution.Contains("dept")) + { + strSql.Append(" AND len(t.Dept)>0 "); + } + if (distribution.Contains("major")) + { + strSql.Append(" AND len(t.Major)>0 "); + } + if (distribution.Contains("class")) + { + strSql.Append(" AND len(t.Class)>0 "); + } + if (distribution.Contains("room")) + { + strSql.Append(" AND t.CheckInStu>0 "); + } + } + + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).OrderBy(a => a.Name).ThenBy(a => a.Name).ToList(); } catch (Exception ex) @@ -118,6 +190,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } + + public IEnumerable GetBedListByRoomId(string RoomId) + { + try + { + string sql = $"select ID,Name,DNo,StudentID from Acc_DormitoryBuild where BuildType='5' and ParentID='{RoomId}'"; + return this.BaseRepository("CollegeMIS").FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public IEnumerable GetAllList() { try @@ -137,11 +230,95 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + public IEnumerable GetClassifyList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.Name, + t.Address, + t.Campus, + t.Dept, + t.BuildType, + t.Major, + t.Class, + t.Sex, + t.Functionary, + t.Phone, + t.Price, + t.Leader, + t.StudentID, + t.PlanStudentID, + t.ParentID, + t.Remark, + t.Starred, + t.HasToilet,t.RoomType, +t.ApartmentId,t.UnitId,t.FloorId,t.CheckInStu, +a.name as ApartmentName,b.name as UnitName,c.Name as FloorName + "); + strSql.Append(" FROM Acc_DormitoryBuild t "); + strSql.Append(@" left join (select * FROM Acc_DormitoryBuild where BuildType='1') a on t.ApartmentId=a.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '2') b on t.UnitId = b.ID + left join(select * FROM Acc_DormitoryBuild where BuildType = '3') c on t.FloorId = c.ID "); + strSql.Append(" WHERE 1=1 and (t.BuildType<>'5' and t.BuildType<>'4') "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["ParentID"].IsEmpty()) + { + dp.Add("ParentID", queryParam["ParentID"].ToString(), DbType.String); + strSql.Append(" AND t.ParentID =@ParentID "); + } + if (!queryParam["keyword"].IsEmpty()) + { + strSql.Append($" AND t.Name like '%{queryParam["keyword"].ToString()}%' "); + } + if (!queryParam["ApartmentId"].IsEmpty()) + { + dp.Add("ApartmentId", queryParam["ApartmentId"].ToString(), DbType.String); + strSql.Append(" AND t.ApartmentId =@ApartmentId "); + } + if (!queryParam["UnitId"].IsEmpty()) + { + dp.Add("UnitId", queryParam["UnitId"].ToString(), DbType.String); + strSql.Append(" AND t.UnitId =@UnitId "); + } + if (!queryParam["FloorId"].IsEmpty()) + { + dp.Add("FloorId", queryParam["FloorId"].ToString(), DbType.String); + strSql.Append(" AND t.FloorId =@FloorId "); + } + + if (!queryParam["Name"].IsEmpty()) + { + dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Name Like @Name "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).ToList(); + //return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + internal string GetBuildType(string parentID) { try { - var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ParentID == parentID); + var entity = this.BaseRepository("CollegeMIS").FindEntity(a => a.ID == parentID); if (null != entity) { return entity.BuildType; @@ -164,6 +341,35 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public string GetParentBuildType(string keyValue) + { + try + { + string sql = $@" select BuildType from [dbo].[Acc_DormitoryBuild] where Id=( + select parentid from [dbo].[Acc_DormitoryBuild] where id='{keyValue}')"; + var data = this.BaseRepository("CollegeMIS").FindObject(sql); + if (data == null) + { + return ""; + } + else + { + return data.ToString(); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + internal object GetRoomList(string parentID) { try @@ -418,7 +624,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement floorInfo.dormitory = bed; if (!string.IsNullOrEmpty(bed.StudentID)) { - floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuId == bed.StudentID); + floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity(a => a.StuNo == bed.StudentID); } list.Add(floorInfo); } @@ -510,6 +716,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public List GetClassifyTree() + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => (x.BuildType == "2" || x.BuildType == "1")).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取Acc_DormitoryBuild表实体数据 /// 主键 @@ -582,7 +807,44 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { - return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); + return this.BaseRepository("CollegeMIS").FindList(a => a.BuildType != "5" && a.BuildType != "4").OrderBy(a => a.sort).ThenBy(a => a.Name).ToList(); + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取非空床的系部专业 班级 + /// + /// + public List GetSelectData(string strWhere) + { + try + { + string sql = + @"select distinct dept,d.DeptName,major,m.MajorName,class,c.ClassName from [dbo].[Acc_DormitoryBuild] t +join CdDept d on t.dept=d.deptno +join CdMajor m on t.major=m.majorno +join ClassInfo c on t.class=c.classno +where t.ID in ( +select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +)"; + if (!string.IsNullOrEmpty(strWhere)) + { + sql += " and " + strWhere; + } + + return this.BaseRepository("CollegeMIS").FindList(sql).ToList(); } catch (Exception ex) @@ -598,6 +860,41 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 获取树形数据(学生归宿) + /// + /// + public List GetSqlTreeForReturn() + { + try + { + List list = new List(); + var roomSql = @"select * from [dbo].[Acc_DormitoryBuild] where ID in ( +select parentid from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +)"; + List roomList = this.BaseRepository("CollegeMIS") + .FindList(roomSql).ToList(); + list = roomList.Union(list).ToList(); + var apartIds = roomList.Select(x => x.ApartmentId).Distinct().ToList(); + var unitIds = roomList.Select(x => x.UnitId).Distinct().ToList(); + var floorIds = roomList.Select(x => x.FloorId).Distinct().ToList(); + var otherList = this.BaseRepository("CollegeMIS").FindList(x => + apartIds.Contains(x.ID) || unitIds.Contains(x.ID) || floorIds.Contains(x.ID)).ToList(); + list = list.Union(otherList).ToList(); + return list.OrderBy(x => x.DNo).OrderBy(x => x.Name).ToList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } /// /// 根据父id获取数据 /// @@ -734,6 +1031,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } bedInfo.StudentID = stuInfo.StuId; bedInfo.StuName = stuInfo.StuName; + bedInfo.Dept = stuInfo.DeptNo; + bedInfo.Major = stuInfo.MajorNo; + bedInfo.Class = stuInfo.ClassNo; + bedInfo.Sex = Convert.ToString(stuInfo.GenderNo); this.BaseRepository("CollegeMIS").Update(bedInfo); return true; } @@ -799,6 +1100,27 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + public void DeleteBed(string keyValue, string ParentID) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); + UpdateCheckInNum(ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public void DeleteAll(string parentid) { var list = this.BaseRepository("CollegeMIS").FindList(a => a.ParentID == parentid).ToList(); @@ -842,7 +1164,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var elementEntity = new Acc_DormitoryBuildEntity { ParentID = keyValue, + ApartmentId = keyValue, Name = i.ToString() + "单元", + DNo = i.ToString(), BuildType = "2",//单元类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -859,6 +1183,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement UpdateTime = DateTime.Now }; elementEntity.Create(); + elementEntity.UnitId = elementEntity.ID; list.Add(elementEntity); //添加楼层 @@ -869,7 +1194,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var floorEntity = new Acc_DormitoryBuildEntity { ParentID = elementEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, Name = j.ToString() + "层", + DNo = j.ToString(), BuildType = "3",//楼层类型, Sex = dormitory.Sex, Address = dormitory.Address, @@ -886,6 +1214,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement UpdateTime = DateTime.Now }; floorEntity.Create(); + floorEntity.FloorId = floorEntity.ID; list.Add(floorEntity); //添加房间 @@ -896,7 +1225,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var roomEntity = new Acc_DormitoryBuildEntity { ParentID = floorEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, + FloorId = floorEntity.ID, Name = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()) + "室", + DNo = j.ToString() + (n < 10 ? "0" + n.ToString() : n.ToString()), BuildType = "4",//房间类型 Sex = dormitory.Sex, Address = dormitory.Address, @@ -909,6 +1242,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Major = dormitory.Major, Phone = dormitory.Phone, Price = dormitory.Price, + RoomType = bedNum, UpdateBy = currentUser.realName, UpdateTime = DateTime.Now, Starred = "3", @@ -925,7 +1259,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var bedEntity = new Acc_DormitoryBuildEntity { ParentID = roomEntity.ID, + ApartmentId = keyValue, + UnitId = elementEntity.ID, + FloorId = floorEntity.ID, Name = m.ToString() + "床", + DNo = m.ToString(), BuildType = "5", Sex = dormitory.Sex, Address = dormitory.Address, @@ -1275,9 +1613,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } else { + entity.Create(); if (entity.BuildType == "1") { - if (string.IsNullOrEmpty(entity.ParentID)) + entity.ApartmentId = entity.ID; + if (string.IsNullOrEmpty(entity.ParentID) || entity.ParentID == "-1") { var rootNode = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ParentID == null); if (rootNode == null) @@ -1291,6 +1631,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement rootEntity.CreateTime = DateTime.Now; rootEntity.UpdateBy = currentUser.realName; rootEntity.UpdateTime = DateTime.Now; + rootEntity.ApartmentId = rootEntity.ID; entity.ParentID = rootEntity.ID; this.BaseRepository("CollegeMIS").Insert(rootEntity); } @@ -1300,7 +1641,33 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } } - entity.Create(); + else + { + //上一级 + var parentity = this.BaseRepository("CollegeMIS").FindList().FirstOrDefault(a => a.ID == entity.ParentID); + switch (parentity.BuildType) + { + case "1": + entity.ApartmentId = parentity.ID; + entity.UnitId = entity.ID; + break; + case "2": + { + entity.FloorId = entity.ID; + entity.UnitId = parentity.ID; + entity.ApartmentId = parentity.ApartmentId; + } + break; + case "3": + { + entity.FloorId = parentity.ID; + entity.UnitId = parentity.UnitId; + entity.ApartmentId = parentity.ApartmentId; + } + break; + } + } + entity.CreateBy = currentUser.realName; entity.CreateTime = DateTime.Now; entity.UpdateBy = currentUser.realName; @@ -1321,6 +1688,157 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveBedEntity(string keyValue, string ParentID, Acc_DormitoryBuildEntity entity) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + db.Update(entity); + } + else + { + var parentEntity = db.FindEntity(ParentID); + entity.Create(); + entity.ApartmentId = parentEntity.ApartmentId; + entity.UnitId = parentEntity.UnitId; + entity.FloorId = parentEntity.FloorId; + entity.ParentID = ParentID; + entity.BuildType = "5"; + db.Insert(entity); + } + db.Commit(); + UpdateCheckInNum(ParentID); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + private void UpdateCheckInNum(string ParentID) + { + try + { + string sql = $@"update [dbo].[Acc_DormitoryBuild] set RoomType=( +select count(1) from [dbo].[Acc_DormitoryBuild] where ParentId='{ParentID}' and BuildType='5' +) +where ID='{ParentID}' +"; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + public void SaveDeptClass(string keyValue, Acc_DormitoryBuildEntity entity, int type) + { + try + { + if (keyValue.Contains(",")) + { + keyValue = string.Join("','", keyValue.Split(',')); + } + string sql = $"update Acc_DormitoryBuild set "; + if (type == 1) + { + sql += $" Dept='{entity.Dept}' "; + } + else + { + sql += $"Major='{entity.Major}',Class='{entity.Class}'"; + } + + sql += $" where ID in ('{keyValue}')"; + + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 分配宿舍 + /// + /// + /// + public string SaveRoom(string RoomId, List list) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + foreach (var entity in list) + { + //判断该学生是否已分配 + if (!string.IsNullOrEmpty(entity.StudentID)) + { + var count = db.FindList().Count(x => x.StudentID == entity.StudentID && x.ID != entity.ID); + if (count > 0) + { + var stuname = db.FindEntity(x => x.StuNo == entity.StudentID)?.StuName; + return "学生" + stuname + "已分配床位，不可重复分配！"; + } + } + + //分配床位 + string sql = $"update Acc_DormitoryBuild set StudentID='{entity.StudentID}' where ID='{entity.ID}'"; + db.ExecuteBySql(sql); + } + + int checkInStu = list.Where(x => x.StudentID != null).Count(); + string checkInSql = $"update Acc_DormitoryBuild set CheckInStu='{checkInStu}' where ID='{RoomId}'"; + db.ExecuteBySql(checkInSql); + + db.Commit(); + return ""; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 同步宿舍信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs new file mode 100644 index 000000000..3e91d02ac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/Acc_DormitoryReturnEntity.cs @@ -0,0 +1,104 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class Acc_DormitoryReturnEntity + { + #region 实体成员 + /// + /// Id + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 宿舍id，关联Acc_DormitoryBuild表 + /// + [Column("DORMITORYBUILDID")] + public string DormitoryBuildId { get; set; } + /// + /// 床位父级 + /// + [Column("PARENTID")] + public string ParentId { get; set; } + + /// + /// 检查日期 + /// + [Column("CHECKDATE")] + public DateTime? CheckDate { get; set; } + /// + /// 出宿时间 + /// + [Column("OUTTIME")] + public DateTime? OutTime { get; set; } + /// + /// 归宿时间 + /// + [Column("RETURNTIME")] + public DateTime? ReturnTime { get; set; } + + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// 创建人 + /// + [Column("CREATEUSERID")] + public string CreateUserId { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 修改时间 + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + /// + /// 修改人 + /// + [Column("UPDATEUSERID")] + public string UpdateUserId { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + this.CreateTime = DateTime.Now; + this.CreateUserId = LoginUserInfo.Get().userId; + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + this.UpdateTime = DateTime.Now; + this.UpdateUserId = LoginUserInfo.Get().userId; + } + #endregion + #region 扩展字段 + [NotMapped] + public string Name { get; set; } + + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs new file mode 100644 index 000000000..066f0b3e8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnBLL.cs @@ -0,0 +1,210 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; +using System.Linq; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnBLL : DormitoryReturnIBLL + { + private DormitoryReturnService dormitoryReturnService = new DormitoryReturnService(); + private AccommodationService accommodationService = new AccommodationService(); + + #region 获取数据 + + /// + /// 获取左侧树形数据 + /// + /// + public List GetTree() + { + try + { + List list = accommodationService.GetSqlTreeForReturn(); + List treeList = new List(); + foreach (Acc_DormitoryBuildEntity item in list) + { + TreeModel node = new TreeModel + { + id = item.ID.ToString(), + text = item.Name.ToString(), + value = item.ID.ToString(), + showcheck = false, + checkstate = 0, + isexpand = true, + parentId = item.ParentID == null ? "" : item.ParentID, + title = item.BuildType + + }; + + + treeList.Add(node); + + + } + + + return treeList.ToTree(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return dormitoryReturnService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public IEnumerable GetReportList(string queryJson) + { + try + { + return dormitoryReturnService.GetReportList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) + { + try + { + return dormitoryReturnService.GetAcc_DormitoryReturnEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + dormitoryReturnService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) + { + try + { + dormitoryReturnService.SaveEntity(type, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) + { + try + { + dormitoryReturnService.SaveData(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs new file mode 100644 index 000000000..39401c7d1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnIBLL.cs @@ -0,0 +1,50 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public interface DormitoryReturnIBLL + { + #region 获取数据 + List GetTree(); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetReportList(string queryJson); + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string type, Acc_DormitoryReturnEntity entity); + void SaveData(string keyValue, Acc_DormitoryReturnEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs new file mode 100644 index 000000000..94249c21b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/DormitoryReturn/DormitoryReturnService.cs @@ -0,0 +1,273 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LogisticsManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-03-10 10:06 + /// 描 述：学生归宿管理 + /// + public class DormitoryReturnService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.*,a.Name + "); + strSql.Append(" FROM Acc_DormitoryReturn t "); + strSql.Append(" join Acc_DormitoryBuild a on t.DormitoryBuildId=a.ID "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.CheckDate >= @startTime AND t.CheckDate <= @endTime ) "); + } + if (!queryParam["OutTime"].IsEmpty()) + { + dp.Add("OutTime", queryParam["OutTime"].ToString(), DbType.String); + strSql.Append(" AND t.OutTime = @OutTime "); + } + if (!queryParam["ParentId"].IsEmpty()) + { + dp.Add("ParentId", queryParam["ParentId"].ToString(), DbType.String); + strSql.Append(" AND t.ParentId = @ParentId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取统计数据 + /// + /// + /// + public IEnumerable GetReportList(string queryJson) + { + try + { + string sql = @"select (case t.isreturn when 1 then 1 else 0 end) as isreturn,a.Dept,a.Major,a.class from +( +select parentid,isreturn from [dbo].[Acc_DormitoryBuild] where BuildType='5' and (studentid is not null and len(studentid)>0) +) t +join Acc_DormitoryBuild a on a.ID=t.parentid where 1=1 +"; + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["Dept"].IsEmpty()) + { + sql += $" AND a.Dept = '{queryParam["Dept"].ToString()}'"; + } + if (!queryParam["Major"].IsEmpty()) + { + sql += $" AND a.Major = '{queryParam["Major"].ToString()}'"; + } + if (!queryParam["Class"].IsEmpty()) + { + sql += $" AND a.Class = '{queryParam["Class"].ToString()}'"; + } + return this.BaseRepository("CollegeMIS").FindList(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取Acc_DormitoryReturn表实体数据 + /// + /// 主键 + /// + public Acc_DormitoryReturnEntity GetAcc_DormitoryReturnEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string type, Acc_DormitoryReturnEntity entity) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + if (type == "1") + { + //学生出宿 + entity.Create(); + entity.CheckDate = Convert.ToDateTime(entity.OutTime.Value.Date); + db.Insert(entity); + + //修改该床位为未归宿 + var sql = $"update Acc_DormitoryBuild set IsReturn=0 where ID='{entity.DormitoryBuildId}'"; + db.ExecuteBySql(sql); + } + else + { + //学生归宿 + //获取今天最后一次出宿的记录 + var outsql = + $"select top 1 * from Acc_DormitoryReturn where DormitoryBuildId='{entity.DormitoryBuildId}' and CheckDate='{DateTime.Now.Date}' order by OutTime desc"; + var model = db.FindList(outsql).FirstOrDefault(); + if (model == null) + { + //新增 + entity.Create(); + entity.ReturnTime = entity.ReturnTime; + entity.CheckDate = Convert.ToDateTime(entity.ReturnTime.Value.Date); + db.Insert(entity); + } + else + { + //修改 + model.ReturnTime = entity.ReturnTime; + model.Remark += " " + entity.Remark; + model.Modify(model.Id); + db.Update(model); + } + + //修改该床位为未归宿 + var sql = $"update Acc_DormitoryBuild set IsReturn=1 where ID='{entity.DormitoryBuildId}'"; + db.ExecuteBySql(sql); + } + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存 + /// + /// + /// + public void SaveData(string keyValue, Acc_DormitoryReturnEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs index 5f0ecf4ed..d1e0e9d24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs @@ -7,17 +7,21 @@ using System.Threading.Tasks; namespace Learun.Application.WorkFlow { - public class ArrangeLessonTermAttemperMethod : INodeMethod + public class ArrangeLessonTermAttemperMethod : IWorkFlowMethod { ArrangeLessonTermAttemperIBLL arrangeLessonTermAttemperIBLL = new ArrangeLessonTermAttemperBLL(); - public void Sucess(string processId) + + public void Execute(WfMethodParameter parameter) { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, processId); - } - - public void Fail(string processId) - { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, processId); + if (parameter.code == "agree") + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, parameter.processId); + } + else + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, parameter.processId); + } } + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs index f2fdaa45a..0ed02d72b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs @@ -465,7 +465,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo?.account; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account+"("+ operateLogModel.userInfo.realName+ ")"; logEntity.F_OperateUserId = operateLogModel.userInfo?.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1; @@ -495,7 +495,7 @@ namespace Learun.Util.Operat logEntity.F_CategoryId = 3; logEntity.F_OperateTypeId = ((int)operateLogModel.type).ToString(); logEntity.F_OperateType = EnumAttribute.GetDescription(operateLogModel.type); - logEntity.F_OperateAccount = operateLogModel.userInfo.account; + logEntity.F_OperateAccount = operateLogModel.userInfo?.account + "(" + operateLogModel.userInfo.realName + ")"; logEntity.F_OperateUserId = operateLogModel.userInfo.userId; logEntity.F_Module = operateLogModel.title; logEntity.F_ExecuteResult = 1;