diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs index 10a625b59..ba7ff974f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs @@ -101,6 +101,24 @@ namespace Learun.Application.Organization } } } + public RoleEntity GetEntityByRoleCode(string code) + { + try + { + return roleService.GetEntityByRoleCode(code); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } /// /// 获取分页数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs index ab41230e9..f95fc1c9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs @@ -36,7 +36,8 @@ namespace Learun.Application.Organization /// /// RoleEntity GetRoleByRoleName(string roleName); - /// + RoleEntity GetEntityByRoleCode(string code); + /// /// 获取角色数据列表 /// /// 主键串 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs index 3fc54ab3f..9b1a8c3dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs @@ -231,5 +231,24 @@ namespace Learun.Application.Organization } #endregion + + public RoleEntity GetEntityByRoleCode(string code) + { + try + { + return this.BaseRepository().FindEntity(a => a.F_EnCode == code); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamLessonController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamLessonController.cs index 2443f0bb3..79aecafef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamLessonController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamLessonController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using Learun.Application.Organization; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -16,6 +17,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public class Exam_ExamLessonController : MvcControllerBase { private Exam_ExamLessonIBLL exam_ExamLessonIBLL = new Exam_ExamLessonBLL(); + private EmpInfoIBLL empInfoIbll = new EmpInfoBLL(); + private RoleIBLL roleIbll = new RoleBLL(); + #region 视图功能 @@ -26,6 +30,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// @@ -44,6 +57,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormYearSemester() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// @@ -119,9 +141,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult Import(string AcademicYearNo, string Semester,string ExamTime) + public ActionResult Import(string AcademicYearNo, string Semester,string ExamTime,string ImportDeptNo) { - int res = exam_ExamLessonIBLL.Import(AcademicYearNo, Semester, ExamTime); + int res = exam_ExamLessonIBLL.Import(AcademicYearNo, Semester, ExamTime, ImportDeptNo); return Success("导入" + res + "条数据！"); } /// @@ -130,9 +152,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DeleteWhere(string AcademicYearNo, string Semester) + public ActionResult DeleteWhere(string AcademicYearNo, string Semester,string ImportDeptNo) { - int res = exam_ExamLessonIBLL.DeleteWhere(AcademicYearNo, Semester); + int res = exam_ExamLessonIBLL.DeleteWhere(AcademicYearNo, Semester, ImportDeptNo); return Success("清空" + res + "条数据！"); } /// 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 index 1426f30ad..74b5924f4 100644 --- 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 @@ -5,6 +5,7 @@ using System.Web.Mvc; using System.Collections.Generic; using System; using System.Linq; +using Learun.Application.Organization; using Newtonsoft.Json; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers @@ -22,6 +23,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private Exam_ExamPlanLessonIBLL exam_ExamPlanLessonIBLL = new Exam_ExamPlanLessonBLL(); private Exam_ExamPlanClassIBLL exam_ExamPlanClassIBLL = new Exam_ExamPlanClassBLL(); private Exam_ExamPlanRoomIBLL exam_ExamPlanRoomIBLL = new Exam_ExamPlanRoomBLL(); + private EmpInfoIBLL empInfoIbll = new EmpInfoBLL(); + private RoleIBLL roleIbll = new RoleBLL(); #region 视图功能 @@ -32,6 +35,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// @@ -41,6 +53,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs index c2ee9a8f6..5b441a152 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using Learun.Application.Organization; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -16,6 +17,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public class Exam_ExamRoomController : MvcControllerBase { private Exam_ExamRoomIBLL exam_ExamRoomIBLL = new Exam_ExamRoomBLL(); + private EmpInfoIBLL empInfoIbll = new EmpInfoBLL(); + private RoleIBLL roleIbll = new RoleBLL(); #region 视图功能 @@ -26,6 +29,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// @@ -44,6 +56,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormYearSemester() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } @@ -111,9 +132,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns) + public ActionResult Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns, string ImportDeptNo) { - int res = exam_ExamRoomIBLL.Import(AcademicYearNo, Semester,SeatRows,SeatColumns); + int res = exam_ExamRoomIBLL.Import(AcademicYearNo, Semester,SeatRows,SeatColumns, ImportDeptNo); return Success("导入" + res + "条数据！"); } /// @@ -122,9 +143,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DeleteWhere(string AcademicYearNo, string Semester) + public ActionResult DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { - int res = exam_ExamRoomIBLL.DeleteWhere(AcademicYearNo, Semester); + int res = exam_ExamRoomIBLL.DeleteWhere(AcademicYearNo, Semester, ImportDeptNo); return Success("清空" + res + "条数据！"); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamStudentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamStudentController.cs index f34ba8599..b07ce4851 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamStudentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamStudentController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using Learun.Application.Organization; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -16,6 +17,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public class Exam_ExamStudentController : MvcControllerBase { private Exam_ExamStudentIBLL exam_ExamStudentIBLL = new Exam_ExamStudentBLL(); + private EmpInfoIBLL empInfoIbll = new EmpInfoBLL(); + private RoleIBLL roleIbll = new RoleBLL(); #region 视图功能 @@ -26,6 +29,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// @@ -44,6 +56,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormImport() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } /// @@ -53,6 +74,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormClear() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } @@ -169,15 +199,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpPost] [AjaxOnly] [ValidateAntiForgeryToken] - public ActionResult ClearTable(string AcademicYearNo, string Semester, string ESType) + public ActionResult ClearTable(string AcademicYearNo, string Semester, string ESType, string ImportDeptNo) { - int res = exam_ExamStudentIBLL.ClaerForm(AcademicYearNo, Semester, ESType); + int res = exam_ExamStudentIBLL.ClaerForm(AcademicYearNo, Semester, ESType, ImportDeptNo); return Success("清空(" + res + ")条数据成功！"); } - public ActionResult ImportTable(string AcademicYearNo, int Semester, string ESType) + public ActionResult ImportTable(string AcademicYearNo, int Semester, string ESType, string ImportDeptNo) { - int res = exam_ExamStudentIBLL.ImportForm(AcademicYearNo, Semester, ESType); + int res = exam_ExamStudentIBLL.ImportForm(AcademicYearNo, Semester, ESType, ImportDeptNo); return Success("同步(" + res + ")条数据成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_InvigilateTeacherController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_InvigilateTeacherController.cs index 1eba6143f..36adb43a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_InvigilateTeacherController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_InvigilateTeacherController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using Learun.Application.Organization; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -16,7 +17,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public class Exam_InvigilateTeacherController : MvcControllerBase { private Exam_InvigilateTeacherIBLL exam_InvigilateTeacherIBLL = new Exam_InvigilateTeacherBLL(); - + private EmpInfoIBLL empInfoIbll = new EmpInfoBLL(); + private RoleIBLL roleIbll = new RoleBLL(); #region 视图功能 /// @@ -26,7 +28,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } + return View(); } /// /// 表单页 @@ -35,7 +46,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } /// /// 表单页 @@ -44,6 +55,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult FormYearSemester() { + if (LoginUserInfo.Get().roleIds.Contains(roleIbll.GetEntityByRoleCode("paikaoerji").F_RoleId)) + { + ViewBag.IsTwoDept = true; + var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(LoginUserInfo.Get().account); + if (empinfo != null) + { + ViewBag.DeptNo = empinfo.DeptNo; + } + } return View(); } @@ -164,9 +184,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult Import(string AcademicYearNo, string Semester) + public ActionResult Import(string AcademicYearNo, string Semester, string ImportDeptNo) { - int res = exam_InvigilateTeacherIBLL.Import(AcademicYearNo, Semester); + int res = exam_InvigilateTeacherIBLL.Import(AcademicYearNo, Semester, ImportDeptNo); return Success("导入" + res + "条数据！"); } /// @@ -175,9 +195,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DeleteWhere(string AcademicYearNo, string Semester) + public ActionResult DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { - int res = exam_InvigilateTeacherIBLL.DeleteWhere(AcademicYearNo, Semester); + int res = exam_InvigilateTeacherIBLL.DeleteWhere(AcademicYearNo, Semester, ImportDeptNo); return Success("清空" + res + "条数据！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.cshtml index 4f82d2ede..8170c7f73 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.cshtml @@ -11,9 +11,17 @@
学期*
+
+
系部
+
+
考试时长(分钟)
+ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.js index 04764d409..0365a5042 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/FormYearSemester.js @@ -31,7 +31,13 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - + $('#ImportDeptNo').lrDataSourceSelect({ code: "CdDeptInfo", text: "deptname", value: "deptno" }); + //判断是否分院老师，是就锁定系 + $('#ImportDeptNo').attr("disabled", "disabled"); + if (IsTwoDept) { + //绑定当前系 + $('#ImportDeptNo').lrselectSet(CurrentDeptNo); + } }, initData: function () { if (type == 1) { @@ -49,7 +55,8 @@ var bootstrap = function ($, learun) { var postData = { AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), - ExamTime: $('#ExamTime').val() + ExamTime: $('#ExamTime').val(), + ImportDeptNo: $("#ImportDeptNo").lrselectGet() }; //从开课计划导入 if (type == 1) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml index d8d798bbb..4bed21aca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml @@ -58,4 +58,8 @@ + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js index e23743dc9..8a083c419 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js @@ -267,7 +267,7 @@ var bootstrap = function ($, learun) { { label: "是否启用", name: "ELEnabled", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == 1 ? "" : ""; + return cellvalue == 1 ? "是" : "否"; } }, ], @@ -280,6 +280,10 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (IsTwoDept) + param.ImportDeptNo = CurrentDeptNo; + else + param.ImportDeptNo = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; 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 index dc2ca6c33..1d378da85 100644 --- 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 @@ -11,6 +11,10 @@
学期*
+
+
系部
+
+
排考名称*
@@ -36,4 +40,8 @@
+ @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 index 7a12a2cb2..ad79343a9 100644 --- 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 @@ -30,6 +30,13 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#ImportDeptNo').lrDataSourceSelect({ code: "CdDeptInfo", text: "deptname", value: "deptno" }); + //判断是否分院老师，是就锁定系 + $('#ImportDeptNo').attr("disabled", "disabled"); + if (IsTwoDept) { + //绑定当前系 + $('#ImportDeptNo').lrselectSet(CurrentDeptNo); + } $('#PlanType').lrDataItemSelect({ code: 'StudentType' }); $('#EPRandom').lrDataItemSelect({ code: 'YesOrNoBit' }); $('#EPGenarate').lrDataItemSelect({ code: 'YesOrNoBit' }); 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 index f25123037..7744f8478 100644 --- 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 @@ -82,4 +82,8 @@ + @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 index 860d73c2b..9c852c799 100644 --- 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 @@ -346,6 +346,10 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (IsTwoDept) + param.ImportDeptNo = CurrentDeptNo; + else + param.ImportDeptNo = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.cshtml index 925f7362f..cbe6ba2a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.cshtml @@ -11,6 +11,10 @@
学期*
+
+
系部
+
+
座位行数*
@@ -20,4 +24,8 @@
+ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.js index 34afd6899..4bdf2f092 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/FormYearSemester.js @@ -31,6 +31,13 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#ImportDeptNo').lrDataSourceSelect({ code: "CdDeptInfo", text: "deptname", value: "deptno" }); + //判断是否分院老师，是就锁定系 + $('#ImportDeptNo').attr("disabled", "disabled"); + if (IsTwoDept) { + //绑定当前系 + $('#ImportDeptNo').lrselectSet(CurrentDeptNo); + } }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml index edf36d899..77219682a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml @@ -56,4 +56,8 @@ + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js index 9a29882c1..fa19d5e9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js @@ -182,7 +182,7 @@ var bootstrap = function ($, learun) { { label: "是否启用", name: "EREnabled", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == 1 ? "" : ""; + return cellvalue == 1 ? "是" : "否"; } }, ], @@ -195,6 +195,10 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (IsTwoDept) + param.ImportDeptNo = CurrentDeptNo; + else + param.ImportDeptNo = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.cshtml index 4ebb6a098..e8ab089e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.cshtml @@ -11,9 +11,17 @@
学期*
+
+
系部
+
+
考试类型
+ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.js index aba076183..b097f1b77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormClear.js @@ -30,6 +30,13 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#ImportDeptNo').lrDataSourceSelect({ code: "CdDeptInfo", text: "deptname", value: "deptno" }); + //判断是否分院老师，是就锁定系 + $('#ImportDeptNo').attr("disabled", "disabled"); + if (IsTwoDept) { + //绑定当前系 + $('#ImportDeptNo').lrselectSet(CurrentDeptNo); + } $('#ESType').lrDataItemSelect({ code: 'StudentType' }); } }; @@ -41,7 +48,8 @@ var bootstrap = function ($, learun) { var postData = { AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), - ESType: $('#ESType').lrselectGet() + ESType: $('#ESType').lrselectGet(), + ImportDeptNo: $("#ImportDeptNo").lrselectGet() }; learun.layerConfirm('是否确认清空！', function (res) { if (res) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.cshtml index bcab1d3bd..fa6f2529a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.cshtml @@ -11,9 +11,17 @@
学期*
+
+
系部
+
+
考试类型*
+ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.js index 3fa15ee32..4878d2d93 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/FormImport.js @@ -31,6 +31,13 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#ImportDeptNo').lrDataSourceSelect({ code: "CdDeptInfo", text: "deptname", value: "deptno" }); + //判断是否分院老师，是就锁定系 + $('#ImportDeptNo').attr("disabled", "disabled"); + if (IsTwoDept) { + //绑定当前系 + $('#ImportDeptNo').lrselectSet(CurrentDeptNo); + } $('#ESType').lrDataItemSelect({ code: 'StudentType' }); }, initData: function () { @@ -56,7 +63,8 @@ var bootstrap = function ($, learun) { var postData = { AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), - ESType: $('#ESType').lrselectGet() + ESType: $('#ESType').lrselectGet(), + ImportDeptNo: $("#ImportDeptNo").lrselectGet() }; $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamStudent/ImportTable?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml index c314b4178..ed962b7f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml @@ -68,4 +68,8 @@ + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js index 6c3aa7ab6..98b71f197 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js @@ -203,7 +203,7 @@ var bootstrap = function ($, learun) { { label: "是否启用", name: "ESEnabled", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == 1 ? "" : ""; + return cellvalue == 1 ? "是" : "否"; } }, ], @@ -217,6 +217,10 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (IsTwoDept) + param.ImportDeptNo = CurrentDeptNo; + else + param.ImportDeptNo = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.cshtml index 74924978e..336bdb9e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.cshtml @@ -11,5 +11,13 @@
学期*
+
+
系部
+
+
+ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.js index 7172be57e..de90956d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/FormYearSemester.js @@ -31,6 +31,13 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#ImportDeptNo').lrDataSourceSelect({ code: "CdDeptInfo", text: "deptname", value: "deptno" }); + //判断是否分院老师，是就锁定系 + $('#ImportDeptNo').attr("disabled", "disabled"); + if (IsTwoDept) { + //绑定当前系 + $('#ImportDeptNo').lrselectSet(CurrentDeptNo); + } }, initData: function () { @@ -55,7 +62,8 @@ var bootstrap = function ($, learun) { } var postData = { AcademicYearNo: $('#AcademicYearNo').lrselectGet(), - Semester: $('#Semester').lrselectGet() + Semester: $('#Semester').lrselectGet(), + ImportDeptNo: $("#ImportDeptNo").lrselectGet() }; //导入 if (type == 1) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml index b06d3d1ab..75e5b36dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml @@ -55,4 +55,8 @@ + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js index e7ade3958..86204ec21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js @@ -205,7 +205,7 @@ var bootstrap = function ($, learun) { { label: "是否启用", name: "ITEnabled", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == 1 ? "" : ""; + return cellvalue == 1 ? "是" : "否"; } }, ], @@ -218,6 +218,10 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + if (IsTwoDept) + param.ImportDeptNo = CurrentDeptNo; + else + param.ImportDeptNo = "0"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonBLL.cs index cbb044acc..6f55fdbfe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonBLL.cs @@ -181,11 +181,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public int Import(string AcademicYearNo, string Semester,string ExamTime) + public int Import(string AcademicYearNo, string Semester,string ExamTime,string ImportDeptNo) { try { - return exam_ExamLessonService.Import(AcademicYearNo, Semester, ExamTime); + return exam_ExamLessonService.Import(AcademicYearNo, Semester, ExamTime, ImportDeptNo); } catch (Exception ex) { @@ -201,11 +201,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } - public int DeleteWhere(string AcademicYearNo, string Semester) + public int DeleteWhere(string AcademicYearNo, string Semester,string ImportDeptNo) { try { - return exam_ExamLessonService.DeleteWhere(AcademicYearNo, Semester); + return exam_ExamLessonService.DeleteWhere(AcademicYearNo, Semester, ImportDeptNo); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonIBLL.cs index a6da458d5..b3f697b85 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonIBLL.cs @@ -51,8 +51,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 实体 void SaveEntity(string keyValue, Exam_ExamLessonEntity entity); - int Import(string AcademicYearNo, string Semester,string ExamTime); - int DeleteWhere(string AcademicYearNo, string Semester); + int Import(string AcademicYearNo, string Semester,string ExamTime,string ImportDeptNo); + int DeleteWhere(string AcademicYearNo, string Semester,string ImportDeptNo); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs index b3fd1d18a..431f14447 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs @@ -54,6 +54,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ELEnabled", queryParam["ELEnabled"].ToString(), DbType.String); strSql.Append(" AND t.ELEnabled = @ELEnabled "); } + if (!queryParam["ImportDeptNo"].IsEmpty()) + { + if (queryParam["ImportDeptNo"].ToString() == "0") + { + strSql.Append(" AND t.ImportDeptNo='' "); + } + else + { + dp.Add("ImportDeptNo", queryParam["ImportDeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.ImportDeptNo = @ImportDeptNo "); + } + + } if (!queryParam["LessonNo"].IsEmpty()) { dp.Add("LessonNo", "%" + queryParam["LessonNo"].ToString() + "%", DbType.String); @@ -258,10 +271,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public int Import(string AcademicYearNo, string Semester, string ExamTime) + public int Import(string AcademicYearNo, string Semester, string ExamTime, string ImportDeptNo) { try { + string sqldept = ""; + if (!string.IsNullOrEmpty(ImportDeptNo)) + { + sqldept = $" and t.DeptNo='{ImportDeptNo}'"; + } //导入专业开课计划中是必修的（lessonsortno=1）、考核方式是考试的（ExamType='1'，2022.6.23新增） string sql = $@"insert into Exam_ExamLesson([ELId] ,[AcademicYearNo] @@ -270,14 +288,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[LessonName] ,[LessonNo] ,[ELOrder] - ,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo) -select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t + ,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo,ImportDeptNo) +select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo,'{ImportDeptNo}' from OpenLessonPlan t left join lessoninfo a on t.lessonno=a.lessonno - where t.ExamType='1' and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}' - and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ) + where t.ExamType='1' and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}' {sqldept} + and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}' ) group by t.LessonNo,t.LessonName,t.AcademicYearNo,t.Semester,Grade,a.lessontypeid,t.DeptNo,t.MajorNo "; - + return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } catch (Exception ex) @@ -299,11 +317,11 @@ left join lessoninfo a on t.lessonno=a.lessonno /// /// /// - public int DeleteWhere(string AcademicYearNo, string Semester) + public int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { try { - string sql = $"delete Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'"; + string sql = $"delete Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}'"; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } catch (Exception ex) 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 index 33f884d50..27cfe4541 100644 --- 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 @@ -29,6 +29,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("SEMESTER")] public int? Semester { get; set; } + + [Column("IMPORTDEPTNO")] + public string ImportDeptNo { get; set; } /// /// 排考名称 /// 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 index 92212d000..745d56421 100644 --- 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 @@ -84,6 +84,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EPGenarate", queryParam["EPGenarate"].ToString(), DbType.String); strSql.Append(" AND t.EPGenarate = @EPGenarate "); } + if (!queryParam["ImportDeptNo"].IsEmpty()) + { + if (queryParam["ImportDeptNo"].ToString() == "0") + { + strSql.Append(" AND t.ImportDeptNo='' "); + } + else + { + dp.Add("ImportDeptNo", queryParam["ImportDeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.ImportDeptNo = @ImportDeptNo "); + } + + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs index 5f2d6e9f3..40c60d3fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs @@ -162,11 +162,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns) + public int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns, string ImportDeptNo) { try { - return exam_ExamRoomService.Import(AcademicYearNo, Semester,SeatRows,SeatColumns); + return exam_ExamRoomService.Import(AcademicYearNo, Semester,SeatRows,SeatColumns, ImportDeptNo); } catch (Exception ex) { @@ -182,11 +182,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } - public int DeleteWhere(string AcademicYearNo, string Semester) + public int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { try { - return exam_ExamRoomService.DeleteWhere(AcademicYearNo, Semester); + return exam_ExamRoomService.DeleteWhere(AcademicYearNo, Semester, ImportDeptNo); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs index 104571f48..a648b4432 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs @@ -50,8 +50,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 实体 void SaveEntity(string keyValue, Exam_ExamRoomEntity entity); - int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns); - int DeleteWhere(string AcademicYearNo, string Semester); + int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns, string ImportDeptNo); + int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs index 24e7a7920..523223b6f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs @@ -62,6 +62,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ClassroomName", "%" + queryParam["ClassroomName"].ToString() + "%", DbType.String); strSql.Append(" AND t.ClassroomName Like @ClassroomName "); } + if (!queryParam["ImportDeptNo"].IsEmpty()) + { + if (queryParam["ImportDeptNo"].ToString() == "0") + { + strSql.Append(" AND t.ImportDeptNo='' "); + } + else + { + dp.Add("ImportDeptNo", queryParam["ImportDeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.ImportDeptNo = @ImportDeptNo "); + } + + } if (!queryParam["EPLId"].IsEmpty()) { var examLesson = this.BaseRepository("CollegeMIS").FindEntity(queryParam["EPLId"].ToString()); @@ -288,7 +301,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 座位行数 /// 座位列数 /// - public int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns) + public int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns, string ImportDeptNo) { try { @@ -301,9 +314,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[SeatColumns] ,[SeatCount] ,[EROrder] - ,[EREnabled]) -select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{SeatRows},{SeatColumns},{SeatRows}*{SeatColumns},0,1 from ClassroomInfo where CheckMark=1 - and [ClassroomNo] not in (select [ClassroomNo] from Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ) + ,[EREnabled],ImportDeptNo) +select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{SeatRows},{SeatColumns},{SeatRows}*{SeatColumns},0,1,'{ImportDeptNo}' from ClassroomInfo where CheckMark=1 + and [ClassroomNo] not in (select [ClassroomNo] from Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}' ) "; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } @@ -326,11 +339,11 @@ select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{Seat /// /// /// - public int DeleteWhere(string AcademicYearNo, string Semester) + public int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { try { - string sql = $"delete Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'"; + string sql = $"delete Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}'"; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentBLL.cs index 528d9974e..f755babe5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentBLL.cs @@ -192,11 +192,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public int ClaerForm(string AcademicYearNo, string Semester, string ESType) + public int ClaerForm(string AcademicYearNo, string Semester, string ESType, string ImportDeptNo) { try { - return exam_ExamStudentService.ClaerForm(AcademicYearNo, Semester, ESType); + return exam_ExamStudentService.ClaerForm(AcademicYearNo, Semester, ESType, ImportDeptNo); } catch (Exception ex) { @@ -217,11 +217,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public int ImportForm(string AcademicYearNo, int Semester, string ESType) + public int ImportForm(string AcademicYearNo, int Semester, string ESType, string ImportDeptNo) { try { - return exam_ExamStudentService.ImportForm(AcademicYearNo, Semester, ESType); + return exam_ExamStudentService.ImportForm(AcademicYearNo, Semester, ESType, ImportDeptNo); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentIBLL.cs index acebaafaf..b9d08163e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentIBLL.cs @@ -64,7 +64,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - int ClaerForm(string AcademicYearNo, string Semester, string ESType); + int ClaerForm(string AcademicYearNo, string Semester, string ESType, string ImportDeptNo); /// /// 同步学生考试信息 /// @@ -72,7 +72,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - int ImportForm(string AcademicYearNo, int Semester, string ESType); + int ImportForm(string AcademicYearNo, int Semester, string ESType, string ImportDeptNo); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs index 054a36b78..2c8d2075d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs @@ -74,6 +74,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String); strSql.Append(" AND t.StuName Like @StuName "); } + if (!queryParam["ImportDeptNo"].IsEmpty()) + { + if (queryParam["ImportDeptNo"].ToString() == "0") + { + strSql.Append(" AND t.ImportDeptNo='' "); + } + else + { + dp.Add("ImportDeptNo", queryParam["ImportDeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.ImportDeptNo = @ImportDeptNo "); + } + + } if (!queryParam["ESType"].IsEmpty()) { dp.Add("ESType", queryParam["ESType"].ToString(), DbType.String); @@ -138,6 +151,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String); strSql.Append(" AND t.StuName Like @StuName "); } + if (!queryParam["ImportDeptNo"].IsEmpty()) + { + if (queryParam["ImportDeptNo"].ToString() == "0") + { + strSql.Append(" AND t.ImportDeptNo='' "); + } + else + { + dp.Add("ImportDeptNo", queryParam["ImportDeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.ImportDeptNo = @ImportDeptNo "); + } + + } if (!queryParam["ESType"].IsEmpty()) { dp.Add("ESType", queryParam["ESType"].ToString(), DbType.String); @@ -328,18 +354,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public int ClaerForm(string AcademicYearNo, string Semester, string ESType) + public int ClaerForm(string AcademicYearNo, string Semester, string ESType, string ImportDeptNo) { try { string sql = ""; if (!string.IsNullOrEmpty(ESType)) { - sql = $"delete Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ESType= '{ESType}'"; + sql = $"delete Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ESType= '{ESType}' and ImportDeptNo='{ImportDeptNo}'"; } else { - sql = $"delete Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'"; + sql = $"delete Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}'"; } return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } @@ -362,25 +388,35 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public int ImportForm(string AcademicYearNo, int Semester, string ESType) + public int ImportForm(string AcademicYearNo, int Semester, string ESType, string ImportDeptNo) { try { + string sqldept = ""; + if (!string.IsNullOrEmpty(ImportDeptNo)) + { + sqldept = $" and DeptNo='{ImportDeptNo}'"; + } StringBuilder strSql = new StringBuilder(); if (ESType == "1") { strSql.Append( - $@"insert into Exam_ExamStudent(ESId,ClassNo,DeptNo,AcademicYearNo,Semester,StuNo,StuName,ESType,ESEnabled,Grade) - select newid(), a.classno,DeptNo, '{AcademicYearNo}', '{Semester}', a.stuno, a.stuname, '{ESType}', 1,a.Grade -from StuInfoBasic a where CheckMark = '1' and (ChangeStatus is null or len(ChangeStatus)=0 or ChangeStatus='0') and stuno not in -(select stuno from Exam_ExamStudent where AcademicYearNo = '{AcademicYearNo}' and Semester = '{Semester}' and ESType = '1' + $@"insert into Exam_ExamStudent(ESId,ClassNo,DeptNo,AcademicYearNo,Semester,StuNo,StuName,ESType,ESEnabled,Grade,ImportDeptNo) + select newid(), a.classno,DeptNo, '{AcademicYearNo}', '{Semester}', a.stuno, a.stuname, '{ESType}', 1,a.Grade,'{ImportDeptNo}' +from StuInfoBasic a where CheckMark = '1' and (ChangeStatus is null or len(ChangeStatus)=0 or ChangeStatus='0') {sqldept} and stuno not in +(select stuno from Exam_ExamStudent where AcademicYearNo = '{AcademicYearNo}' and Semester = '{Semester}' and ESType = '1' and ImportDeptNo='{ImportDeptNo}' )"); } else { - strSql.Append(@" insert into Exam_ExamStudent(ESId,ClassNo,AcademicYearNo,Semester,StuNo,StuName,ESType,ESEnabled,Grade) "); - strSql.Append($"select newid(),a.classno,'{AcademicYearNo}','{Semester}',a.stuno,a.stuname,'{ESType}',1,b.Grade from "); + string sqldept2 = ""; + if (!string.IsNullOrEmpty(ImportDeptNo)) + { + sqldept2 = $" and b.DeptNo='{ImportDeptNo}'"; + } + strSql.Append(@" insert into Exam_ExamStudent(ESId,ClassNo,AcademicYearNo,Semester,StuNo,StuName,ESType,ESEnabled,Grade,ImportDeptNo) "); + strSql.Append($"select newid(),a.classno,'{AcademicYearNo}','{Semester}',a.stuno,a.stuname,'{ESType}',1,b.Grade,'{ImportDeptNo}' from "); if (ESType == "2") { strSql.Append(" StuScore "); @@ -390,11 +426,11 @@ from StuInfoBasic a where CheckMark = '1' and (ChangeStatus is null or len(Chang strSql.Append(" StuScoreNotPass "); } strSql.Append(@" a left join StuInfoBasic b on b.StuNo=a.StuNo - where 1=1 and a.LessonSortNo='1' and ((a.Score>=0 and a.Score<60) or a.Score=(-5) or a.Score=(-10)) "); + where 1=1 and a.LessonSortNo='1' and a.Score>=0 and a.Score<60 "); strSql.Append(" and a.AcademicYearNo ='" + AcademicYearNo + "' and a.Semester ='" + Semester + "' "); - strSql.Append(" and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) "); + strSql.Append(" and (b.ChangeStatus<>'1' or len(b.ChangeStatus)=0 or b.ChangeStatus is null) "+ sqldept2); strSql.Append($@" and a.stuno not in -(select stuno from Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ESType='{ESType}' +(select stuno from Exam_ExamStudent where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ESType='{ESType}' and ImportDeptNo='{ImportDeptNo}' ) "); strSql.Append(" group by a.stuno,a.stuname,a.classno,b.Grade"); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherBLL.cs index 96e333c8d..dd25c1934 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherBLL.cs @@ -173,11 +173,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - public int Import(string AcademicYearNo, string Semester) + public int Import(string AcademicYearNo, string Semester, string ImportDeptNo) { try { - return exam_InvigilateTeacherService.Import(AcademicYearNo, Semester); + return exam_InvigilateTeacherService.Import(AcademicYearNo, Semester, ImportDeptNo); } catch (Exception ex) { @@ -191,11 +191,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - public int DeleteWhere(string AcademicYearNo, string Semester) + public int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { try { - return exam_InvigilateTeacherService.DeleteWhere(AcademicYearNo, Semester); + return exam_InvigilateTeacherService.DeleteWhere(AcademicYearNo, Semester, ImportDeptNo); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherIBLL.cs index 875f5211a..cc2a2a3b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherIBLL.cs @@ -46,8 +46,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration void SaveEntity(string keyValue, Exam_InvigilateTeacherEntity entity); void Lock(string keyValue, int ITEnabled); - int Import(string AcademicYearNo, string Semester); - int DeleteWhere(string AcademicYearNo, string Semester); + int Import(string AcademicYearNo, string Semester, string ImportDeptNo); + int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs index e953c0666..20d4f1df0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs @@ -65,6 +65,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); strSql.Append(" AND t.EmpName Like @EmpName "); } + if (!queryParam["ImportDeptNo"].IsEmpty()) + { + if (queryParam["ImportDeptNo"].ToString() == "0") + { + strSql.Append(" AND t.ImportDeptNo='' "); + } + else + { + dp.Add("ImportDeptNo", queryParam["ImportDeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.ImportDeptNo = @ImportDeptNo "); + } + + } if (!queryParam["EPLId"].IsEmpty()) { //考试课程数据 @@ -354,10 +367,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public int Import(string AcademicYearNo, string Semester) + public int Import(string AcademicYearNo, string Semester, string ImportDeptNo) { try { + string sqldept = ""; + if (!string.IsNullOrEmpty(ImportDeptNo)) + { + sqldept = $" and DeptNo='{ImportDeptNo}'"; + } string sql = $@"INSERT INTO [dbo].[Exam_InvigilateTeacher] ([ITId] ,[AcademicYearNo] @@ -366,9 +384,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[EmpNo] ,[DeptNo] ,[ITOrder] - ,[ITEnabled]) -select newid(),'{AcademicYearNo}','{Semester}',empname,empno,DeptNo,0,1 from empinfo where checkmark=1 and IsHasLesson=1 and IsInActiveStatus=1 - and empno not in (select empno from Exam_InvigilateTeacher where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}') + ,[ITEnabled],ImportDeptNo) +select newid(),'{AcademicYearNo}','{Semester}',empname,empno,DeptNo,0,1,'{ImportDeptNo}' from empinfo where checkmark=1 and IsHasLesson=1 and IsInActiveStatus=1 {sqldept} + and empno not in (select empno from Exam_InvigilateTeacher where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}') "; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } @@ -391,11 +409,11 @@ select newid(),'{AcademicYearNo}','{Semester}',empname,empno,DeptNo,0,1 from emp /// /// /// - public int DeleteWhere(string AcademicYearNo, string Semester) + public int DeleteWhere(string AcademicYearNo, string Semester, string ImportDeptNo) { try { - string sql = $"delete Exam_InvigilateTeacher where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'"; + string sql = $"delete Exam_InvigilateTeacher where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and ImportDeptNo='{ImportDeptNo}'"; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } catch (Exception ex)