bjquanjiang
/
DigitalScholl
1
0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

金隅分支
zhangli il y a 3 ans
Parent
6c432404fd 9b4349add6
révision
641e0f9c39
23 fichiers modifiés avec 409 ajouts et 92 suppressions
Vue séparée
Option de Diff
Voir les Statistiques Télécharger le Fichier Patch Télécharger le Fichier des Différences
  1. +94
    -71
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml
  2. +35
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_WorkerTechnologyController.cs
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
  5. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.cshtml
  6. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.js
  7. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml
  8. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js
  9. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml
  10. +15
    -11
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.cshtml
  11. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js
  12. +3
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Index.js
  13. +35
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.cshtml
  14. +83
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js
  15. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  16. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml
  17. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceService.cs
  18. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs
  19. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs
  20. +24
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyBLL.cs
  21. +15
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyEntity.cs
  22. +8
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyIBLL.cs
  23. +62
    -5
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyService.cs

+ 94
- 71
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml Voir le fichier

@@ -21,7 +21,7 @@
<style>
body {
border: 0;
padding: 0;
padding: 0 0 0px 0;
margin: 0;
/* font-family: Arial, Helvetica, sans-serif!important; */
/* font-weight: bold; */
@@ -41,7 +41,7 @@
margin: 0 auto 5px;
}

#qrcode {
.qrcodes {
float: left;
font-size: 12px;
}
@@ -77,34 +77,15 @@

<body style="">
<div id="qrcodeBox">
<div class="qrcodeBox" style="page-break-before: auto;page-break-after: always;">
<div style="">
<div id="top">
<div id="qrcode"></div>
<div id="roghtDiv" style="">
<div id="AIDepartment"></div>
<div id="AIUsePeople"></div>
<div id="AIIStorageAndRoom"></div>
</div>
</div>
<div id="bottom">
<div id="AICodeNumJY"></div>
<div id="AIASSName"></div>
</div>
</div>
</div>
</div>
<div id="btnprint" type="button" class="btns" value="打印">打印</div>
<script>
var qrcode = new QRCode(document.getElementById("qrcode"), {
width: 60,
height: 60
});
var keyValue = request('keyValue');
var aName = request('aName');
var AIId = request('AIId');
$(function () {
qrcode.makeCode(keyValue);
$.ajax({
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetFormData?keyValue=' + AIId,
type: "GET",
@@ -112,54 +93,96 @@
async: true,
success: function (res) {
var data = res.data.Ass_AssetsInfoItem;
console.log(data);
var AIDepartment = "部门：";
top.learun.clientdata.getAsync('department', {
key: data.AIDepartment,
callback: function (_data) {
AIDepartment += _data.name;
}
});
var AIUsePeople = "姓名：";
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: data.AIUsePeople,
keyId: 'f_userid',
callback: function (_data) {
AIUsePeople += _data['f_realname'];
}
});
var AIIStorage = "位置：";
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: data.AIIStorageId,
keyId: 'sid',
callback: function (_data) {
AIIStorage += _data['sname'];
}
});
var AIIStoragePosition = "";
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
key: data.AIIStoragePosition,
keyId: 'rid',
callback: function (_data) {
AIIStoragePosition = _data['rcode'];
}
});
$('#AIDepartment').html(AIDepartment);
$('#AIUsePeople').html(AIUsePeople);
if (AIIStoragePosition) {
$('#AIIStorageAndRoom').html(AIIStorage + "-" + AIIStoragePosition);
} else {
$('#AIIStorageAndRoom').html(AIIStorage);
}
$('#AICodeNumJY').html("编号："+data.AICodeNumJY);
$('#AIASSName').html("名称："+data.AIASSName);

var arr = [];
if(!Array.isArray(data)){
arr.push(data)
}else{
arr = data
}
var html = '';

$.each(arr, function(i, n){
var AIDepartment = "部门：";
top.learun.clientdata.getAsync('department', {
key: n.AIDepartment,
callback: function (_data) {
AIDepartment += _data.name;
}
});
var AIUsePeople = "姓名：";
if (n.AIUsePeople) {
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: n.AIUsePeople,
keyId: 'f_userid',
callback: function(_data) {
AIUsePeople += _data['f_realname'];
}
});
} else
AIUsePeople += "暂无";
var AIIStorage = "位置：";
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
key: n.AIIStorageId,
keyId: 'sid',
callback: function (_data) {
AIIStorage += _data['sname'];
}
});
var AIIStoragePosition = "";
top.learun.clientdata.getAsync('custmerData',
{
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
key: n.AIIStoragePosition,
keyId: 'rid',
callback: function (_data) {
AIIStoragePosition = _data['rcode'];
}
});
var AIIStorageStr = ''
if (AIIStoragePosition) {
AIIStorageStr = AIIStorage + "-" + AIIStoragePosition;
} else {
AIIStorageStr = AIIStorage;
}
html += '<div class="qrcodeBox" style="page-break-before: auto;page-break-after: always;"><div style="">'+
'<div id="top">'+
'<div id="qrcode'+ i +'" class="qrcodes" val="'+ n.AICodeNumJY +'"></div>'+
'<div id="roghtDiv" style="">'+
'<div id="AIDepartment">'+ AIDepartment +'</div>'+
'<div id="AIUsePeople">'+ AIUsePeople +'</div>'+
'<div id="AIIStorageAndRoom">'+ AIIStorageStr +'</div>'+
'</div>'+
'</div>'+
'<div id="bottom">'+
'<div id="AICodeNumJY">编号：'+ n.AICodeNumJY +'</div>'+
'<div id="AIASSName">名称：'+ n.AIASSName +'</div>'+
'</div>'+
'</div></div>';
// $('#AIDepartment').html(AIDepartment);
// $('#AIUsePeople').html(AIUsePeople);
// if (AIIStoragePosition) {
// $('#AIIStorageAndRoom').html(AIIStorage + "-" + AIIStoragePosition);
// } else {
// $('#AIIStorageAndRoom').html(AIIStorage);
// }
// $('#AICodeNumJY').html("编号："+data.AICodeNumJY);
// $('#AIASSName').html("名称："+data.AIASSName);
})
$('#qrcodeBox').html(html);
$('.qrcodes').each(function(i, n){
var id = $(n).attr('id');
var val = $(n).attr('val')
var qrcode = new QRCode(document.getElementById(id), {
width: 60,
height: 60
});
qrcode.makeCode(val);
})
}
});



+ 35
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_WorkerTechnologyController.cs Voir le fichier

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

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

#region 获取数据
@@ -75,6 +86,27 @@ 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_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<PM_WorkerTechnologyEntity>();
entity.Updater = loginUserInfo.userId;
entity.UpdateTime = DateTime.Now;
pM_WorkerTechnologyIBLL.SaveEntity(keyValue,entity);
return Success("保存成功！");
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml Voir le fichier

@@ -33,7 +33,7 @@
<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="tab4">工人技术等级经历</a></li>
<li><a data-value="tab4">工人技术等级变更管理</a></li>
<li><a data-value="tab5">教师部门变更管理</a></li>
<li><a data-value="tab6">家庭情况</a></li>
</ul>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js Voir le fichier

@@ -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) {


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.cshtml Voir le fichier

@@ -14,6 +14,10 @@
<div class="lr-form-item-title">教师姓名</div>
<input id="EmpName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">学历</div>
<div id="Education"></div>
</div>
</div>
</div>
</div>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/StatisticIndex.js Voir le fichier

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


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml Voir le fichier

@@ -14,6 +14,10 @@
<div class="lr-form-item-title">教师姓名</div>
<input id="EmpName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">部门</div>
<div id="DepartmentID"></div>
</div>
</div>
</div>
</div>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js Voir le fichier

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


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_TechnicalPost/StatisticIndex.cshtml Voir le fichier

@@ -14,6 +14,10 @@
<div class="lr-form-item-title">教师姓名</div>
<input id="EmpName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">专业技术职务名称</div>
<input id="TPName" type="text" class="form-control" />
</div>
</div>
</div>
</div>


+ 15
- 11
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.cshtml Voir le fichier

@@ -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_WorkerTechnology" >
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology">
<div class="lr-form-item-title">工人技术等级<font face="宋体">*</font></div>
<div id="TechnicalGrade" isvalid="yes" checkexpession="NotNull" ></div>
<div id="TechnicalGrade" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology" >
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology">
<div class="lr-form-item-title">工种<font face="宋体">*</font></div>
<input id="WorkType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology" >
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology">
<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_WorkerTechnology" >
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology">
<div class="lr-form-item-title">取得时间</div>
<input id="GetTime" type="text" class="form-control" />
<input id="GetTime" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology" >
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology">
<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_WorkerTechnology" >
<div class="col-xs-12 lr-form-item" data-table="PM_WorkerTechnology">
<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_WorkerTechnology">
<div class="lr-form-item-title">是否同步</div>
<div id="IsSync"></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js")

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Form.js Voir le fichier

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


+ 3
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/Index.js Voir le fichier

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


+ 35
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.cshtml Voir le fichier

@@ -0,0 +1,35 @@
@{
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 class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">工人技术等级</div>
<div id="TechnicalGrade"></div>
</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_WorkerTechnology/StatisticIndex.js")

+ 83
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_WorkerTechnology/StatisticIndex.js Voir le fichier

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

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Voir le fichier

@@ -957,6 +957,7 @@
<Content Include="Areas\EducationalAdministration\Views\PM_EducationExperience\StatisticIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\PM_Resume\StatisticIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\PM_WorkerTechnology\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" />
@@ -7253,6 +7254,7 @@
<Content Include="Areas\EducationalAdministration\Views\PM_EducationExperience\StatisticIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\PM_TechnicalPost\StatisticIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\PM_Resume\StatisticIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\PM_WorkerTechnology\StatisticIndex.cshtml" />
<None Include="Areas\EducationalAdministration\Views\SchoolNews\Index.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuEnroll\StuTuition.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuEnroll\IsHelpForm.cshtml" />


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml Voir le fichier

@@ -15,7 +15,7 @@
{
<li><a data-value="tab2">教师学历变更记录</a></li>
<li><a data-value="tab3">教师职称变更记录</a></li>
<li><a data-value="tab4">工人技术等级经历</a></li>
<li><a data-value="tab4">工人技术等级变更记录</a></li>
<li><a data-value="tab5">教师部门变更记录</a></li>
<li><a data-value="tab6">家庭情况</a></li>
}


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceService.cs Voir le fichier

@@ -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<PM_EducationExperienceEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs Voir le fichier

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


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs Voir le fichier

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


+ 24
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyBLL.cs Voir le fichier

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

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


+ 15
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyEntity.cs Voir le fichier

@@ -54,6 +54,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("CERTIFICATIONAUTHORITY")]
public string CertificationAuthority { get; set; }
/// <summary>
/// 是否同步
/// </summary>
[Column("ISSYNC")]
public bool? IsSync { get; set; }
/// <summary>
/// 最后修改人
/// </summary>
[Column("UPDATER")]
public string Updater { get; set; }
/// <summary>
/// 最后修改时间
/// </summary>
[Column("UPDATETIME")]
public DateTime? UpdateTime { get; set; }
#endregion

#region 扩展操作


+ 8
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyIBLL.cs Voir le fichier

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

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

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

}


+ 62
- 5
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyService.cs Voir le fichier

@@ -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<PM_WorkerTechnologyEntity>(strSql.ToString(),dp, pagination);
return this.BaseRepository("CollegeMIS").FindList<PM_WorkerTechnologyEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
@@ -85,6 +85,53 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<PM_WorkerTechnologyEntity> 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<PM_WorkerTechnologyEntity>(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<PM_WorkerTechnologyEntity>(t=>t.ID == keyValue);
this.BaseRepository("CollegeMIS").Delete<PM_WorkerTechnologyEntity>(t => t.ID == keyValue);
}
catch (Exception ex)
{
@@ -120,21 +167,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <returns></returns>
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;


Écrire Aperçu
Chargement…
Annuler
Enregistrer