From 8d638f37d502b777c8b57bf7ef3b76954061200c Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 17 Dec 2024 11:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E5=BC=80=E8=AF=BE=E8=AE=A1=E5=88=92=EF=BC=9A=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E8=AE=BE=E7=BD=AE=E5=BD=95=E6=88=90=E7=BB=A9=E6=95=99?= =?UTF-8?q?=E5=B8=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ClassPlanTeachController.cs | 28 ++++++++++-- .../Views/ClassPlanTeach/Index.cshtml | 4 +- .../Views/ClassPlanTeach/Index.js | 42 ++++++++++++------ .../Views/ClassPlanTeach/TeachFormQZ.js | 8 +++- .../StuScore/StuScoreBLL.cs | 4 +- .../StuScore/StuScoreIBLL.cs | 2 +- .../StuScore/StuScoreService.cs | 4 +- .../TeachClass/TeachClassBLL.cs | 28 +++++++++++- .../TeachClass/TeachClassEntity.cs | 18 ++++++++ .../TeachClass/TeachClassIBLL.cs | 10 ++++- .../TeachClass/TeachClassService.cs | 44 ++++++++++++++++--- 11 files changed, 157 insertions(+), 35 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanTeachController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanTeachController.cs index 512b8cd1d..165ac917c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanTeachController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanTeachController.cs @@ -24,7 +24,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL(); - + #region 视图功能 /// @@ -105,6 +105,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + /// + /// 获取数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetEmpNoData(string keyValue) + { + var data = teachClassIBLL.GetEmpNoData(keyValue); + + return Success(data); + } #endregion #region 提交数据 @@ -212,16 +226,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("设置成功!"); } + /// + /// 强制设置录成绩教师 + /// + /// + /// 已选择的录成绩教师 + /// public ActionResult QzSetTeach(string keyValue, string EmpNo) { var entityList = teachClassIBLL.GetTeachListById(keyValue).ToList(); foreach (var item in entityList) { - teachClassIBLL.UpEmpNos(item.AcademicYearNo, item.Semester, item.TeachClassNo, item.LessonNo, EmpNo, item.EmpNo,item.Grade); - stuScoreIBLL.UpEmpNos(item.AcademicYearNo, item.Semester, item.TeachClassNo, item.LessonNo, EmpNo, item.EmpNo, item.Grade); + teachClassIBLL.UpEmpNos(item.AcademicYearNo, item.Semester, item.TeachClassNo, item.LessonNo, EmpNo, item.EmpNo, item.Grade, item.LessonSortNo); + stuScoreIBLL.UpEmpNos(item.AcademicYearNo, item.Semester, item.TeachClassNo, item.LessonNo, EmpNo, item.EmpNo, item.Grade, item.LessonSortNo); } - teachClassIBLL.UpEmpNo(keyValue, EmpNo); //更改当前教师 + teachClassIBLL.UpEmpNo(keyValue, EmpNo); return Success("设置成功!"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml index b0de850af..85ee41261 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml @@ -56,8 +56,8 @@
-  设置教师 -  强制设置教师 + @* 设置教师*@ +  强制设置录成绩教师
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js index e2e559adb..b08058c6e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js @@ -89,12 +89,19 @@ var bootstrap = function ($, learun) { $('#lr_qzteach').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(",") != -1) { + learun.alert.warning("请选择单条记录进行操作！"); + return false; + } + var EmpNo = $('#gridtable').jfGridValue('EmpNo'); + if (EmpNo.indexOf(",") == -1) { + learun.alert.warning("不符合强制设置条件！"); + return false; + } learun.layerForm({ id: 'form', title: '强制设置教师', - url: top.$.rootUrl + - '/EducationalAdministration/ClassPlanTeach/TeachFormQZ?keyValue=' + - keyValue, + url: top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/TeachFormQZ?keyValue=' + keyValue, width: 400, height: 300, callBack: function (id) { @@ -224,18 +231,26 @@ var bootstrap = function ($, learun) { }); } }, - { label: "教师编号", name: "EmpNo", width: 80, align: "left" }, + { label: "教师编号", name: "EmpNo", width: 150, align: "left" }, { - label: "教师名称", name: "EmpNo", width: 80, align: "left", + label: "教师名称", name: "EmpNo", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', - key: value, - keyId: 'f_encode', - callback: function (_data) { - callback(_data['f_realname']); - } - }); + var valuearr = value.split(","); + var namearr = ""; + for (var i = 0; i < valuearr.length; i++) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: valuearr[i], + keyId: 'f_encode', + callback: function (_data) { + namearr += _data['f_realname']; + if (i < valuearr.length - 1) { + namearr += ","; + } + } + }); + } + callback(namearr); } }, { @@ -253,6 +268,7 @@ var bootstrap = function ($, learun) { { label: "合上班", name: "RelatedClassNo", width: 80, align: "left" }, { label: "拟开教学班数", name: "LessonSortNo", width: 100, align: "left" }, { label: "备注", name: "Remark", width: 100, align: "left" }, + { label: "录成绩教师编号", name: "EmpNoMain", width: 100, align: "left" }, ], mainId: 'ID', sidx: 'ID desc', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js index 66ac437bb..71090ae12 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js @@ -14,7 +14,13 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { - $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); + $('#EmpNo').lrselect({ + placeholder: "请选择教师", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/GetEmpNoData?keyValue=' + keyValue, + value: 'EmpNo', + text: 'EmpName' + }); } }; // 保存数据 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 8bc664d5b..b243b0516 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 @@ -1061,11 +1061,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade) + public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade, string LessonSortNo) { try { - stuScoreService.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo, Grade); + stuScoreService.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo, Grade, LessonSortNo); } catch (Exception ex) { 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 f1c62a208..def6df9cd 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 @@ -253,6 +253,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration (DataTable failDt, int snum, int fnum) ExecuteImportExcel(int type, DataTable dt, string fileGuid, string queryJson); IEnumerable GetLessonNoDataFromStuNo(string academicYearNo, string semester, string stuNo); - void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade); + void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade, string LessonSortNo); } } 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 8ec654687..98259cf97 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 @@ -1977,12 +1977,12 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad /// 主键 /// /// - public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade) + public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade, string LessonSortNo) { try { StringBuilder sb = new StringBuilder(); - sb.Append(" update StuScore set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade='" + Grade + "' "); + sb.Append(" update StuScore set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade='" + Grade + "' and LessonSortNo='" + LessonSortNo + "' "); this.BaseRepository("CollegeMIS").ExecuteBySql(sb.ToString()); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassBLL.cs index d784518c4..fd5272107 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassBLL.cs @@ -279,11 +279,35 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade) + public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade, string LessonSortNo) { try { - teachClassEntity.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo, Grade); + teachClassEntity.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo, Grade, LessonSortNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取数据 + /// 主键 + /// + /// + public IEnumerable GetEmpNoData(string keyValue) + { + try + { + return teachClassEntity.GetEmpNoData(keyValue); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs index 2dd758ee8..a47faafc5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs @@ -112,6 +112,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("F_SCHOOLID")] public string F_SchoolId { get; set; } + /// + /// 强制设置录成绩教师（EmpNo为多个教师时可以设置） + /// + /// + [Column("EMPNOMAIN")] + public string EmpNoMain { get; set; } + /// + /// 强制设置人 + /// + /// + [Column("SETUSERID")] + public string SetUserId { get; set; } + /// + /// 强制设置时间 + /// + /// + [Column("SETTIME")] + public DateTime? SetTime { get; set; } [NotMapped] public int? StartWeek { get; set; } [NotMapped] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassIBLL.cs index ec7d0b85a..3500b1a37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassIBLL.cs @@ -73,7 +73,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void UpEmpNo(string keyvalue, string EmpNo); string UpSetTeach(string keyvalue, string EmpNo); string UpQzSetTeach(string keyvalue, string EmpNo); - void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade); + void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade, string LessonSortNo); + + + /// + /// 获取数据 + /// 主键 + /// + /// + IEnumerable GetEmpNoData(string keyValue); #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs index a82ed88c6..3996a2ed1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs @@ -32,8 +32,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" * "); - strSql.Append(" FROM TeachClass t "); + strSql.Append(@" t.*,le.LessonName "); + strSql.Append(" FROM TeachClass t left join LessonInfo le on t.LessonNo=le.LessonNo "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -80,8 +80,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["EmpNo"].IsEmpty()) { - dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); - strSql.Append(" AND t.EmpNo = @EmpNo "); + dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String); + strSql.Append(" AND t.EmpNo Like @EmpNo "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } @@ -328,7 +328,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration foreach (var item in keyarray) { var entityList = this.GetTeachClassEntity(item); - entityList.EmpNo = EmpNo; + entityList.EmpNoMain = EmpNo; + entityList.SetUserId = LoginUserInfo.Get().userId; + entityList.SetTime = DateTime.Now; db.Update(entityList); } @@ -697,12 +699,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade) + public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade, string LessonSortNo) { try { StringBuilder sb = new StringBuilder(); - sb.Append(" update StuSelectLessonList set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade = '" + Grade + "'"); + sb.Append(" update StuSelectLessonList set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade = '" + Grade + "' and LessonSortNo='" + LessonSortNo + "' "); this.BaseRepository("CollegeMIS").ExecuteBySql(sb.ToString()); } catch (Exception ex) @@ -717,6 +719,34 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + + /// + /// 获取数据 + /// 主键 + /// + /// + public IEnumerable GetEmpNoData(string keyValue) + { + try + { + int ID = Convert.ToInt32(keyValue); + var teachclassEntity = this.BaseRepository("CollegeMIS").FindEntity(ID); + return this.BaseRepository("CollegeMIS").FindList($"select * from EmpInfo e where EmpNo in ({teachclassEntity.EmpNo}) "); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion } }