diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_TechnicalPostController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_TechnicalPostController.cs index 065754d75..b53b02d71 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_TechnicalPostController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_TechnicalPostController.cs @@ -38,6 +38,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 主页面-统计 + /// + /// + [HttpGet] + public ActionResult StatisticIndex() + { + return View(); + } #endregion #region 获取数据 @@ -77,6 +87,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageStatisticList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = pM_TechnicalPostIBLL.GetPageStatisticList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + #endregion #region 提交数据 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 48208212b..4df272519 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 @@ -32,7 +32,7 @@
  • 基本信息
  • 教师学历变更管理
    • -
  • 专业技术职务经历
    • +
  • 教师职称变更管理
  • 工人技术等级经历
  • 工作经历
  • 家庭情况
    • diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 5485ad9f6..f490eeb0f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -44,7 +44,7 @@
    职称
    -
    +
    政治面貌
    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 c6fa3b1a9..37c7c6432 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 @@ -60,8 +60,7 @@ var bootstrap = function ($, learun) { $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); //学位 $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); - //职称 - $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' }); + // 部门选择 $('#F_DepartmentId').lrselect({ type: 'tree', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.cshtml index a15fa54ea..df659c3a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.cshtml @@ -3,29 +3,33 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    +
    技术职务名称*
    -
    +
    专业
    - +
    -
    +
    证书编号
    - +
    -
    +
    取得时间
    -
    +
    聘任时间
    - +
    -
    +
    发证机关
    - + +
    +
    +
    是否同步
    +
    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js index a928e3c47..84aa1a4a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js @@ -16,6 +16,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Index.js index c00d214b7..b7d899b50 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Index.js @@ -124,6 +124,9 @@ var bootstrap = function ($, learun) { { label: "取得时间", name: "GetTime", width: 130, align: "left" }, { label: "聘任时间", name: "AppointmentTime", width: 130, align: "left" }, { label: "发证机关", name: "CertificationAuthority", 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) { @@ -132,7 +135,8 @@ var bootstrap = function ($, learun) { }, ], mainId: 'ID', - isPage: true + isPage: true, + sidx:'UpdateTime desc' }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml new file mode 100644 index 000000000..d6620952c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml @@ -0,0 +1,31 @@ +@{ + ViewBag.Title = "专业技术职务经历统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    教师姓名
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js new file mode 100644 index 000000000..7d8aaa459 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js @@ -0,0 +1,71 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-03-30 14:04 + * 描 述：专业技术职务经历统计 + */ +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_TechnicalPost/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: "TPName", width: 120, 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 34a242cc2..1a18d0256 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 @@ -954,6 +954,7 @@ + @@ -7191,6 +7192,7 @@ + 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 85c58d17d..828cc308c 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 @@ -14,7 +14,7 @@ @if (ViewBag.UserType == "教师" || ViewBag.UserType == "管理员") {
  • 教师学历变更记录
    • -
  • 专业技术职务经历
    • +
  • 教师职称变更记录
  • 工人技术等级经历
  • 工作简历
  • 家庭情况
    • diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 8e412e3eb..5a8021c99 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -112,10 +112,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("DegreeNo", queryParam["DegreeNo"].ToString(), DbType.String); strSql.Append(" AND t.DegreeNo = @DegreeNo "); } - if (!queryParam["ProfessionalTitle"].IsEmpty())//职称 + if (!queryParam["JobTitle"].IsEmpty())//专业技术职务名称 { - dp.Add("ProfessionalTitle", queryParam["ProfessionalTitle"].ToString(), DbType.String); - strSql.Append(" AND t.ProfessionalTitle = @ProfessionalTitle "); + dp.Add("JobTitle", "%" + queryParam["JobTitle"].ToString() + "%", DbType.String); + strSql.Append(" AND t.JobTitle like @JobTitle "); } if (!queryParam["HighestRecord"].IsEmpty())//最高学历 { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostBLL.cs index 6fdfca326..233b5ce90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostBLL.cs @@ -66,6 +66,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + return pM_TechnicalPostService.GetPageStatisticList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs index 241c4f2da..fd4dac5ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs @@ -64,6 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("UPDATETIME")] public DateTime? UpdateTime { get; set; } + /// + /// 是否同步 + /// + [Column("ISSYNC")] + public bool? IsSync { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostIBLL.cs index 47e20fb55..4a72a068b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostIBLL.cs @@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// PM_TechnicalPostEntity GetPM_TechnicalPostEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageStatisticList(Pagination pagination, string queryJson); #endregion #region 提交数据 @@ -43,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void SaveEntity(string keyValue, PM_TechnicalPostEntity entity); - void Submit(string keyValue,bool status); + 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_TechnicalPost/PM_TechnicalPostService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs index 8c2a5ae00..49eec3057 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs @@ -85,6 +85,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.* "); + strSql.Append(" FROM PM_TechnicalPost 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["EmpName"].IsEmpty()) + { + dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); + strSql.Append(" AND e.EmpName Like @EmpName "); + } + 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); + } + } + } + #endregion #region 提交数据 @@ -120,6 +162,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void SaveEntity(string keyValue, PM_TechnicalPostEntity entity) { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { if (!string.IsNullOrEmpty(keyValue)) @@ -132,9 +175,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration entity.Create(); this.BaseRepository("CollegeMIS").Insert(entity); } + + //“是否同步”：选是，则更新教师表； + if (entity.IsSync.HasValue && entity.IsSync.Value == true) + { + db.ExecuteBySql("update EmpInfo set JobTitle='" + entity.TPName + "' where EmpId='" + entity.EmpId + "' "); + } + + db.Commit(); } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw;