From ddcdd3776baa6b236a9081c33b8b21c8e1325908 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Tue, 25 May 2021 18:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=95=99?= =?UTF-8?q?=E5=B8=88=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A=E5=B7=A5?= =?UTF-8?q?=E4=BA=BA=E6=8A=80=E6=9C=AF=E7=AD=89=E7=BA=A7=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9B=E5=B7=A5=E4=BA=BA=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=8F=98=E6=9B=B4=E7=BB=9F=E8=AE=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PM_WorkerTechnologyController.cs | 35 ++++++++ .../Views/EmpInfo/Form.cshtml | 2 +- .../Views/EmpInfo/Form.js | 2 +- .../StatisticIndex.cshtml | 4 + .../PM_EducationExperience/StatisticIndex.js | 1 + .../Views/PM_Resume/StatisticIndex.cshtml | 4 + .../Views/PM_Resume/StatisticIndex.js | 1 + .../PM_TechnicalPost/StatisticIndex.cshtml | 4 + .../Views/PM_WorkerTechnology/Form.cshtml | 26 +++--- .../Views/PM_WorkerTechnology/Form.js | 1 + .../Views/PM_WorkerTechnology/Index.js | 4 +- .../PM_WorkerTechnology/StatisticIndex.cshtml | 35 ++++++++ .../PM_WorkerTechnology/StatisticIndex.js | 83 +++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../Views/UserCenter/IndexInTeacher.cshtml | 2 +- .../PM_EducationExperienceService.cs | 5 ++ .../PM_Resume/PM_ResumeService.cs | 5 ++ .../PM_TechnicalPostService.cs | 5 ++ .../PM_WorkerTechnologyBLL.cs | 24 ++++++ .../PM_WorkerTechnologyEntity.cs | 15 ++++ .../PM_WorkerTechnologyIBLL.cs | 9 +- .../PM_WorkerTechnologyService.cs | 67 +++++++++++++-- 22 files changed, 315 insertions(+), 21 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_WorkerTechnologyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_WorkerTechnologyController.cs index a8c66015b..0aa250d90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_WorkerTechnologyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_WorkerTechnologyController.cs @@ -3,6 +3,7 @@ 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 { @@ -37,6 +38,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 主页面-统计 + /// + /// + [HttpGet] + public ActionResult StatisticIndex() + { + return View(); + } #endregion #region 获取数据 @@ -75,6 +86,27 @@ 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_WorkerTechnologyIBLL.GetPageStatisticList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } #endregion #region 提交数据 @@ -101,7 +133,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { + var loginUserInfo = LoginUserInfo.Get(); PM_WorkerTechnologyEntity entity = strEntity.ToObject(); + entity.Updater = loginUserInfo.userId; + entity.UpdateTime = DateTime.Now; pM_WorkerTechnologyIBLL.SaveEntity(keyValue,entity); return Success("保存成功！"); } 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 a35fa2b06..95fd5f38c 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 @@ -33,7 +33,7 @@
  • 基本信息
  • 教师学历变更管理
  • 教师职称变更管理
    • -
  • 工人技术等级经历
    • +
  • 工人技术等级变更管理
  • 教师部门变更管理
  • 家庭情况
    • 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 2ece25b37..e7faffedf 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 @@ -140,7 +140,7 @@ var bootstrap = function ($, learun) { $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' }); $('#JobRank').lrDataItemSelect({ code: 'TechnicalPost' }); - $('#WorkLevel').lrDataItemSelect({ code: 'TechnicalLevelOfWorker' }); + $('#WorkLevel').lrDataItemSelect({ code: 'WorkerTechnologyGrade' }); //编制类别 $('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory', select: function (item) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.cshtml index 6b7791ec1..1c6f2dedc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.cshtml @@ -14,6 +14,10 @@
    教师姓名
    +
    +
    学历
    +
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.js index 69bd60e4a..ee289ace6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.js @@ -16,6 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 200, 400); + $('#Education').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml index cd1ad9dfc..170849a08 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml @@ -14,6 +14,10 @@
    教师姓名
    +
    +
    部门
    +
    +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js index 723dfa9d2..9ac449590 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js @@ -16,6 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#DepartmentID').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); 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 index d6620952c..ffe4b29a5 100644 --- 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 @@ -14,6 +14,10 @@
    教师姓名
    +
    +
    专业技术职务名称
    + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.cshtml index 108acd300..32afb36f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.cshtml @@ -3,29 +3,33 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
    -
    +
    工人技术等级*
    -
    +
    -
    +
    工种*
    -
    +
    证书编号
    - +
    -
    +
    取得时间
    - +
    -
    +
    聘任时间
    - +
    -
    +
    发证机关
    - + +
    +
    +
    是否同步
    +
    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js index 6e14bb660..c8cd181c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js @@ -17,6 +17,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#TechnicalGrade').lrDataItemSelect({ code: 'WorkerTechnologyGrade' }); + $('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Index.js index 37775c68b..7c02dbdb7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Index.js @@ -135,6 +135,7 @@ 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) { @@ -143,7 +144,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_WorkerTechnology/StatisticIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.cshtml new file mode 100644 index 000000000..1a83fa6f7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.cshtml @@ -0,0 +1,35 @@ +@{ + ViewBag.Title = "工人技术等级经历统计"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    教师姓名
    + +
    +
    +
    工人技术等级
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js new file mode 100644 index 000000000..57ddae0ec --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js @@ -0,0 +1,83 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-03-30 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); + $('#TechnicalGrade').lrDataItemSelect({ code: 'WorkerTechnologyGrade' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/PM_WorkerTechnology/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: "TechnicalGrade", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'WorkerTechnologyGrade', + 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 870ceb0b4..658a66663 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 @@ -957,6 +957,7 @@ + @@ -7249,6 +7250,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 036c97d61..4b07d3899 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 @@ -15,7 +15,7 @@ {
  • 教师学历变更记录
  • 教师职称变更记录
    • -
  • 工人技术等级经历
    • +
  • 工人技术等级变更记录
  • 教师部门变更记录
  • 家庭情况
    • } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceService.cs index d2570a040..2de68104c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceService.cs @@ -131,6 +131,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); strSql.Append(" AND e.EmpName like @EmpName "); } + if (!queryParam["Education"].IsEmpty()) + { + dp.Add("Education", queryParam["Education"].ToString(), DbType.String); + strSql.Append(" AND t.Education = @Education "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs index 31b7d78c2..624a4b5a7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs @@ -126,6 +126,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); strSql.Append(" AND t.EmpId = @EmpId "); } + if (!queryParam["DepartmentID"].IsEmpty()) + { + dp.Add("DepartmentID", queryParam["DepartmentID"].ToString(), DbType.String); + strSql.Append(" AND t.DepartmentID = @DepartmentID "); + } if (!queryParam["EmpName"].IsEmpty()) { dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); 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 0a1ba8622..f80baba20 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 @@ -107,6 +107,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); strSql.Append(" AND e.EmpName Like @EmpName "); } + if (!queryParam["TPName"].IsEmpty()) + { + dp.Add("TPName", "%" + queryParam["TPName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.TPName Like @TPName "); + } if (!queryParam["EmpId"].IsEmpty()) { dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyBLL.cs index 660d27472..50b9e7481 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyBLL.cs @@ -66,6 +66,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageStatisticList(Pagination pagination, string queryJson) + { + try + { + return pM_WorkerTechnologyService.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_WorkerTechnology/PM_WorkerTechnologyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyEntity.cs index ef13cc443..2237c5e77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyEntity.cs @@ -54,6 +54,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("CERTIFICATIONAUTHORITY")] public string CertificationAuthority { 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 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyIBLL.cs index 4fc224ca1..bfa0fa750 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyIBLL.cs @@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// PM_WorkerTechnologyEntity GetPM_WorkerTechnologyEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageStatisticList(Pagination pagination, string queryJson); #endregion #region 提交数据 @@ -43,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void SaveEntity(string keyValue, PM_WorkerTechnologyEntity 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_WorkerTechnology/PM_WorkerTechnologyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyService.cs index 943bbda78..ee279b2a0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyService.cs @@ -38,7 +38,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var dp = new DynamicParameters(new { }); if (!queryParam["TechnicalGrade"].IsEmpty()) { - dp.Add("TechnicalGrade",queryParam["TechnicalGrade"].ToString(), DbType.String); + dp.Add("TechnicalGrade", queryParam["TechnicalGrade"].ToString(), DbType.String); strSql.Append(" AND t.TechnicalGrade = @TechnicalGrade "); } if (!queryParam["EmpId"].IsEmpty()) @@ -46,7 +46,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EmpId", queryParam["EmpId"].ToString(), DbType.String); strSql.Append(" AND t.EmpId = @EmpId "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -85,6 +85,53 @@ 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_WorkerTechnology 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["TechnicalGrade"].IsEmpty()) + { + dp.Add("TechnicalGrade", queryParam["TechnicalGrade"].ToString(), DbType.String); + strSql.Append(" AND t.TechnicalGrade = @TechnicalGrade "); + } + 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 提交数据 @@ -98,7 +145,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.ID == keyValue); } catch (Exception ex) { @@ -120,21 +167,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void SaveEntity(string keyValue, PM_WorkerTechnologyEntity entity) { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { if (!string.IsNullOrEmpty(keyValue)) { entity.Modify(keyValue); - this.BaseRepository("CollegeMIS").Update(entity); + db.Update(entity); } else { entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); + db.Insert(entity); } + + //“是否同步”：选是，则更新教师表； + if (entity.IsSync.HasValue && entity.IsSync.Value == true) + { + db.ExecuteBySql("update EmpInfo set WorkLevel='" + entity.TechnicalGrade + "' where EmpId='" + entity.EmpId + "' "); + } + + db.Commit(); } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw;