From 7b813520ecebe9666269178e3699e4654879b976 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 4 Nov 2022 18:22:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=99=E5=B8=88=E8=81=98=E4=BB=BB=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PM_PositionChangeController.cs | 164 ++++++++++++ .../Views/EmpInfo/Form.cshtml | 9 +- .../Views/EmpInfo/Form.js | 1 + .../Views/PM_PositionChange/Form.cshtml | 27 ++ .../Views/PM_PositionChange/Form.js | 56 ++++ .../Views/PM_PositionChange/Index.cshtml | 42 +++ .../Views/PM_PositionChange/Index.js | 173 ++++++++++++ .../PM_PositionChange/StatisticIndex.cshtml | 39 +++ .../Views/PM_PositionChange/StatisticIndex.js | 96 +++++++ .../Learun.Application.Web.csproj | 7 + .../Views/UserCenter/IndexInTeacher.cshtml | 4 + .../Views/UserCenter/IndexInTeacher.js | 1 + .../PM_PositionChangeMap.cs | 29 ++ .../Learun.Application.Mapping.csproj | 1 + .../EmpInfo/EmpInfoEntity.cs | 35 +++ .../PM_PositionChange/PM_PositionChangeBLL.cs | 171 ++++++++++++ .../PM_PositionChangeEntity.cs | 95 +++++++ .../PM_PositionChangeIBLL.cs | 57 ++++ .../PM_PositionChangeService.cs | 247 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 4 + 20 files changed, 1256 insertions(+), 2 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_PositionChangeController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_PositionChangeMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_PositionChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_PositionChangeController.cs new file mode 100644 index 000000000..b3251c728 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_PositionChangeController.cs @@ -0,0 +1,164 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-04 14:08 + /// 描 述：教师聘任变更记录 + /// + public class PM_PositionChangeController : MvcControllerBase + { + private PM_PositionChangeIBLL pM_PositionChangeIBLL = new PM_PositionChangeBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + + /// + /// 主页面-统计 + /// + /// + [HttpGet] + public ActionResult StatisticIndex() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = pM_PositionChangeIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var PM_PositionChangeData = pM_PositionChangeIBLL.GetPM_PositionChangeEntity( keyValue ); + var jsonData = new { + PM_PositionChange = PM_PositionChangeData, + }; + return Success(jsonData); + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageStatisticList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = pM_PositionChangeIBLL.GetPageStatisticList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + pM_PositionChangeIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + var loginUserInfo = LoginUserInfo.Get(); + PM_PositionChangeEntity entity = strEntity.ToObject(); + entity.Updater = loginUserInfo.userId; + entity.UpdateTime = DateTime.Now; + pM_PositionChangeIBLL.SaveEntity(keyValue,entity); + return Success("保存成功！"); + } + /// + /// 提交 + /// + /// + /// + /// + public ActionResult Submit(string empId,bool status) + { + pM_PositionChangeIBLL.Submit(empId,status); + if (status) + { + return Success("提交成功！"); + } + else + { + return Success("取消提交成功"); + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index e5d8bac9b..30b5325ea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -20,7 +20,8 @@ #tab3 > .lr-scroll-box, #tab4 > .lr-scroll-box, #tab5 > .lr-scroll-box, - #tab6 > .lr-scroll-box { + #tab6 > .lr-scroll-box, + #tab7 > .lr-scroll-box { height: 100%; width: 100%; } @@ -36,6 +37,7 @@
  • 工人技术等级变更管理
  • 教师部门变更管理
  • 家庭情况
    • +
  • 教师聘任变更记录
    • @@ -161,7 +163,7 @@
    部门*
    -
    +
    @*
    系部
    @@ -415,6 +417,9 @@
    +
    + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index 259ab3a5d..df733b0fe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -63,6 +63,7 @@ var bootstrap = function ($, learun) { $("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId); $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId); $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId); + $("#PM_PositionChange").attr("src", "/EducationalAdministration/PM_PositionChange/Index?empId=" + NewEmpId); $('#lr_form_tabs').lrFormTab(); $('#lr_form_tabs ul li').eq(0).trigger('click'); //校区 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.cshtml new file mode 100644 index 000000000..95f004f63 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "教师聘任变更记录"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    原聘任等级*
    +
    +
    +
    +
    现聘任等级*
    +
    +
    +
    +
    变更原因
    + +
    +
    +
    备注
    + +
    +
    +
    是否同步
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_PositionChange/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.js new file mode 100644 index 000000000..327fd82c3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Form.js @@ -0,0 +1,56 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-11-04 14:08 + * 描 述：教师聘任变更记录 + */ +var acceptClick; +var keyValue = request('keyValue'); +var empId = request('empId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#OldLevel').lrDataItemSelect({ code: 'PositionLevel' }); + $('#NewLevel').lrDataItemSelect({ code: 'PositionLevel' }); + $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var data = $('body').lrGetFormData(); + data["EmpId"] = empId; + var postData = { + strEntity: JSON.stringify(data) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.cshtml new file mode 100644 index 000000000..afeb46953 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.cshtml @@ -0,0 +1,42 @@ +@{ + ViewBag.Title = "教师聘任变更记录"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    原聘任等级
    +
    +
    +
    +
    现聘任等级
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  提交 +  取消提交 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_PositionChange/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.js new file mode 100644 index 000000000..8aa02d61f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/Index.js @@ -0,0 +1,173 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-11-04 14:08 + * 描 述：教师聘任变更记录 + */ +var refreshGirdData; +var empId = request('empId'); +var status = false; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.refreshStatus(); + page.initGird(); + page.bind(); + }, + refreshStatus: function () { + //获取主表状态 + learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetFormData?keyValue=' + empId, function (res) { + if (res.code == 200) { + if (res.data.EmpInfo != null) { + status = res.data.EmpInfo.PositionLevelStatus; + } + } + }); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#OldLevel').lrDataItemSelect({ code: 'PositionLevel' }); + $('#NewLevel').lrDataItemSelect({ code: 'PositionLevel' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + learun.layerForm({ + id: 'formInPM_PositionChange', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Form?empId=' + empId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formInPM_PositionChange', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Form?keyValue=' + keyValue + '&empId=' + empId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 提交 + $('#lr_check').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + learun.layerConfirm('是否确认提交！', function (res) { + if (res) { + learun.postForm( top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Submit', { empId: empId, status: true }, function (info) { + refreshGirdData(); + }); + } + }); + }); + // 取消提交 + $('#lr_uncheck').on('click', function () { + learun.layerConfirm('是否取消提交！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/Submit', { empId: empId, status: false }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/GetPageList', + headData: [ + { + label: "原聘任等级", name: "OldLevel", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PositionLevel', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "现聘任等级", name: "NewLevel", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PositionLevel', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "变更原因", name: "ChangeReason", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { label: "是否同步", name: "IsSync", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } }, + { + label: "提交状态", name: "SubmitStatus", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + }, + ], + mainId: 'ID', + isPage: true, + sidx:'UpdateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.EmpId = empId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + page.refreshStatus(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.cshtml new file mode 100644 index 000000000..2c0f43ebb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "教师聘任变更记录"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    教师姓名
    + +
    +
    +
    原聘任等级
    +
    +
    +
    +
    现聘任等级
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js new file mode 100644 index 000000000..d287af6d6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_PositionChange/StatisticIndex.js @@ -0,0 +1,96 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-11-04 14:08 + * 描 述：教师聘任变更记录 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#OldLevel').lrDataItemSelect({ code: 'PositionLevel' }); + $('#NewLevel').lrDataItemSelect({ code: 'PositionLevel' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/PM_PositionChange/GetPageStatisticList', + headData: [ + { + label: "教师", name: "EmpId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: value, + keyId: 'empid', + callback: function (_data) { + callback(_data['empname']); + } + }); + } + }, + { + label: "原聘任等级", name: "OldLevel", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PositionLevel', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "现聘任等级", name: "NewLevel", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PositionLevel', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "变更时间", name: "UpdateTime", width: 130, align: "left" }, + { + label: "变更人", name: "Updater", width: 100, align: "left", + formatterAsync: function (callback, value, row) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (item) { + callback(item.name); + } + }); + } + }, + ], + mainId: 'ID', + isPage: true, + sidx:'UpdateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 4f4db9329..0538d6504 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 @@ -340,6 +340,7 @@ + @@ -1106,6 +1107,9 @@ + + + @@ -1250,6 +1254,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml index d552e59fe..48b634318 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml @@ -18,6 +18,7 @@
  • 工人技术等级变更记录
  • 教师部门变更记录
  • 家庭情况
    • +
  • 教师聘任变更记录
    • }
    @@ -827,6 +828,9 @@
    +
    + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js index dd739e7b1..7d2191494 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js @@ -21,6 +21,7 @@ var bootstrap = function ($, learun) { $("#PM_WorkerTechnology").attr("src", "/EducationalAdministration/PM_WorkerTechnology/Index?empId=" + NewEmpId); $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId); $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId); + $("#PM_PositionChange").attr("src", "/EducationalAdministration/PM_PositionChange/Index?empId=" + NewEmpId); // 显示信息选项卡 $('#tablist').lrFormTabEx(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_PositionChangeMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_PositionChangeMap.cs new file mode 100644 index 000000000..a623d69ff --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_PositionChangeMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-04 14:08 + /// 描 述：教师聘任变更记录 + /// + public class PM_PositionChangeMap : EntityTypeConfiguration + { + public PM_PositionChangeMap() + { + #region 表、主键 + //表 + this.ToTable("PM_POSITIONCHANGE"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index b1063e1b3..ca2a336f5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -98,6 +98,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs index b91646a5f..27d2f36c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs @@ -621,6 +621,41 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ///     [Column("OTHERTEACHERQUALIFICATIONS")] public string OtherTeacherQualifications { get; set; } + /// + /// 普通话等级 + /// + [Column("MANDARINLEVEL")] + public string MandarinLevel { get; set; } + /// + /// 资格证获取提交状态 + /// + [Column("CERTIFICATESTATUS")] + public bool? CertificateStatus { get; set; } + /// + /// 考核时间 + /// + [Column("ASSESSTIME")] + public DateTime? AssessTime { get; set; } + /// + /// 考核年度 + /// + [Column("ASSESSYEAR")] + public string AssessYear { get; set; } + /// + /// 考核结果 + /// + [Column("ASSESSRESULT")] + public string AssessResult { get; set; } + /// + /// 年度考核结果提交状态 + /// + [Column("YEARASSESSSTATUS")] + public bool? YearAssessStatus { get; set; } + /// + /// 聘任变更提交状态 + /// + [Column("POSITIONLEVELSTATUS")] + public bool? PositionLevelStatus { get; set; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeBLL.cs new file mode 100644 index 000000000..e004180c7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeBLL.cs @@ -0,0 +1,171 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-04 14:08 + /// 描 述：教师聘任变更记录 + /// + public class PM_PositionChangeBLL : PM_PositionChangeIBLL + { + private PM_PositionChangeService pM_PositionChangeService = new PM_PositionChangeService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return pM_PositionChangeService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取PM_PositionChange表实体数据 + /// 主键 + /// + /// + public PM_PositionChangeEntity GetPM_PositionChangeEntity(string keyValue) + { + try + { + return pM_PositionChangeService.GetPM_PositionChangeEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + return pM_PositionChangeService.GetPageStatisticList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + pM_PositionChangeService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(string keyValue, PM_PositionChangeEntity entity) + { + try + { + pM_PositionChangeService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 修改提交状态 + /// 主键 + /// + /// + public void Submit(string keyValue, bool status) + { + try + { + pM_PositionChangeService.Submit(keyValue, status); + } + 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/PM_PositionChange/PM_PositionChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeEntity.cs new file mode 100644 index 000000000..b93a69520 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeEntity.cs @@ -0,0 +1,95 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-04 14:08 + /// 描 述：教师聘任变更记录 + /// + public class PM_PositionChangeEntity + { + #region 实体成员 + /// + /// 编号 + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 人员ID + /// + [Column("EMPID")] + public string EmpId { get; set; } + /// + /// 原聘任等级 + /// + [Column("OLDLEVEL")] + public string OldLevel { get; set; } + /// + /// 现聘任等级 + /// + [Column("NEWLEVEL")] + public string NewLevel { get; set; } + /// + /// 变更时间 + /// + [Column("CHANGETIME")] + public DateTime? ChangeTime { get; set; } + /// + /// 变更原因 + /// + [Column("CHANGEREASON")] + public string ChangeReason { get; set; } + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// 是否同步 + /// + [Column("ISSYNC")] + public bool? IsSync { get; set; } + /// + /// 最后修改人 + /// + [Column("UPDATER")] + public string Updater { get; set; } + /// + /// 最后修改时间 + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + /// + /// 提交状态 + /// + [NotMapped] + public bool? SubmitStatus { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeIBLL.cs new file mode 100644 index 000000000..86f36c18f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeIBLL.cs @@ -0,0 +1,57 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-04 14:08 + /// 描 述：教师聘任变更记录 + /// + public interface PM_PositionChangeIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取PM_PositionChange表实体数据 + /// 主键 + /// + /// + PM_PositionChangeEntity GetPM_PositionChangeEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageStatisticList(Pagination pagination, string queryJson); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(string keyValue, PM_PositionChangeEntity entity); + void Submit(string keyValue, bool status); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeService.cs new file mode 100644 index 000000000..b67142846 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_PositionChange/PM_PositionChangeService.cs @@ -0,0 +1,247 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-04 14:08 + /// 描 述：教师聘任变更记录 + /// + public class PM_PositionChangeService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,e.PositionLevelStatus as SubmitStatus "); + strSql.Append(" FROM PM_PositionChange t "); + strSql.Append(" left join EmpInfo e on t.EmpId=e.EmpId "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["OldLevel"].IsEmpty()) + { + dp.Add("OldLevel", queryParam["OldLevel"].ToString(), DbType.String); + strSql.Append(" AND t.OldLevel = @OldLevel "); + } + if (!queryParam["NewLevel"].IsEmpty()) + { + dp.Add("NewLevel", queryParam["NewLevel"].ToString(), DbType.String); + strSql.Append(" AND t.NewLevel = @NewLevel "); + } + if (!queryParam["EmpId"].IsEmpty()) + { + dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); + strSql.Append(" AND t.EmpId = @EmpId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取PM_PositionChange表实体数据 + /// 主键 + /// + /// + public PM_PositionChangeEntity GetPM_PositionChangeEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM PM_PositionChange t "); + strSql.Append(" left join EmpInfo e on t.EmpId=e.EmpId "); + strSql.Append(" WHERE 1=1 and t.IsSync=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["OldLevel"].IsEmpty()) + { + dp.Add("OldLevel", queryParam["OldLevel"].ToString(), DbType.String); + strSql.Append(" AND t.OldLevel = @OldLevel "); + } + if (!queryParam["NewLevel"].IsEmpty()) + { + dp.Add("NewLevel", queryParam["NewLevel"].ToString(), DbType.String); + strSql.Append(" AND t.NewLevel = @NewLevel "); + } + if (!queryParam["EmpId"].IsEmpty()) + { + dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); + strSql.Append(" AND t.EmpId = @EmpId "); + } + if (!queryParam["EmpName"].IsEmpty()) + { + dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); + strSql.Append(" AND e.EmpName like @EmpName "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(string keyValue, PM_PositionChangeEntity entity) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + db.Update(entity); + } + else + { + entity.Create(); + db.Insert(entity); + } + + //“是否同步”：选是，则更新教师表； + if (entity.IsSync.HasValue && entity.IsSync.Value == true) + { + db.ExecuteBySql("update EmpInfo set PositionLevel='" + entity.NewLevel + "' where EmpId='" + entity.EmpId + "' "); + } + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 修改提交状态 + /// 主键 + /// + /// + public void Submit(string keyValue, bool status) + { + try + { + var empEntity = this.BaseRepository("CollegeMIS").FindEntity(a => a.EmpId == keyValue); + if (empEntity != null) + { + empEntity.PositionLevelStatus = status; + this.BaseRepository("CollegeMIS").Update(empEntity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 685fa64e5..968272c47 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -224,6 +224,10 @@ + + + + From 6e36662ff0aedb757a7b332a76f145bf9095e73d Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Sun, 6 Nov 2022 19:07:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E4=BA=8B=EF=BC=9A=E5=B9=B4=E5=BA=A6=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=AE=A1=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PM_YearAssessController.cs | 164 ++++++++++++ .../Views/EmpInfo/Form.cshtml | 4 + .../Views/EmpInfo/Form.js | 1 + .../Views/PM_YearAssess/Form.cshtml | 27 ++ .../Views/PM_YearAssess/Form.js | 54 ++++ .../Views/PM_YearAssess/Index.cshtml | 42 +++ .../Views/PM_YearAssess/Index.js | 149 +++++++++++ .../Views/PM_YearAssess/StatisticIndex.cshtml | 39 +++ .../Views/PM_YearAssess/StatisticIndex.js | 73 ++++++ .../Learun.Application.Web.csproj | 7 + .../PM_YearAssessMap.cs | 29 ++ .../Learun.Application.Mapping.csproj | 1 + .../PM_YearAssess/PM_YearAssessBLL.cs | 171 ++++++++++++ .../PM_YearAssess/PM_YearAssessEntity.cs | 90 +++++++ .../PM_YearAssess/PM_YearAssessIBLL.cs | 57 ++++ .../PM_YearAssess/PM_YearAssessService.cs | 247 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 4 + 17 files changed, 1159 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_YearAssessController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_YearAssessMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_YearAssessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_YearAssessController.cs new file mode 100644 index 000000000..20a7fabce --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_YearAssessController.cs @@ -0,0 +1,164 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; +using System; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-06 14:08 + /// 描 述：年度考核结果管理 + /// + public class PM_YearAssessController : MvcControllerBase + { + private PM_YearAssessIBLL pM_YearAssessIBLL = new PM_YearAssessBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + + /// + /// 主页面-统计 + /// + /// + [HttpGet] + public ActionResult StatisticIndex() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = pM_YearAssessIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var PM_YearAssessData = pM_YearAssessIBLL.GetPM_YearAssessEntity( keyValue ); + var jsonData = new { + PM_YearAssess = PM_YearAssessData, + }; + return Success(jsonData); + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageStatisticList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = pM_YearAssessIBLL.GetPageStatisticList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + pM_YearAssessIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + var loginUserInfo = LoginUserInfo.Get(); + PM_YearAssessEntity entity = strEntity.ToObject(); + entity.Updater = loginUserInfo.userId; + entity.UpdateTime = DateTime.Now; + pM_YearAssessIBLL.SaveEntity(keyValue,entity); + return Success("保存成功！"); + } + /// + /// 提交 + /// + /// + /// + /// + public ActionResult Submit(string empId,bool status) + { + pM_YearAssessIBLL.Submit(empId,status); + if (status) + { + return Success("提交成功！"); + } + else + { + return Success("取消提交成功"); + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 30b5325ea..3f6d33d6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -38,6 +38,7 @@
  • 教师部门变更管理
  • 家庭情况
  • 教师聘任变更记录
    • +
  • 年度考核结果管理
    • @@ -420,6 +421,9 @@
    +
    + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index df733b0fe..8cad4920f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -64,6 +64,7 @@ var bootstrap = function ($, learun) { $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId); $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId); $("#PM_PositionChange").attr("src", "/EducationalAdministration/PM_PositionChange/Index?empId=" + NewEmpId); + $("#PM_YearAssess").attr("src", "/EducationalAdministration/PM_YearAssess/Index?empId=" + NewEmpId); $('#lr_form_tabs').lrFormTab(); $('#lr_form_tabs ul li').eq(0).trigger('click'); //校区 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.cshtml new file mode 100644 index 000000000..b5ba18cd5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "年度考核结果管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
    +
    +
    考核时间*
    + +
    +
    +
    考核年度*
    + +
    +
    +
    考核结果
    + +
    +
    +
    备注
    + +
    +
    +
    是否同步
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js new file mode 100644 index 000000000..edf4ec244 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Form.js @@ -0,0 +1,54 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-11-06 14:08 + * 描 述：年度考核结果管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var empId = request('empId'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var data = $('body').lrGetFormData(); + data["EmpId"] = empId; + var postData = { + strEntity: JSON.stringify(data) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml new file mode 100644 index 000000000..7d41a9e7d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.cshtml @@ -0,0 +1,42 @@ +@{ + ViewBag.Title = "年度考核结果管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    考核时间
    + +
    +
    +
    考核年度
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +  新增 +  编辑 +  删除 +  提交 +  取消提交 +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js new file mode 100644 index 000000000..7defa5a51 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/Index.js @@ -0,0 +1,149 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-11-06 14:08 + * 描 述：年度考核结果管理 + */ +var refreshGirdData; +var empId = request('empId'); +var status = false; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.refreshStatus(); + page.initGird(); + page.bind(); + }, + refreshStatus: function () { + //获取主表状态 + learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetFormData?keyValue=' + empId, function (res) { + if (res.code == 200) { + if (res.data.EmpInfo != null) { + status = res.data.EmpInfo.YearAssessStatus; + } + } + }); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + learun.layerForm({ + id: 'formInPM_YearAssess', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Form?empId=' + empId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'formInPM_YearAssess', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Form?keyValue=' + keyValue + '&empId=' + empId, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 提交 + $('#lr_check').on('click', function () { + if (status == 'true') { + learun.alert.warning('已提交，不能再修改！'); + return; + } + learun.layerConfirm('是否确认提交！', function (res) { + if (res) { + learun.postForm( top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Submit', { empId: empId, status: true }, function (info) { + refreshGirdData(); + }); + } + }); + }); + // 取消提交 + $('#lr_uncheck').on('click', function () { + learun.layerConfirm('是否取消提交！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/Submit', { empId: empId, status: false }, function () { + refreshGirdData(); + }); + } + }); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageList', + headData: [ + { label: "考核时间", name: "AssessTime", width: 100, align: "left" }, + { label: "考核年度", name: "AssessYear", width: 100, align: "left" }, + { label: "考核结果", name: "AssessResult", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { label: "是否同步", name: "IsSync", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } }, + { + label: "提交状态", name: "SubmitStatus", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "" : ""; + } + }, + ], + mainId: 'ID', + isPage: true, + sidx:'UpdateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.EmpId = empId; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + page.refreshStatus(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.cshtml new file mode 100644 index 000000000..d06269d43 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "年度考核结果管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    教师姓名
    + +
    +
    +
    考核时间
    + +
    +
    +
    考核年度
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js new file mode 100644 index 000000000..98b0b775d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_YearAssess/StatisticIndex.js @@ -0,0 +1,73 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-11-06 14:08 + * 描 述：年度考核结果管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/PM_YearAssess/GetPageStatisticList', + headData: [ + { + label: "教师", name: "EmpId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: value, + keyId: 'empid', + callback: function (_data) { + callback(_data['empname']); + } + }); + } + }, + { label: "考核时间", name: "AssessTime", width: 100, align: "left" }, + { label: "考核年度", name: "AssessYear", width: 100, align: "left" }, + { label: "考核结果", name: "AssessResult", width: 100, align: "left" }, + { label: "变更时间", name: "UpdateTime", width: 130, align: "left" }, + { + label: "变更人", name: "Updater", width: 100, align: "left", + formatterAsync: function (callback, value, row) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (item) { + callback(item.name); + } + }); + } + }, + ], + mainId: 'ID', + isPage: true, + sidx:'UpdateTime desc' + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 898f1c399..0ee2c70ac 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 @@ -340,6 +340,7 @@ + @@ -1106,6 +1107,9 @@ + + + @@ -1258,6 +1262,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_YearAssessMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_YearAssessMap.cs new file mode 100644 index 000000000..596cd4a01 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/PM_YearAssessMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-06 14:08 + /// 描 述：年度考核结果管理 + /// + public class PM_YearAssessMap : EntityTypeConfiguration + { + public PM_YearAssessMap() + { + #region 表、主键 + //表 + this.ToTable("PM_YEARASSESS"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 3944f779a..7bbabcb0a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -98,6 +98,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessBLL.cs new file mode 100644 index 000000000..6cb5ec223 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessBLL.cs @@ -0,0 +1,171 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-06 14:08 + /// 描 述：年度考核结果管理 + /// + public class PM_YearAssessBLL : PM_YearAssessIBLL + { + private PM_YearAssessService pM_YearAssessService = new PM_YearAssessService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return pM_YearAssessService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取PM_YearAssess表实体数据 + /// 主键 + /// + /// + public PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue) + { + try + { + return pM_YearAssessService.GetPM_YearAssessEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + return pM_YearAssessService.GetPageStatisticList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + pM_YearAssessService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(string keyValue, PM_YearAssessEntity entity) + { + try + { + pM_YearAssessService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 修改提交状态 + /// 主键 + /// + /// + public void Submit(string keyValue, bool status) + { + try + { + pM_YearAssessService.Submit(keyValue, status); + } + 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/PM_YearAssess/PM_YearAssessEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessEntity.cs new file mode 100644 index 000000000..b330ea085 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-06 14:08 + /// 描 述：年度考核结果管理 + /// + public class PM_YearAssessEntity + { + #region 实体成员 + /// + /// 编号 + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 人员ID + /// + [Column("EMPID")] + public string EmpId { get; set; } + /// + /// 考核时间 + /// + [Column("ASSESSTIME")] + public DateTime? AssessTime { get; set; } + /// + /// 考核年度 + /// + [Column("ASSESSYEAR")] + public string AssessYear { get; set; } + /// + /// 考核结果 + /// + [Column("ASSESSRESULT")] + public string AssessResult { get; set; } + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// 是否同步 + /// + [Column("ISSYNC")] + public bool? IsSync { get; set; } + /// + /// 最后修改人 + /// + [Column("UPDATER")] + public string Updater { get; set; } + /// + /// 最后修改时间 + /// + [Column("UPDATETIME")] + public DateTime? UpdateTime { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + /// + /// 提交状态 + /// + [NotMapped] + public bool? SubmitStatus { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessIBLL.cs new file mode 100644 index 000000000..24f75ae39 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessIBLL.cs @@ -0,0 +1,57 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-06 14:08 + /// 描 述：年度考核结果管理 + /// + public interface PM_YearAssessIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取PM_YearAssess表实体数据 + /// 主键 + /// + /// + PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageStatisticList(Pagination pagination, string queryJson); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(string keyValue, PM_YearAssessEntity entity); + void Submit(string keyValue, bool status); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessService.cs new file mode 100644 index 000000000..dcc0cb835 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_YearAssess/PM_YearAssessService.cs @@ -0,0 +1,247 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2020-11-06 14:08 + /// 描 述：年度考核结果管理 + /// + public class PM_YearAssessService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,e.YearAssessStatus as SubmitStatus "); + strSql.Append(" FROM PM_YearAssess t "); + strSql.Append(" left join EmpInfo e on t.EmpId=e.EmpId "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["AssessYear"].IsEmpty()) + { + dp.Add("AssessYear", queryParam["AssessYear"].ToString(), DbType.String); + strSql.Append(" AND t.AssessYear = @AssessYear "); + } + if (!queryParam["AssessTime"].IsEmpty()) + { + dp.Add("AssessTime", queryParam["AssessTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND t.AssessTime = @AssessTime "); + } + if (!queryParam["EmpId"].IsEmpty()) + { + dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); + strSql.Append(" AND t.EmpId = @EmpId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取PM_YearAssess表实体数据 + /// 主键 + /// + /// + public PM_YearAssessEntity GetPM_YearAssessEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM PM_YearAssess t "); + strSql.Append(" left join EmpInfo e on t.EmpId=e.EmpId "); + strSql.Append(" WHERE 1=1 and t.IsSync=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["AssessYear"].IsEmpty()) + { + dp.Add("AssessYear", queryParam["AssessYear"].ToString(), DbType.String); + strSql.Append(" AND t.AssessYear = @AssessYear "); + } + if (!queryParam["AssessTime"].IsEmpty()) + { + dp.Add("AssessTime", queryParam["AssessTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND t.AssessTime = @AssessTime "); + } + if (!queryParam["EmpId"].IsEmpty()) + { + dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); + strSql.Append(" AND t.EmpId = @EmpId "); + } + if (!queryParam["EmpName"].IsEmpty()) + { + dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); + strSql.Append(" AND e.EmpName like @EmpName "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(string keyValue, PM_YearAssessEntity entity) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + db.Update(entity); + } + else + { + entity.Create(); + db.Insert(entity); + } + + //“是否同步”：选是，则更新教师表； + if (entity.IsSync.HasValue && entity.IsSync.Value == true) + { + db.ExecuteBySql("update EmpInfo set AssessTime='" + entity.AssessTime + "',AssessYear='"+entity.AssessYear+"',AssessResult='"+entity.AssessResult+"' where EmpId='" + entity.EmpId + "' "); + } + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 修改提交状态 + /// 主键 + /// + /// + public void Submit(string keyValue, bool status) + { + try + { + var empEntity = this.BaseRepository("CollegeMIS").FindEntity(a => a.EmpId == keyValue); + if (empEntity != null) + { + empEntity.YearAssessStatus = status; + this.BaseRepository("CollegeMIS").Update(empEntity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 09a9205a0..5ae8eaf64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -224,6 +224,10 @@ + + + + From 4c60f4a6e2557d6b15054a8d66f8d26d75e13489 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 7 Nov 2022 10:45:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B4=E5=BA=A6=E8=80=83=E6=A0=B8=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=AE=A1=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Form.cshtml | 71 +++++++++++-------- .../Views/EmpInfo/Index.js | 4 +- .../Views/UserCenter/IndexInTeacher.cshtml | 4 ++ .../Views/UserCenter/IndexInTeacher.js | 1 + 4 files changed, 49 insertions(+), 31 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 3f6d33d6d..31e2a6db7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -21,7 +21,8 @@ #tab4 > .lr-scroll-box, #tab5 > .lr-scroll-box, #tab6 > .lr-scroll-box, - #tab7 > .lr-scroll-box { + #tab7 > .lr-scroll-box, + #tab8 > .lr-scroll-box { height: 100%; width: 100%; } @@ -108,29 +109,29 @@ @*
    -
    健康状况
    -
    -
    -
    -
    家庭出身
    -
    -
    -
    -
    港澳台侨
    -
    -
    *@ +
    健康状况
    +
    + +
    +
    家庭出身
    +
    +
    +
    +
    港澳台侨
    +
    +
    *@ @*
    -
    户籍省份
    -
    -
    -
    -
    户籍地市
    -
    -
    -
    -
    户籍县区
    -
    -
    *@ +
    户籍省份
    +
    + +
    +
    户籍地市
    +
    +
    +
    +
    户籍县区
    +
    +
    *@
    户籍地址
    @@ -167,9 +168,9 @@
    @*
    -
    系部
    -
    -
    *@ +
    系部
    +
    + *@
    岗位类别
    @@ -282,6 +283,18 @@
    职称获得时间
    +
    +
    考核时间
    + +
    +
    +
    考核年度
    + +
    +
    +
    考核结果
    + +
    学历学位信息
    @@ -393,9 +406,9 @@
    @*
    -
    教师简介
    - -
    *@ +
    教师简介
    + + *@
    教师简介
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 74549be76..860a51842 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -104,7 +104,7 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/Form', - width: 1000, + width: 1200, height: 800, callBack: function (id) { return top[id].acceptClick(refreshGirdData); @@ -128,7 +128,7 @@ var bootstrap = function ($, learun) { id: 'form', title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/Form?keyValue=' + keyValue, - width: 1000, + width: 1200, height: 800, callBack: function (id) { return top[id].acceptClick(refreshGirdData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml index 48b634318..1e54b24af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml @@ -19,6 +19,7 @@
  • 教师部门变更记录
  • 家庭情况
  • 教师聘任变更记录
    • +
  • 年度考核结果管理
    • }
    @@ -831,6 +832,9 @@
    +
    + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js index 7d2191494..30f774045 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js @@ -22,6 +22,7 @@ var bootstrap = function ($, learun) { $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId); $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId); $("#PM_PositionChange").attr("src", "/EducationalAdministration/PM_PositionChange/Index?empId=" + NewEmpId); + $("#PM_YearAssess").attr("src", "/EducationalAdministration/PM_YearAssess/Index?empId=" + NewEmpId); // 显示信息选项卡 $('#tablist').lrFormTabEx();