bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

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

金隅分支
zhangli 3 years ago
parent
a37b0940b0 f42e5e6a87
commit
fadb11b993
17 changed files with 379 additions and 66 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +17
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs
  2. +85
    -39
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml
  3. +31
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_ResumeController.cs
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
  5. +17
    -13
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml
  6. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.js
  7. +16
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js
  8. +31
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.cshtml
  9. +83
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/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. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemIBLL.cs
  13. +25
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeBLL.cs
  14. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs
  15. +7
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeIBLL.cs
  16. +54
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs
  17. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs

+ 17
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs View File

@@ -134,12 +134,24 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var Ass_AssetsInfoItemData = ass_AssetsInfoItemIBLL.GetAss_AssetsInfoItemEntity(keyValue);
var jsonData = new
if (!keyValue.Contains(","))
{
Ass_AssetsInfoItem = Ass_AssetsInfoItemData,
};
return Success(jsonData);
var Ass_AssetsInfoItemData = ass_AssetsInfoItemIBLL.GetAss_AssetsInfoItemEntity(keyValue);
var jsonData = new
{
Ass_AssetsInfoItem = Ass_AssetsInfoItemData,
};
return Success(jsonData);
}
else
{
var Ass_AssetsInfoItemData = ass_AssetsInfoItemIBLL.GetDatas(keyValue);
var jsonData = new
{
Ass_AssetsInfoItem = Ass_AssetsInfoItemData,
};
return Success(jsonData);
}
}

/// <summary>


+ 85
- 39
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/QRPrint.cshtml View File

@@ -1,13 +1,11 @@
<!DOCTYPE html>


<html>

<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>CardPrint</title>
@Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js")
<script src="/Content/js/qrcode.min.js"></script>
@Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js", "/Content/js/qrcode.min.js")
<link href="~/Content/cardprint/CardPrint.css" rel="stylesheet" />
<script>
function request(d) {
@@ -15,47 +13,98 @@
var b = c[a].split("=");
if (b[0] == d)
if ("undefined" == unescape(b[1])) break;
else return unescape(b[1])
else return unescape(b[1]);
}
return ""
return "";
};
</script>
<style>
body {
border: 0;
padding: 0;
margin: 0;
/* font-family: Arial, Helvetica, sans-serif!important; */
/* font-weight: bold; */
}

#qrcodeBox {
width: 390px;
margin: 0 auto;
}

.qrcodeBox {
padding: 18px 5px 0;
/* margin-top:20px; */
}

.qrcodeBox > div {
margin: 0 auto 5px;
}

#qrcode {
float: left;
font-size: 12px;
}

#roghtDiv {
margin-top: -2px;
margin-left: 70px;
text-align: left;
}

#roghtDiv div {
height: 20px;
line-height: 20px;
font-size: 13px;
}

#top {
overflow: hidden;
}

#bottom {
line-height: 24px;
font-size: 14x;
padding-top: 10px;
}

#bottom div {
height: 24px;
overflow: hidden;
}
</style>
</head>

<body style="">
<div id="qrcodeBox" style="text-align:center;margin-top:20px;">
<div class="qrcodeBox" style="display: inline-block">
<div style="margin: 0 auto 5px;">
<div id="qrcodeBox">
<div class="qrcodeBox" style="page-break-before: auto;page-break-after: always;">
<div style="">
<div id="top">
<div id="qrcode" style="float: left; font-size: 12px;"></div>
<div id="roghtDiv" style="float: right; line-height: 25px; padding: 5px;">
<div id="AIDepartment" style="height: 25px;"></div>
<div id="AIUsePeople" style="height: 25px;"></div>
<div id="AIIStorageAndRoom" style="height: 25px;"></div>
<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" style="line-height: 20px;">
<div id="bottom">
<div id="AICodeNumJY"></div>
<div id="AIASSName"></div>
</div>
</div>
@*<div class="qrcodeTxt" style="font-size:12px;"></div>*@
</div>
</div>
<div id="btnprint" type="button" class="btns" value="打印">打印</div>
<script>
//标签打印
var qrcode = new QRCode(document.getElementById("qrcode"), {
width: 80,
height: 80
width: 60,
height: 60
});
var keyValue = request('keyValue');//二维码
var keyValue = request('keyValue');
var aName = request('aName');
var AIId = request('AIId');
//$('.qrcodeTxt').html(unescape(aName));
$(function () {
qrcode.makeCode(keyValue);
//获取打印信息
$.ajax({
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetFormData?keyValue=' + AIId,
type: "GET",
@@ -63,37 +112,34 @@
async: true,
success: function (res) {
var data = res.data.Ass_AssetsInfoItem;
//部门
var AIDepartment = "";
console.log(data);
var AIDepartment = "部门：";
top.learun.clientdata.getAsync('department', {
key: data.AIDepartment,
callback: function (_data) {
AIDepartment = _data.name;
AIDepartment += _data.name;
}
});
//使用人
var AIUsePeople = "";
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'];
AIUsePeople += _data['f_realname'];
}
});
//楼宇名称
var AIIStorage = "";
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'];
AIIStorage += _data['sname'];
}
});
//房间号
var AIIStoragePosition = "";
top.learun.clientdata.getAsync('custmerData',
{
@@ -111,24 +157,24 @@
} else {
$('#AIIStorageAndRoom').html(AIIStorage);
}
$('#AICodeNumJY').html(data.AICodeNumJY);
$('#AIASSName').html(data.AIASSName);
$('#AICodeNumJY').html("编号："+data.AICodeNumJY);
$('#AIASSName').html("名称："+data.AIASSName);

}
});

