diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AcceptanceController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AcceptanceController.cs index 2f76dd8db..2ac772c77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AcceptanceController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AcceptanceController.cs @@ -29,7 +29,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -38,7 +38,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } /// /// 表单页 @@ -47,7 +47,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [HttpGet] public ActionResult ViewForm() { - return View(); + return View(); } /// /// 表单页 @@ -92,8 +92,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Ass_AcceptanceData = ass_AcceptanceIBLL.GetAss_AcceptanceEntity( keyValue ); - var jsonData = new { + var Ass_AcceptanceData = ass_AcceptanceIBLL.GetAss_AcceptanceEntity(keyValue); + var jsonData = new + { Ass_Acceptance = Ass_AcceptanceData, }; return Success(jsonData); @@ -107,8 +108,9 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [AjaxOnly] public ActionResult GetFormDataByProcessId(string processId) { - var Ass_AcceptanceData = ass_AcceptanceIBLL.GetEntityByProcessId( processId ); - var jsonData = new { + var Ass_AcceptanceData = ass_AcceptanceIBLL.GetEntityByProcessId(processId); + var jsonData = new + { Ass_Acceptance = Ass_AcceptanceData, }; return Success(jsonData); @@ -156,7 +158,8 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Ass_AcceptanceEntity entity = strEntity.ToObject(); - ass_AcceptanceIBLL.SaveEntity(keyValue,entity); + entity.Status = "0"; + ass_AcceptanceIBLL.SaveEntity(keyValue, entity); if (string.IsNullOrEmpty(keyValue)) { } @@ -164,5 +167,52 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers } #endregion + #region 扩展数据 + /// + /// 审核 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult Check(string keyValue) + { + var keyValueArr = keyValue.Split(','); + foreach (var item in keyValueArr) + { + var StuInfoBasicData = ass_AcceptanceIBLL.GetAss_AcceptanceEntity(item); + if (StuInfoBasicData != null) + { + StuInfoBasicData.Status = "1"; + ass_AcceptanceIBLL.SaveEntity(item, StuInfoBasicData); + } + } + + return Success("操作成功！"); + } + /// + /// 取消审核 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult UnCheck(string keyValue) + { + var keyValueArr = keyValue.Split(','); + foreach (var item in keyValueArr) + { + var StuInfoBasicData = ass_AcceptanceIBLL.GetAss_AcceptanceEntity(item); + if (StuInfoBasicData != null) + { + StuInfoBasicData.Status = "2"; + ass_AcceptanceIBLL.SaveEntity(item, StuInfoBasicData); + } + } + return Success("操作成功！"); + } + + #endregion + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js index 2d9d0e4b5..f497cd825 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js @@ -94,6 +94,13 @@ var bootstrap = function ($, learun) { $('#Model').val(data.AModel);//规格型号 $('#AAIManufacturer').val(data.AManufacturer);//品牌 $('#Price').val(data.APrice)//单价 + $('#Stock').val(data.AStock)//数量 + if ($('#Price').val() > 0 && $('#Stock').val() > 0) { + var Price = $('#Price').val() + var Stock = $('#Stock').val() + var Stock = Price * Stock; + $('#TotalPrice').val(Stock); + } }); } }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.cshtml index 3c5c12f2e..4b46c0479 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.cshtml @@ -40,9 +40,10 @@  删除
- -   提交 -   查看 +  验收通过 +  验收不通过 + @*  提交 +   查看*@  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.js index ca30956a0..a7f733f33 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Index.js @@ -37,7 +37,7 @@ var bootstrap = function ($, learun) { res = top[id].validForm(); // 保存数据 if (res) { - res = top[id].save('', function() { + res = top[id].save('', function () { page.search(); }); } @@ -86,7 +86,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/ViewForm?keyValue=' + keyValue, width: 600, height: 400, - btn:null + btn: null }); } }); @@ -102,7 +102,7 @@ var bootstrap = function ($, learun) { } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -113,7 +113,43 @@ var bootstrap = function ($, learun) { $('#lr_print').on('click', function () { $('#gridtable').jqprintTable(); }); - + //审核 + $('#check').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status != 0) { + learun.alert.warning("当前项无需验收！"); + return; + } + learun.layerConfirm('是否确认审核该项？', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/Check', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //去审 + $('#uncheck').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + //var Status = Status.split(','); + if (Status != 0) { + learun.alert.warning("当前项无需验收！"); + return; + } + learun.layerConfirm('是否确认取消审核该项？', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/UnCheck', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); //  提交 $('#lr_submit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); @@ -139,73 +175,80 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/AssetManagementSystem/Ass_Acceptance/GetPageList', headData: [ - { label: "设备名称", name: "Name", width: 100, align: "left"}, - { label: "品牌", name: "Manufacturer", width: 100, align: "left"}, - { label: "规格型号", name: "Model", width: 100, align: "left"}, - { label: "单位", name: "Unit", width: 100, align: "left"}, - { label: "数量", name: "Stock", width: 100, align: "left"}, - { label: "单价", name: "Price", width: 100, align: "left"}, - { label: "总价", name: "TotalPrice", width: 100, align: "left"}, - { label: "使用部门", name: "DepartmentId", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { - learun.clientdata.getAsync('department', { - key: value, - callback: function (_data) { - callback(_data.name); - } - }); - }}, - { label: "使用人", name: "UserID", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { + { label: "设备名称", name: "Name", width: 100, align: "left" }, + { label: "品牌", name: "Manufacturer", width: 100, align: "left" }, + { label: "规格型号", name: "Model", width: 100, align: "left" }, + { label: "单位", name: "Unit", width: 100, align: "left" }, + { label: "数量", name: "Stock", width: 100, align: "left" }, + { label: "单价", name: "Price", width: 100, align: "left" }, + { label: "总价", name: "TotalPrice", width: 100, align: "left" }, + { + label: "使用部门", name: "DepartmentId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('department', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { + label: "使用人", name: "UserID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsyncReal('user', { key: value, callback: function (_data) { callback(_data.name); } - }); - }}, + }); + } + }, { label: "放置地点", name: "Place", width: 100, align: "left" }, { label: "状态", name: "Status", width: 100, align: "left", formatter: function (cellvalue, row) { - if (cellvalue === '1') { + if (cellvalue === '0') { return '审批中'; - } else if (cellvalue === '2') { - return '已审核'; + } else if (cellvalue === '1') { + return '验收成功'; } else { - return '草稿'; + return '验收不合规'; } } }, - { label: "备注", name: "Remark", width: 100, align: "left"}, + { label: "备注", name: "Remark", width: 100, align: "left" }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; - refreshGirdData = function (res, postData) { - if (!!res) - { - if (res.code == 200) - { - // 发起流程 - var postData = { - schemeCode:'ASS_zcys',// 填写流程对应模板编号 - processId:processId, - level:'1', - }; - learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function(data) { - learun.loading(false); - }); - } - page.search(); - } + //refreshGirdData = function (res, postData) { + // if (!!res) + // { + // if (res.code == 200) + // { + // // 发起流程 + // var postData = { + // schemeCode:'ASS_zcys',// 填写流程对应模板编号 + // processId:processId, + // level:'1', + // }; + // learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function(data) { + // learun.loading(false); + // }); + // } + // page.search(); + // } + //}; + refreshGirdData = function () { + page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs index 249f1d643..34773c06e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System.Collections; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,7 +36,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); + } + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult ScheduleIndex() + { + return View(); } #endregion @@ -62,6 +73,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + /// + /// 获取日程数据 + /// + /// + [HttpGet] + public ActionResult GetListForSchedule() + { + var userInfo = LoginUserInfo.Get(); + List data = new List(); + foreach (SchoolCalendarEntity entity in schoolCalendarIBLL.GetList()) + { + Hashtable ht = new Hashtable(); + ht["id"] = entity.ID; + ht["academicYearNo"] = "【" + entity.AcademicYearNo + "】"; + ht["title"] = entity.Content; + ht["end"] = (entity.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.EndTime.ToString().Substring(0, 2) + ":" + entity.EndTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss"); + ht["start"] = (entity.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.StartTime.ToString().Substring(0, 2) + ":" + entity.StartTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss"); + ht["allDay"] = false; + data.Add(ht); + } + return ToJsonResult(data); + } /// /// 获取页面显示列表数据 /// @@ -82,8 +116,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity( keyValue ); - var jsonData = new { + var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity(keyValue); + var jsonData = new + { SchoolCalendar = SchoolCalendarData, }; return Success(jsonData); @@ -114,11 +149,48 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { - UserInfo userInfo = LoginUserInfo.Get(); SchoolCalendarEntity entity = strEntity.ToObject(); - schoolCalendarIBLL.SaveEntity(userInfo,keyValue,entity); + UserInfo userInfo = LoginUserInfo.Get(); + SchoolCalendarEntity entity = strEntity.ToObject(); + //根据学年和学期查询 + var model = schoolCalendarIBLL.GetSchoolCalendarEntityByNo(entity.AcademicYearNo, entity.Semester); + if (string.IsNullOrEmpty(keyValue)) + { + if (model != null) + { + return Fail("当前学期已存在！"); + } + } + else + { + if (model != null && model.ID != keyValue) + { + return Fail("当前学期已存在！"); + } + } + schoolCalendarIBLL.SaveEntity(userInfo, keyValue, entity); return Success("保存成功！"); } #endregion + #region 扩展数据 + /// + /// 学年 + /// + /// + [HttpGet] + public ActionResult GenerateNearByAcademic() + { + return Success(Learun.Util.WebHelper.GenerateNearByAcademic()); + } + /// + /// 学期 + /// + /// + [HttpGet] + public ActionResult GenerateNearBySemeter() + { + return Success(Learun.Util.WebHelper.GenerateNearBySemeter()); + } + #endregion } } 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 dafb53f8b..e2e559adb 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 @@ -137,7 +137,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/GetPageList', headData: [ { @@ -194,19 +194,20 @@ var bootstrap = function ($, learun) { }, { label: "年级", name: "Grade", width: 50, align: "left" }, { label: "课程编码", name: "LessonNo", width: 200, align: "left" }, - { - label: "课程名称", name: "LessonNo", width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: "课程名称", name: "LessonName", width: 200, align: "left" }, + //{ + // label: "课程名称", name: "LessonNo", width: 200, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, { label: "人数", name: "StuNum", width: 80, align: "left" }, { label: "上机课时", name: "PracticeHour", width: 80, align: "left" }, { label: "班级编号", name: "TeachClassNo", width: 80, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml index dd7d122c2..c56d7affb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml @@ -48,7 +48,7 @@
-
每周课时*
+
总学时*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml index 2fd75c575..f4aa3e788 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml @@ -3,13 +3,21 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
学年
学期
+
*@ +
+
学年*
+
+
+
+
学期*
+
开始日期
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js index 3b28a6b2d..f08799931 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js @@ -15,8 +15,22 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $("#Semester").lrDataItemSelect({ code: 'Semester' }); - + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearByAcademic', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearBySemeter', + value: 'value', + text: 'text' + }); }, initData: function () { if (!!keyValue) { @@ -46,6 +60,7 @@ var bootstrap = function ($, learun) { if (!!callBack) { callBack(); } + learun.frameTab.currentIframe().location.reload(); }); }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml new file mode 100644 index 000000000..fa709950c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml @@ -0,0 +1,166 @@ + + + + + + 日程管理 + + + + + @Html.AppendCssFile( + "/Views/LR_Content/style/lr-common.css", + "/Views/LR_Content/style/lr-iframe-index.css" + ) + + + + +
+
+
+ + 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 e114e09c3..395933261 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 @@ -7910,6 +7910,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index 2d9f074fc..a4014837c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -415,7 +415,7 @@
  • 文化程度 : {{teacherInfo.CultureDegreeNo | cultureDegreeNo}}
  • 毕业学校 : {{teacherInfo.GraduateSchoolName}}
  • 最高学位 : {{teacherInfo.DegreeNo | degreeNo}}
    • -
  • 来校年月 : {{teacherInfo.InSchoolDate | date}}
    • +
  • 来校年月 : {{teacherInfo.SchoolDate | date}}
    • diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs index 8567cd653..95a729b81 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs @@ -90,6 +90,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 获取列表 + /// + /// 返回列表 + public IEnumerable GetList() + { + try + { + return schoolCalendarService.GetList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + public SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester) + { + try + { + return schoolCalendarService.GetSchoolCalendarEntityByNo(academicYearNo, semester); + } + 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/SchoolCalendar/SchoolCalendarIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs index a17ed9417..aab3e4d2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs @@ -34,6 +34,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// SchoolCalendarEntity GetSchoolCalendarEntity(string keyValue); + + /// + /// 获取列表 + /// + /// 返回列表 + IEnumerable GetList(); + + /// + /// 根据学年获取SchoolCalendar表实体数据 + /// 主键 + /// + /// + SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs index 2ba4e5aff..261668567 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs @@ -142,6 +142,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取列表 + /// + /// 返回列表 + public IEnumerable GetList() + { + try + { + return this.BaseRepository().FindList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + throw; + else + throw ExceptionEx.ThrowServiceException(ex); + } + } + /// + /// 获取SchoolCalendar表实体数据 + /// 主键 + /// + /// + public SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester) + { + try + { + return this.BaseRepository().FindEntity(x => x.AcademicYearNo == academicYearNo && x.Semester == semester); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 @@ -204,6 +246,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #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 ad398897c..2971a6323 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 @@ -31,7 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" t.*,op.ExamType "); + strSql.Append(@" t.*,op.ExamType,op.LessonName "); strSql.Append(" FROM TeachClass t "); strSql.Append(" left join openlessonplan op on op.academicyearno=t.academicyearno and op.semester=t.semester and op.DeptNo=t.DeptNo and op.majorno =t.majorno "); strSql.Append(" and op.grade =t.grade and op.lessonno =t.lessonno and op.F_SchoolId =t.F_SchoolId "); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs index 831652470..31d48d134 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs @@ -357,10 +357,10 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach //strSql.Append(" where aa.VID='" + queryParam["VID"] + "'"); strSql.Append(@" -select aa.LessonNo,aa.EmpNo,aa.AcademicYearNo,aa.Semester,aa.VID,aa.StuNo,bb.IScore,bb.UID,cc.EmpName,dd.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo +select aa.LessonNo,aa.EmpNo,aa.AcademicYearNo,aa.Semester,aa.VID,aa.StuNo,bb.IScore,bb.UID,cc.EmpName,aa.LessonName,ee.StuName,ee.DeptNo,ee.MajorNo,ee.ClassNo from ( -select a.LessonNo,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo +select a.LessonNo,a.LessonName,a.EmpNo,a.AcademicYearNo,a.Semester,b.VID,a.StuNo from " + misdbname + @".dbo.StuSelectLessonList a left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and b.VID='" + queryParam["VID"] + @"' @@ -378,7 +378,6 @@ group by a.EmpNo, a.LessonNo, a.UID ) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID left join " + misdbname + @".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo -left join " + misdbname + @".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo left join " + misdbname + @".dbo.StuInfoBasic ee on aa.StuNo = ee.StuNo where 1=1 "); @@ -518,14 +517,14 @@ where 1=1 "); var queryParam = queryJson.ToJObject(); var strSql = new StringBuilder(); strSql.Append(@" -select ee.*,ss.*,cc.EmpName,dd.LessonName from +select ee.*,ss.*,cc.EmpName from ( -select a.LessonNo,a.EmpNo,count(a.StuNo) as StudentCount +select a.LessonNo,a.LessonName,a.EmpNo,count(a.StuNo) as StudentCount from " + misdbname + @".dbo.StuSelectLessonList a left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and b.VID='" + queryParam["VID"] + @"' and a.StuNo is not null and a.StuNo <> '' -group by a.LessonNo,a.EmpNo +group by a.LessonNo,a.EmpNo,a.LessonName ) ss left join ( @@ -543,7 +542,6 @@ group by aa.EmpNo,aa.LessonNo ) ee on ee.EmpNo=ss.EmpNo and ee.LessonNo=ss.LessonNo left join " + misdbname + @".dbo.EmpInfo cc on ss.EmpNo=cc.EmpNo -left join " + misdbname + @".dbo.LessonInfo dd on ss.LessonNo = dd.LessonNo where 1=1 "); if (!queryParam["EmpNo"].IsEmpty()) {