Quellcode durchsuchen

【修改】教师信息管理:专业技术职务经历改为教师职称变更管理;增加是否同步字段;教师职称变更统计;

金隅分支
dyy vor 3 Jahren
Ursprung
Commit
519dd92fe8
16 geänderte Dateien mit 251 neuen und 20 gelöschten Zeilen
  1. +32
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_TechnicalPostController.cs
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml
  4. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
  5. +14
    -10
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.cshtml
  6. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js
  7. +5
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Index.js
  8. +31
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml
  9. +71
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js
  10. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  11. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
  12. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
  13. +23
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostBLL.cs
  14. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs
  15. +8
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostIBLL.cs
  16. +52
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs

+ 32
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_TechnicalPostController.cs Datei anzeigen

@@ -38,6 +38,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
return View();
}

/// <summary>
/// 主页面-统计
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult StatisticIndex()
{
return View();
}
#endregion

#region 获取数据
@@ -77,6 +87,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
};
return Success(jsonData);
}

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetPageStatisticList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
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 提交数据


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml Datei anzeigen

@@ -32,7 +32,7 @@
<ul class="nav nav-tabs">
<li><a data-value="tab1">基本信息</a></li>
<li><a data-value="tab2">教师学历变更管理</a></li>
<li><a data-value="tab3">专业技术职务经历</a></li>
<li><a data-value="tab3">教师职称变更管理</a></li>
<li><a data-value="tab4">工人技术等级经历</a></li>
<li><a data-value="tab5">工作经历</a></li>
<li><a data-value="tab6">家庭情况</a></li>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml Datei anzeigen

@@ -44,7 +44,7 @@
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">职称</div>
<div id="ProfessionalTitle"></div>
<input id="JobTitle" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">政治面貌</div>


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js Datei anzeigen

@@ -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',


+ 14
- 10
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.cshtml Datei anzeigen

@@ -3,29 +3,33 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost" >
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">技术职务名称<font face="宋体">*</font></div>
<input id="TPName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost" >
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">专业</div>
<input id="Major" type="text" class="form-control" />
<input id="Major" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost" >
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">证书编号</div>
<input id="CertificateNo" type="text" class="form-control" />
<input id="CertificateNo" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost" >
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">取得时间</div>
<input id="GetTime" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost" >
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">聘任时间</div>
<input id="AppointmentTime" type="text" class="form-control" />
<input id="AppointmentTime" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost" >
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">发证机关</div>
<input id="CertificationAuthority" type="text" class="form-control" />
<input id="CertificationAuthority" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_TechnicalPost">
<div class="lr-form-item-title">是否同步</div>
<div id="IsSync"></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js")

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Form.js Datei anzeigen

@@ -16,6 +16,7 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' });
},
initData: function () {
if (!!keyValue) {


+ 5
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/Index.js Datei anzeigen

@@ -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();
},


+ 31
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml Datei anzeigen

@@ -0,0 +1,31 @@
@{
ViewBag.Title = "专业技术职务经历统计";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout " >
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle ">
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
<div class="lr-query-formcontent">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">教师姓名</div>
<input id="EmpName" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js")

+ 71
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.js Datei anzeigen

@@ -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();
}

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Datei anzeigen

@@ -954,6 +954,7 @@
<Content Include="Areas\EducationalAdministration\Views\LoginUserBind\Form.js" />
<Content Include="Areas\EducationalAdministration\Views\LoginUserBind\BindAccountIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\PM_EducationExperience\StatisticIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\PracticeBase\Form.js" />
<Content Include="Areas\EducationalAdministration\Views\PracticeBase\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\R_EnterBuilding\ClassReport.js" />
@@ -7191,6 +7192,7 @@
<Content Include="Areas\LR_OAModule\Views\LostArticleInfo\Index.cshtml" />
<Content Include="Areas\LR_OAModule\Views\LostArticleInfo\FormClaim.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\PM_EducationExperience\StatisticIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml Datei anzeigen

@@ -14,7 +14,7 @@
@if (ViewBag.UserType == "教师" || ViewBag.UserType == "管理员")
{
<li><a data-value="tab2">教师学历变更记录</a></li>
<li><a data-value="tab3">专业技术职务经历</a></li>
<li><a data-value="tab3">教师职称变更记录</a></li>
<li><a data-value="tab4">工人技术等级经历</a></li>
<li><a data-value="tab5">工作简历</a></li>
<li><a data-value="tab6">家庭情况</a></li>


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs Datei anzeigen

@@ -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())//最高学历
{


+ 23
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostBLL.cs Datei anzeigen

@@ -66,6 +66,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<PM_TechnicalPostEntity> 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 提交数据


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs Datei anzeigen

@@ -64,6 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("UPDATETIME")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 是否同步
/// </summary>
[Column("ISSYNC")]
public bool? IsSync { get; set; }
#endregion

#region 扩展操作


+ 8
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostIBLL.cs Datei anzeigen

@@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <summary>
/// <returns></returns>
PM_TechnicalPostEntity GetPM_TechnicalPostEntity(string keyValue);

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<PM_TechnicalPostEntity> GetPageStatisticList(Pagination pagination, string queryJson);
#endregion

#region 提交数据
@@ -43,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <summary>
/// <returns></returns>
void SaveEntity(string keyValue, PM_TechnicalPostEntity entity);
void Submit(string keyValue,bool status);
void Submit(string keyValue, bool status);
#endregion

}


+ 52
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs Datei anzeigen

@@ -85,6 +85,48 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<PM_TechnicalPostEntity> 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<PM_TechnicalPostEntity>(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
/// <returns></returns>
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;


Laden…
Abbrechen
Speichern