$("#btnprint").on("click", function () {
AddPrintContent3();
$('#qrcodeBox').jqprint();
});


});
// 打印表单

function AddPrintContent3() {
$('#btnprint').css('display', 'none');
window.print();
$('#btnprint').css('display', 'block');
// $('#btnprint').css('display', 'none');
// window.print();
// $('#btnprint').css('display', 'block');
$('.tableBox').jqprint();
}
</script>
</body>


+ 31
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/PM_ResumeController.cs View File

@@ -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,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_ResumeIBLL.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 View File

@@ -34,7 +34,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="tab5">工作经历</a></li>
<li><a data-value="tab5">教师部门变更管理</a></li>
<li><a data-value="tab6">家庭情况</a></li>
</ul>
</div>


+ 17
- 13
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml View File

@@ -3,33 +3,37 @@
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap">
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
<input id="RSTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull" />
<input id="RSTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
<input id="RTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull" />
<input id="RTime" type="text" class="form-control " isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">工作单位<font face="宋体">*</font></div>
<input id="UnitName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">证明人</div>
<input id="Witness" type="text" class="form-control" />
<input id="Witness" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">部门</div>
<input id="DepartmentID" type="text" class="form-control" />
<div id="DepartmentID"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">岗位</div>
<input id="PostID" type="text" class="form-control" />
<input id="PostID" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume" >
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">是否同步</div>
<div id="IsSync"></div>
</div>
<div class="col-xs-12 lr-form-item" data-table="PM_Resume">
<div class="lr-form-item-title">工作描述</div>
<textarea id="Describe" class="form-control" style="height:100px;" ></textarea>
<textarea id="Describe" class="form-control" style="height:100px;"></textarea>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_Resume/Form.js")

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.js View File

@@ -16,6 +16,8 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
$('#IsSync').lrDataItemSelect({ code: 'YesOrNoBit' });
$('#DepartmentID').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
},
initData: function () {
if (!!keyValue) {


+ 16
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js View File

@@ -119,9 +119,22 @@ var bootstrap = function ($, learun) {
{ label: "结束时间", name: "RTime", width: 130, align: "left" },
{ label: "工作单位", name: "UnitName", width: 100, align: "left" },
{ label: "证明人", name: "Witness", width: 100, align: "left" },
{ label: "部门", name: "DepartmentID", width: 100, align: "left" },
{
label: "部门", name: "DepartmentID", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{ label: "岗位", name: "PostID", width: 100, align: "left" },
{ label: "工作描述", name: "Describe", 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) {
@@ -130,7 +143,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_Resume/StatisticIndex.cshtml View File

@@ -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_Resume/StatisticIndex.js")

+ 83
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/StatisticIndex.js View File

@@ -0,0 +1,83 @@
/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
* Copyright (c) 2013-2018 北京泉江科技有限公司
* 创建人：超级管理员
* 日 期：2020-03-30 14:11
* 描 述：工作简历统计
*/
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').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/PM_Resume/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: "DepartmentID", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{ 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 View File

@@ -955,6 +955,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_Resume\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" />
@@ -7251,6 +7252,7 @@
<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" />
<Content Include="Areas\EducationalAdministration\Views\PM_Resume\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 View File

@@ -16,7 +16,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="tab5">工作简历</a></li>
<li><a data-value="tab5">教师部门变更记录</a></li>
<li><a data-value="tab6">家庭情况</a></li>
}
</ul>


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemIBLL.cs View File

@@ -61,6 +61,5 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
/// <returns></returns>
void SaveEntity(string keyValue, Ass_AssetsInfoItemEntity entity);
#endregion

}
}

+ 25
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeBLL.cs View File

@@ -89,6 +89,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<PM_ResumeEntity> GetPageStatisticList(Pagination pagination, string queryJson)
{
try
{
return pM_ResumeService.GetPageStatisticList(pagination, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

#region 提交数据


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs View File

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

#region 扩展操作


+ 7
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeIBLL.cs View File

@@ -34,6 +34,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<PM_ResumeEntity> GetListByEmpId(string empId);

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

#region 提交数据


+ 54
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeService.cs View File

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

/// <summary>
/// 获取页面显示列表数据
/// <summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<PM_ResumeEntity> GetPageStatisticList(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT t.* ");
strSql.Append(" FROM PM_Resume 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["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_ResumeEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

#region 提交数据
@@ -139,21 +181,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <returns></returns>
public void SaveEntity(string keyValue, PM_ResumeEntity 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 F_DepartmentId='" + entity.DepartmentID + "' where EmpId='" + entity.EmpId + "' ");
}

db.Commit();
}
catch (Exception ex)
{
db.Rollback();
if (ex is ExceptionEx)
{
throw;


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostService.cs View File

@@ -168,12 +168,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
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);
}

//“是否同步”：选是，则更新教师表；


Write Preview
Loading…
Cancel
Save