Bladeren bron

解决冲突

金隅分支
zhangli 3 jaren geleden
bovenliggende
commit
ed78d8b304
25 gewijzigde bestanden met toevoegingen van 1960 en 3 verwijderingen
  1. +43
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs
  2. +57
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.cshtml
  3. +191
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js
  4. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Annexes/UploadForm.js
  5. +148
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs
  6. +31
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml
  7. +50
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js
  8. +51
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.cshtml
  9. +115
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js
  10. +45
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.cshtml
  11. +67
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js
  12. +10
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  13. +28
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/StudentLeaveMap.cs
  14. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
  15. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs
  16. +29
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollOnceMap.cs
  17. +148
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveBLL.cs
  18. +131
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveEntity.cs
  19. +55
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveIBLL.cs
  20. +238
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveService.cs
  21. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
  22. +77
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs
  23. +150
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/Emp_PayrollOnceBLL.cs
  24. +56
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/Emp_PayrollOnceIBLL.cs
  25. +227
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/Emp_PayrollOnceService.cs

+ 43
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs Bestand weergeven

@@ -26,6 +26,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers

private UserIBLL userIbll = new UserBLL();
private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
private StudentLeaveIBLL studentLeaveIBLL = new StudentLeaveBLL();

#region 视图功能
/// <summary>
@@ -278,6 +279,25 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
return View();
}

/// <summary>
/// 普通教师请假归档
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult LeaveFiling()
{
return View();
}
/// <summary>
/// 普通教师请假流程监控
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult LeaveFilingMonitor()
{
return View();
}

#endregion


@@ -342,6 +362,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
};
return Success(jsonData);
}
/// <summary>
/// 获取我的流程信息列表
/// </summary>
@@ -415,6 +436,28 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
var data = nWFTaskIBLL.GetEntity(taskId);
return Success(data);
}

/// <summary>
/// 获取普通教师请假归档列表
/// </summary>
/// <param name="pagination"></param>
/// <param name="queryJson"></param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetLeaveList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var list = studentLeaveIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
rows = list,
total = paginationobj.total,
page = paginationobj.page,
records = paginationobj.records,
};
return Success(jsonData);
}
#endregion

#region 保存更新删除


+ 57
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.cshtml Bestand weergeven

@@ -0,0 +1,57 @@
@{
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="datesearch"></div>
</div>
<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>
<div id="F_CreateUserName"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">所属部门</div>
<div id="F_BuMen"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">请假类型</div>
<div id="F_QJType"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">请假事由</div>
<input id="F_Description" 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 class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_eye" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlg">查看</span></a>
</div>
</div>
</div>

<div class="lr-layout-body" id="gridtable">
</div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js")






+ 191
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js Bestand weergeven

@@ -0,0 +1,191 @@
/*
* 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2018 上海力软信息技术有限公司
* 创建人:力软-前端开发组
* 日 期:2021.05.18
* 描 述:普通教师请假归档
*/
var bootstrap = function ($, learun) {
"use strict";
var categoryId = '1';
var logbegin = '';
var logend = '';

var page = {
init: function () {
$('#lr_verify').hide();
page.initGrid();
page.bind();
},
bind: function () {
$('#datesearch').lrdate({
dfdata: [
{ name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
],
// 月
mShow: false,
premShow: false,
// 季度
jShow: false,
prejShow: false,
// 年
ysShow: false,
yxShow: false,
preyShow: false,
yShow: false,
selectfn: function (begin, end) {
logbegin = begin;
logend = end;
page.search();
}
});
// 查询
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
$('#F_CreateUserName').lrUserSelect(1);
$('#F_QJType').lrDataItemSelect({ code: 'LeaveType' });
$('#F_BuMen').lrselect({
type: 'tree',
// 展开最大高度
maxHeight: 200,
// 是否允许搜索
allowSearch: true,
// 访问数据接口地址
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
});
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
// 查看
$('#lr_eye').on('click', function () {
page.eye();
});
},
initleft: function () {
$('#lr_left_list li').on('click', function () {
var $this = $(this);
var $parent = $this.parent();
$parent.find('.active').removeClass('active');
$this.addClass('active');
categoryId = $this.attr('data-value');
if (categoryId == 3) {
categoryId = 1;
F_EnabledMark = true;
} else {
F_EnabledMark = false;
}
page.search();
});
},
initGrid: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetLeaveList',
headData: [
{
label: '开始时间', name: 'StartDate', width: 140, align: "left", formatter: function (cellvalue, row) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '上下午', name: 'F_shangxiawu', width: 60, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'sxw',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: '结束时间', name: 'EndDate', width: 140, align: "left", formatter: function (cellvalue, row) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '上下午', name: 'F_sxw', width: 60, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'sxw',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: '姓名', name: 'F_CreateUserName', width: 80, align: "left",
formatterAsync: function (callback, value, row) {
learun.clientdata.getAsync('user', {
key: value,
callback: function (item) {
callback(item.name);
}
});
}
},
{
label: '所属部门', name: 'F_BuMen', width: 120, 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: 'F_tianshu', width: 60, align: "left" },
{
label: '请假类型', name: 'F_QJType', width: 80, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'LeaveType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{ label: '请假事由', name: 'F_Description', width: 80, align: "left" },
],
mainId: 'SLId',
isPage: true,
sidx: 'F_CreateDate DESC',
dblclick: function () {
page.eye();
}
});
page.search();
},
search: function (param) {
param = param || {};
param.StartTime = logbegin;
param.EndTime = logend;
param.F_IsFinished = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
},
eye: function () {
var processId = $('#gridtable').jfGridValue('SLId') || '';
var title = $('#gridtable').jfGridValue('F_Description');

if (learun.checkrow(processId)) {
learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
}
}
};

page.init();
}



+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Annexes/UploadForm.js Bestand weergeven

@@ -134,7 +134,8 @@ var bootstrap = function ($, learun) {
chunked: true,
chunkRetry: 3,
prepareNextFile: true,
chunkSize:'1048576',
chunkSize: '1048576',
fileSingleSizeLimit:500*1024*1024,
// 上传参数
formData: {
__RequestVerificationToken: $.lrToken


+ 148
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs Bestand weergeven

@@ -0,0 +1,148 @@
using Learun.Util;
using System.Data;
using Learun.Application.TwoDevelopment.PersonnelManagement;
using System.Web.Mvc;
using System.Collections.Generic;
using System.Linq;

namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:一次性工资条
/// </summary>
public class Emp_PayrollOnceController : MvcControllerBase
{
private Emp_PayrollOnceIBLL emp_PayrollOnceIBLL = new Emp_PayrollOnceBLL();

#region 视图功能

/// <summary>
/// 主页面
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult Index()
{
return View();
}
/// <summary>
/// 表单页
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult Form()
{
return View();
}

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

#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetPageList(string pagination, string queryJson)
{
Pagination paginationobj = pagination.ToObject<Pagination>();
var data = emp_PayrollOnceIBLL.GetPageList(paginationobj, queryJson);
var jsonData = new
{
rows = data,
total = paginationobj.total,
page = paginationobj.page,
records = paginationobj.records
};
return Success(jsonData);
}
/// <summary>
/// 获取表单数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var EMP_PayrollOnceData = emp_PayrollOnceIBLL.GetEMP_PayrollOnceEntity(keyValue);
var jsonData = new
{
EMP_PayrollOnce = EMP_PayrollOnceData,
};
return Success(jsonData);
}

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetStatisticList(string queryJson)
{
var data = emp_PayrollOnceIBLL.GetList(queryJson);
var datagroup = data.GroupBy(x => new { x.IssueMonth, x.IssueYear }).Select(x => new EMP_PayrollOnceEntity
{
IssueYear = x.Key.IssueYear,
IssueMonth = x.Key.IssueMonth,
TotalPayAmount = x.Select(y => y.TotalPayAmount.ToDecimal()).Sum().ToString(),
FinalPayAmount = x.Select(y => y.FinalPayAmount.ToDecimal()).Sum().ToString()
}).OrderByDescending(x => x.IssueYear).ThenByDescending(x => x.IssueMonth);

return Success(datagroup);
}
#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult DeleteForm(string keyValue)
{
emp_PayrollOnceIBLL.DeleteEntity(keyValue);
return Success("删除成功!");
}
/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="strEntity">实体</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
[AjaxOnly]
public ActionResult SaveForm(string keyValue, string strEntity)
{
EMP_PayrollOnceEntity entity = strEntity.ToObject<EMP_PayrollOnceEntity>();
emp_PayrollOnceIBLL.SaveEntity(keyValue, entity);
return Success("保存成功!");
}
#endregion

}
}

+ 31
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml Bestand weergeven

@@ -0,0 +1,31 @@
@{
ViewBag.Title = "一次性工资条";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">姓名</div>
<input id="SalaryName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">发放月份</div>
<input id="IssueMonth" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">发放年份</div>
<input id="IssueYear" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">应发金额</div>
<input id="TotalPayAmount" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">实发金额</div>
<input id="FinalPayAmount" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="EMP_PayrollOnce">
<div class="lr-form-item-title">备注</div>
<textarea id="Remark" class="form-control" style="height:50px;"></textarea>
</div>
</div>
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js")

+ 50
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js Bestand weergeven

@@ -0,0 +1,50 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
* 创建人:超级管理员
* 日 期:2021-04-21 15:42
* 描 述:一次性工资条
*/
var acceptClick;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
page.bind();
page.initData();
},
bind: function () {
},
initData: function () {
if (!!keyValue) {
$.lrSetForm(top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetFormData?keyValue=' + keyValue, function (data) {
for (var id in data) {
if (!!data[id].length && data[id].length > 0) {
$('#' + id ).jfGridSet('refreshdata', data[id]);
}
else {
$('[data-table="' + id + '"]').lrSetFormData(data[id]);
}
}
});
}
}
};
// 保存数据
acceptClick = function (callBack) {
if (!$('body').lrValidform()) {
return false;
}
var postData = {
strEntity: JSON.stringify($('body').lrGetFormData())
};
$.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/SaveForm?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
}
});
};
page.init();
}

+ 51
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.cshtml Bestand weergeven

@@ -0,0 +1,51 @@
@{
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>
<div id="IssueYear"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">月份</div>
<div id="IssueMonth"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="SalaryName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">部门</div>
<div id="Department"></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 class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
<a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>


@Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js")

+ 115
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js Bestand weergeven

@@ -0,0 +1,115 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
* 创建人:超级管理员
* 日 期:2021-04-21 15:42
* 描 述:一次性工资条
*/
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);
//年份
$('#IssueYear').lrselect({
allowSearch: true,
url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
value: 'value',
text: 'text'
});
$('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
$('#Department').lrselect({
type: 'tree',
// 展开最大高度
maxHeight: 200,
// 是否允许搜索
allowSearch: true,
// 访问数据接口地址
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
});
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
// 新增
$('#lr_add').on('click', function () {
learun.layerForm({
id: 'form',
title: '新增',
url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/Form',
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
});
// 编辑
$('#lr_edit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('SalaryID');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
title: '编辑',
url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/Form?keyValue=' + keyValue,
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
// 删除
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('SalaryID');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
});
}
});
// 打印
$('#lr_print').on('click', function () {
$('#gridtable').jqprintTable();
});
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList',
headData: [
{ label: "姓名", name: "SalaryName", width: 100, align: "left" },
{ label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
{ label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
{ label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
{ label: "发放年份", name: "IssueYear", width: 100, align: "left" },
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'SalaryID',
isPage: true,
sidx: 'IssueYear desc,IssueMonth desc'
});
page.search();
},
search: function (param) {
param = param || {};
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 45
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.cshtml Bestand weergeven

@@ -0,0 +1,45 @@
@{
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>
<div id="IssueYear"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">月份</div>
<div id="IssueMonth"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="SalaryName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">部门</div>
<div id="Department"></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/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js")

+ 67
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js Bestand weergeven

@@ -0,0 +1,67 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
* 创建人:超级管理员
* 日 期:2021-04-21 15:42
* 描 述:一次性工资条统计
*/
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);
//年份
$('#IssueYear').lrselect({
allowSearch: true,
type: 'multiple',
url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
value: 'value',
text: 'text'
});
$('#IssueMonth').lrDataItemSelect({ code: 'MPMonth', type: 'multiple' });
$('#Department').lrselect({
type: 'tree',
// 展开最大高度
maxHeight: 200,
// 是否允许搜索
allowSearch: true,
// 访问数据接口地址
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
});
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetStatisticList',
headData: [
{ label: "发放年份", name: "IssueYear", width: 100, align: "left" },
{ label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
{ label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
{ label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
],
mainId: 'SalaryID',
isPage: false
});
page.search();
},
search: function (param) {
param = param || {};
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 10
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Bestand weergeven

@@ -471,6 +471,7 @@
<Compile Include="Areas\LR_WorkFlowModule\Controllers\WfSystemDemoController.cs" />
<Compile Include="Areas\LR_WorkFlowModule\LR_WorkFlowModuleAreaRegistration.cs" />
<Compile Include="Areas\Permission\PermissionAreaRegistration.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\Emp_PayrollOnceController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\EpidemicReportController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\EpidemicSituationCopyController.cs" />
<Compile Include="Areas\PersonnelManagement\Controllers\MeetingNoticeController.cs" />
@@ -1285,6 +1286,7 @@
<Content Include="Areas\LR_LGManager\Views\StampApply\Form.js" />
<Content Include="Areas\LR_LGManager\Views\StampApply\Index.js" />
<Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\AddTaskForm.js" />
<Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\LeaveFiling.js" />
<Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFilingMonitor.js" />
<Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\htPrint.css" />
<Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFiling.js" />
@@ -1377,6 +1379,9 @@
<Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
<Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
<Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
<Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\Form.js" />
<Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\Index.js" />
<Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\StatisticIndex.js" />
<Content Include="Areas\PersonnelManagement\Views\Emp_Payroll\StatisticIndex.js" />
<Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
<Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.js" />
@@ -7175,7 +7180,11 @@
<Content Include="Areas\LR_OAModule\Views\Notice\FormLostArticleView.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\Emp_Payroll\StatisticIndex.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\VisitorInfo\FormAdd.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<Content Include="Areas\PersonnelManagement\Views\VisitorInfo\FormAdd2.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\Form.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\Index.cshtml" />
<Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\StatisticIndex.cshtml" />
<Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\LeaveFiling.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />


+ 28
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/StudentLeaveMap.cs Bestand weergeven

@@ -0,0 +1,28 @@
using Learun.Application.TwoDevelopment.LR_LGManager;
using System.Data.Entity.ModelConfiguration;

namespace Learun.Application.Mapping
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-05-18 15:48
/// 描 述:流程_请假表
/// </summary>
public class StudentLeaveMap : EntityTypeConfiguration<StudentLeaveEntity>
{
public StudentLeaveMap()
{
#region 表、主键
//表
this.ToTable("STUDENTLEAVE");
//主键
this.HasKey(t => t.SLId);
#endregion

#region 配置关系
#endregion
}
}
}

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj Bestand weergeven

@@ -138,6 +138,7 @@
<Compile Include="LR_IM\IMSysUserMap.cs" />
<Compile Include="LR_LGManager\CorporateMaterialApplyMap.cs" />
<Compile Include="LR_LGManager\CorporateMaterialItemMap.cs" />
<Compile Include="LR_LGManager\StudentLeaveMap.cs" />
<Compile Include="LR_LGManager\LC_hetongMap.cs" />
<Compile Include="LR_LGManager\StampApplyMap.cs" />
<Compile Include="LR_Message\LR_MS_StrategyInfoMap.cs" />
@@ -195,6 +196,7 @@
<Compile Include="LR_WorkFlow\WfSchemeMap.cs" />
<Compile Include="LR_WorkFlow\WfTaskHistoryMap.cs" />
<Compile Include="LR_WorkFlow\WfTaskMap.cs" />
<Compile Include="PersonnelManagement\EMP_PayrollOnceMap.cs" />
<Compile Include="PersonnelManagement\JbjiabanMap.cs" />
<Compile Include="PersonnelManagement\MeetingNoticeMap.cs" />
<Compile Include="PersonnelManagement\MP_ManageMentPlanMap.cs" />


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollMap.cs Bestand weergeven

@@ -8,7 +8,7 @@ namespace Learun.Application.Mapping
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:考勤记录
/// 描 述:工资条
/// </summary>
public class EMP_PayrollMap : EntityTypeConfiguration<EMP_PayrollEntity>
{


+ 29
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/EMP_PayrollOnceMap.cs Bestand weergeven

@@ -0,0 +1,29 @@
using Learun.Application.TwoDevelopment.PersonnelManagement;
using System.Data.Entity.ModelConfiguration;

namespace Learun.Application.Mapping
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:一次性工资条
/// </summary>
public class EMP_PayrollOnceMap : EntityTypeConfiguration<EMP_PayrollOnceEntity>
{
public EMP_PayrollOnceMap()
{
#region 表、主键
//表
this.ToTable("EMP_PAYROLLONCE");
//主键
this.HasKey(t => t.SalaryID);
#endregion

#region 配置关系
#endregion
}
}
}


+ 148
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveBLL.cs Bestand weergeven

@@ -0,0 +1,148 @@
using Learun.Util;
using System;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.LR_LGManager
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-05-18 15:48
/// 描 述:流程_请假表
/// </summary>
public class StudentLeaveBLL : StudentLeaveIBLL
{
private StudentLeaveService studentLeaveService = new StudentLeaveService();

#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<StudentLeaveEntity> GetList(string queryJson)
{
try
{
return studentLeaveService.GetList(queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<StudentLeaveEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
return studentLeaveService.GetPageList(pagination, queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public StudentLeaveEntity GetEntity(string keyValue)
{
try
{
return studentLeaveService.GetEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
studentLeaveService.DeleteEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
public void SaveEntity(string keyValue, StudentLeaveEntity entity)
{
try
{
studentLeaveService.SaveEntity(keyValue, entity);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

}
}

+ 131
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveEntity.cs Bestand weergeven

@@ -0,0 +1,131 @@
using Learun.Util;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace Learun.Application.TwoDevelopment.LR_LGManager

{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-05-18 15:48
/// 描 述:流程_请假表
/// </summary>
public class StudentLeaveEntity
{
#region 实体成员
/// <summary>
/// SLId
/// </summary>
/// <returns></returns>
[Column("SLID")]
public string SLId { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
/// <returns></returns>
[Column("F_CREATEUSERID")]
public string F_CreateUserId { get; set; }
/// <summary>
/// 创建人
/// </summary>
/// <returns></returns>
[Column("F_CREATEUSERNAME")]
public string F_CreateUserName { get; set; }
/// <summary>
/// 创建时间
/// </summary>
/// <returns></returns>
[Column("F_CREATEDATE")]
public DateTime? F_CreateDate { get; set; }
/// <summary>
/// 备注
/// </summary>
/// <returns></returns>
[Column("F_DESCRIPTION")]
public string F_Description { get; set; }
/// <summary>
/// 开始时间
/// </summary>
/// <returns></returns>
[Column("STARTDATE")]
public DateTime? StartDate { get; set; }
/// <summary>
/// 结束时间
/// </summary>
/// <returns></returns>
[Column("ENDDATE")]
public DateTime? EndDate { get; set; }
/// <summary>
/// 请假类型
/// </summary>
/// <returns></returns>
[Column("F_QJTYPE")]
public string F_QJType { get; set; }
/// <summary>
/// 所属部门
/// </summary>
/// <returns></returns>
[Column("F_BUMEN")]
public string F_BuMen { get; set; }
/// <summary>
/// 请假天数
/// </summary>
/// <returns></returns>
[Column("F_TIANSHU")]
public string F_tianshu { get; set; }
/// <summary>
/// 资料上传
/// </summary>
/// <returns></returns>
[Column("F_FUJIAN")]
public string F_fujian { get; set; }
/// <summary>
/// 上下午(开始时间)
/// </summary>
/// <returns></returns>
[Column("F_SHANGXIAWU")]
public string F_shangxiawu { get; set; }
/// <summary>
/// 上下午(结束时间)
/// </summary>
/// <returns></returns>
[Column("F_SXW")]
public string F_sxw { get; set; }
/// <summary>
/// 当前角色
/// </summary>
/// <returns></returns>
[Column("F_DQJS")]
public string F_dqjs { get; set; }
/// <summary>
/// LeaveDay
/// </summary>
/// <returns></returns>
[Column("LEAVEDAY")]
public string LeaveDay { get; set; }
#endregion

#region 扩展操作
/// <summary>
/// 新增调用
/// </summary>
public void Create()
{
this.SLId = Guid.NewGuid().ToString();
this.F_CreateDate = DateTime.Now;
UserInfo userInfo = LoginUserInfo.Get();
this.F_CreateUserId = userInfo.userId;
this.F_CreateUserName = userInfo.realName;
}
/// <summary>
/// 编辑调用
/// </summary>
/// <param name="keyValue"></param>
public void Modify(string keyValue)
{
this.SLId = keyValue;
}
#endregion
}
}

+ 55
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveIBLL.cs Bestand weergeven

@@ -0,0 +1,55 @@
using Learun.Util;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.LR_LGManager
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-05-18 15:48
/// 描 述:流程_请假表
/// </summary>
public interface StudentLeaveIBLL
{
#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<StudentLeaveEntity> GetList(string queryJson);
/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<StudentLeaveEntity> GetPageList(Pagination pagination, string queryJson);
/// <summary>
/// 获取实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
StudentLeaveEntity GetEntity(string keyValue);
#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
void DeleteEntity(string keyValue);
/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
void SaveEntity(string keyValue, StudentLeaveEntity entity);
#endregion

}
}

+ 238
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveService.cs Bestand weergeven

@@ -0,0 +1,238 @@
using Dapper;
using Learun.DataBase.Repository;
using Learun.Util;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;

namespace Learun.Application.TwoDevelopment.LR_LGManager
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-05-18 15:48
/// 描 述:流程_请假表
/// </summary>
public class StudentLeaveService : RepositoryFactory
{
#region 构造函数和属性

private string fieldSql;
/// <summary>
/// 构造方法
/// </summary>
public StudentLeaveService()
{
fieldSql = @"
t.SLId,
t.F_CreateUserId,
t.F_CreateUserName,
t.F_CreateDate,
t.F_Description,
t.StartDate,
t.EndDate,
t.F_QJType,
t.F_BuMen,
t.F_tianshu,
t.F_fujian,
t.F_shangxiawu,
t.F_sxw,
t.F_dqjs,
t.LeaveDay
";
}
#endregion

#region 获取数据

/// <summary>
/// 获取列表数据
/// </summary>
/// <param name="queryJson">条件参数</param>
/// <returns></returns>
public IEnumerable<StudentLeaveEntity> GetList(string queryJson)
{
try
{
//参考写法
//var queryParam = queryJson.ToJObject();
// 虚拟参数
//var dp = new DynamicParameters(new { });
//dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(fieldSql);
strSql.Append(" FROM StudentLeave t ");
return this.BaseRepository().FindList<StudentLeaveEntity>(strSql.ToString());
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取列表分页数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">条件参数</param>
/// <returns></returns>
public IEnumerable<StudentLeaveEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT t.* ");
strSql.Append(" FROM StudentLeave t left join LR_NWF_Process p on t.SLId=p.F_Id where p.F_EnabledMark!=2 and p.F_IsChild=0 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["F_IsFinished"].IsEmpty())
{
dp.Add("F_IsFinished", queryParam["F_IsFinished"].ToString(), DbType.String);
strSql.Append(" and p.F_IsFinished=@F_IsFinished ");
}
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
{
dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.F_CreateDate >= @startTime AND t.F_CreateDate <= @endTime ) ");
}
if (!queryParam["F_CreateUserName"].IsEmpty())
{
var arr = queryParam["F_CreateUserName"].ToString().Split(',');
var arrtemp = "";
foreach (var item in arr)
{
arrtemp += $"'{item}',";
}
arrtemp = arrtemp.TrimEnd(',');
strSql.Append($" and t.F_CreateUserName in ({arrtemp}) ");
}
if (!queryParam["F_BuMen"].IsEmpty())
{
dp.Add("F_BuMen", queryParam["F_BuMen"].ToString(), DbType.String);
strSql.Append(" and t.F_BuMen=@F_BuMen ");
}
if (!queryParam["F_QJType"].IsEmpty())
{
dp.Add("F_QJType", queryParam["F_QJType"].ToString(), DbType.String);
strSql.Append(" and t.F_QJType=@F_QJType ");
}
if (!queryParam["F_Description"].IsEmpty())
{
dp.Add("F_Description", "%" + queryParam["F_Description"].ToString() + "%", DbType.String);
strSql.Append(" and t.F_Description like @F_Description ");
}
return this.BaseRepository().FindList<StudentLeaveEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public StudentLeaveEntity GetEntity(string keyValue)
{
try
{
return this.BaseRepository().FindEntity<StudentLeaveEntity>(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
this.BaseRepository().Delete<StudentLeaveEntity>(t => t.SLId == keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 保存实体数据(新增、修改)
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
/// </summary>
public void SaveEntity(string keyValue, StudentLeaveEntity entity)
{
try
{
if (!string.IsNullOrEmpty(keyValue))
{
entity.Modify(keyValue);
this.BaseRepository().Update(entity);
}
else
{
entity.Create();
this.BaseRepository().Insert(entity);
}
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

}
}

+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj Bestand weergeven

@@ -273,6 +273,10 @@
<Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemEntity.cs" />
<Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemIBLL.cs" />
<Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemService.cs" />
<Compile Include="LR_LGManager\StudentLeave\StudentLeaveBLL.cs" />
<Compile Include="LR_LGManager\StudentLeave\StudentLeaveEntity.cs" />
<Compile Include="LR_LGManager\StudentLeave\StudentLeaveIBLL.cs" />
<Compile Include="LR_LGManager\StudentLeave\StudentLeaveService.cs" />
<Compile Include="LR_LGManager\LC_hetong\LC_hetongBLL.cs" />
<Compile Include="LR_LGManager\LC_hetong\LC_hetongEntity.cs" />
<Compile Include="LR_LGManager\LC_hetong\LC_hetongIBLL.cs" />
@@ -293,6 +297,10 @@
<Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementEntity.cs" />
<Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementIBLL.cs" />
<Compile Include="PersonnelManagement\BC_PublishManagement\BC_PublishManagementService.cs" />
<Compile Include="PersonnelManagement\Emp_PayrollOnce\Emp_PayrollOnceBLL.cs" />
<Compile Include="PersonnelManagement\Emp_PayrollOnce\EMP_PayrollOnceEntity.cs" />
<Compile Include="PersonnelManagement\Emp_PayrollOnce\Emp_PayrollOnceIBLL.cs" />
<Compile Include="PersonnelManagement\Emp_PayrollOnce\Emp_PayrollOnceService.cs" />
<Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeBLL.cs" />
<Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeEntity.cs" />
<Compile Include="PersonnelManagement\MeetingNotice\MeetingNoticeIBLL.cs" />


+ 77
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs Bestand weergeven

@@ -0,0 +1,77 @@
using Learun.Util;
using System;
using System.ComponentModel.DataAnnotations.Schema;
using System.Security.AccessControl;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:一次性工资条
/// </summary>
public class EMP_PayrollOnceEntity
{
#region 实体成员
/// <summary>
/// 工资编号
/// </summary>
[Column("SALARYID")]
public string SalaryID { get; set; }
/// <summary>
/// 姓名
/// </summary>
[Column("SALARYNAME")]
public string SalaryName { get; set; }
/// <summary>
/// 发放月份
/// </summary>
[Column("ISSUEMONTH")]
public string IssueMonth { get; set; }
/// <summary>
/// 发放年份
/// </summary>
[Column("ISSUEYEAR")]
public string IssueYear { get; set; }
/// <summary>
/// 应发金额
/// </summary>
[Column("TOTALPAYAMOUNT")]
public string TotalPayAmount { get; set; }
/// <summary>
/// 实发金额
/// </summary>
[Column("FINALPAYAMOUNT")]
public string FinalPayAmount { get; set; }
/// <summary>
/// 备注
/// </summary>
[Column("REMARK")]
public string Remark { get; set; }

#endregion

#region 扩展操作
/// <summary>
/// 新增调用
/// </summary>
public void Create()
{
this.SalaryID = Guid.NewGuid().ToString();
}
/// <summary>
/// 编辑调用
/// </summary>
/// <param name="keyValue"></param>
public void Modify(string keyValue)
{
this.SalaryID = keyValue;
}
#endregion
#region 扩展字段
#endregion
}
}


+ 150
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/Emp_PayrollOnceBLL.cs Bestand weergeven

@@ -0,0 +1,150 @@
using Learun.Util;
using System;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:一次性工资条
/// </summary>
public class Emp_PayrollOnceBLL : Emp_PayrollOnceIBLL
{
private Emp_PayrollOnceService emp_PayrollOnceService = new Emp_PayrollOnceService();

#region 获取数据

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

/// <summary>
/// 获取EMP_PayrollOnce表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public EMP_PayrollOnceEntity GetEMP_PayrollOnceEntity(string keyValue)
{
try
{
return emp_PayrollOnceService.GetEMP_PayrollOnceEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">分页参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<EMP_PayrollOnceEntity> GetList(string queryJson)
{
try
{
return emp_PayrollOnceService.GetList(queryJson);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
emp_PayrollOnceService.DeleteEntity(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
/// <returns></returns>
public void SaveEntity(string keyValue, EMP_PayrollOnceEntity entity)
{
try
{
emp_PayrollOnceService.SaveEntity(keyValue, entity);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

#endregion

}
}

+ 56
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/Emp_PayrollOnceIBLL.cs Bestand weergeven

@@ -0,0 +1,56 @@
using Learun.Util;
using System.Data;
using System.Collections.Generic;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:一次性工资条
/// </summary>
public interface Emp_PayrollOnceIBLL
{
#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
IEnumerable<EMP_PayrollOnceEntity> GetPageList(Pagination pagination, string queryJson);
/// <summary>
/// 获取EMP_PayrollOnce表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
EMP_PayrollOnceEntity GetEMP_PayrollOnceEntity(string keyValue);

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

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
void DeleteEntity(string keyValue);
/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
void SaveEntity(string keyValue, EMP_PayrollOnceEntity entity);
#endregion

}
}

+ 227
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/Emp_PayrollOnceService.cs Bestand weergeven

@@ -0,0 +1,227 @@
using Dapper;
using Learun.DataBase.Repository;
using Learun.Util;
using System;
using System.Collections.Generic;
using System.Data;
using System.Text;

namespace Learun.Application.TwoDevelopment.PersonnelManagement
{
/// <summary>
/// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
/// Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
/// 创 建:超级管理员
/// 日 期:2021-04-21 15:42
/// 描 述:一次性工资条
/// </summary>
public class Emp_PayrollOnceService : RepositoryFactory
{
#region 获取数据

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">查询参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<EMP_PayrollOnceEntity> GetPageList(Pagination pagination, string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT t.* ");
strSql.Append(" FROM EMP_PayrollOnce t");
strSql.Append(" left join EmpInfo e on t.SalaryID=e.SalaryNumber ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["IssueYear"].IsEmpty())
{
dp.Add("IssueYear", queryParam["IssueYear"].ToString(), DbType.String);
strSql.Append(" AND t.IssueYear = @IssueYear ");
}
if (!queryParam["IssueMonth"].IsEmpty())
{
dp.Add("IssueMonth", queryParam["IssueMonth"].ToString(), DbType.String);
strSql.Append(" AND t.IssueMonth = @IssueMonth ");
}
if (!queryParam["SalaryName"].IsEmpty())
{
dp.Add("SalaryName", "%" + queryParam["SalaryName"].ToString() + "%", DbType.String);
strSql.Append(" AND t.SalaryName Like @SalaryName ");
}
if (!queryParam["Department"].IsEmpty())
{
dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
strSql.Append(" AND e.F_DepartmentId = @Department ");
}
return this.BaseRepository("CollegeMIS").FindList<EMP_PayrollOnceEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取EMP_PayrollOnce表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public EMP_PayrollOnceEntity GetEMP_PayrollOnceEntity(string keyValue)
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<EMP_PayrollOnceEntity>(keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取页面显示列表数据
/// </summary>
/// <param name="pagination">查询参数</param>
/// <param name="queryJson">查询参数</param>
/// <returns></returns>
public IEnumerable<EMP_PayrollOnceEntity> GetList(string queryJson)
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT t.* ");
strSql.Append(" FROM EMP_PayrollOnce t");
strSql.Append(" left join EmpInfo e on t.SalaryID=e.SalaryNumber ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["IssueYear"].IsEmpty())
{
var strArr = queryParam["IssueYear"].ToString().Split(',');
var strs = "";
foreach (var item in strArr)
{
strs += $"'{item}',";
}
strs = strs.TrimEnd(',');
strSql.Append($" AND t.IssueYear in ({strs}) ");
}
if (!queryParam["IssueMonth"].IsEmpty())
{
var strArr = queryParam["IssueMonth"].ToString().Split(',');
var strs = "";
foreach (var item in strArr)
{
strs += $"'{item}',";
}
strs = strs.TrimEnd(',');
strSql.Append($" AND t.IssueMonth in ({strs}) ");
}
if (!queryParam["SalaryName"].IsEmpty())
{
dp.Add("SalaryName", "%" + queryParam["SalaryName"].ToString() + "%", DbType.String);
strSql.Append(" AND t.SalaryName Like @SalaryName ");
}
if (!queryParam["Department"].IsEmpty())
{
dp.Add("Department", queryParam["Department"].ToString(), DbType.String);
strSql.Append(" AND e.F_DepartmentId = @Department ");
}
return this.BaseRepository("CollegeMIS").FindList<EMP_PayrollOnceEntity>(strSql.ToString(), dp);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

#region 提交数据

/// <summary>
/// 删除实体数据
/// </summary>
/// <param name="keyValue">主键</param>
public void DeleteEntity(string keyValue)
{
try
{
this.BaseRepository("CollegeMIS").Delete<EMP_PayrollOnceEntity>(t => t.SalaryID == keyValue);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="entity">实体</param>
public void SaveEntity(string keyValue, EMP_PayrollOnceEntity entity)
{
try
{
if (!string.IsNullOrEmpty(keyValue))
{
entity.Modify(keyValue);
this.BaseRepository("CollegeMIS").Update(entity);
}
else
{
entity.Create();
this.BaseRepository("CollegeMIS").Insert(entity);
}
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

#endregion

}
}

Laden…
Annuleren
Opslaan