@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
[HttpGet] | [HttpGet] | ||||
public ActionResult Index() | public ActionResult Index() | ||||
{ | { | ||||
return View(); | |||||
return View(); | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// 表单页 | /// 表单页 | ||||
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
[HttpGet] | [HttpGet] | ||||
public ActionResult Form() | public ActionResult Form() | ||||
{ | { | ||||
return View(); | |||||
return View(); | |||||
} | } | ||||
#endregion | #endregion | ||||
@@ -71,8 +71,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var ADR_RestrictionData = aDR_RestrictionIBLL.GetADR_RestrictionEntity( keyValue ); | |||||
var jsonData = new { | |||||
var ADR_RestrictionData = aDR_RestrictionIBLL.GetADR_RestrictionEntity(keyValue); | |||||
var jsonData = new | |||||
{ | |||||
ADR_Restriction = ADR_RestrictionData, | ADR_Restriction = ADR_RestrictionData, | ||||
}; | }; | ||||
return Success(jsonData); | return Success(jsonData); | ||||
@@ -94,6 +95,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// 启用限制 | |||||
/// </summary> | |||||
/// <param name="keyValue">主键</param> | |||||
/// <returns></returns> | |||||
[HttpPost] | |||||
[AjaxOnly] | |||||
public ActionResult Enable(string keyValue) | |||||
{ | |||||
aDR_RestrictionIBLL.Enable(keyValue); | |||||
return Success("启用成功!"); | |||||
} | |||||
/// <summary> | |||||
/// 保存实体数据(新增、修改) | /// 保存实体数据(新增、修改) | ||||
/// </summary> | /// </summary> | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -105,7 +118,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
public ActionResult SaveForm(string keyValue, string strEntity) | public ActionResult SaveForm(string keyValue, string strEntity) | ||||
{ | { | ||||
ADR_RestrictionEntity entity = strEntity.ToObject<ADR_RestrictionEntity>(); | ADR_RestrictionEntity entity = strEntity.ToObject<ADR_RestrictionEntity>(); | ||||
aDR_RestrictionIBLL.SaveEntity(keyValue,entity); | |||||
aDR_RestrictionIBLL.SaveEntity(keyValue, entity); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -16,6 +16,7 @@ | |||||
<a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i> 新增</a> | <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i> 新增</a> | ||||
<a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> 编辑</a> | <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> 编辑</a> | ||||
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i> 删除</a> | <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i> 删除</a> | ||||
<a id="lr_enable" class="btn btn-default"><i class="fa fa-plus"></i> 启用</a> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -52,56 +52,79 @@ var bootstrap = function ($, learun) { | |||||
if (learun.checkrow(keyValue)) { | if (learun.checkrow(keyValue)) { | ||||
learun.layerConfirm('是否确认删除该项!', function (res) { | learun.layerConfirm('是否确认删除该项!', function (res) { | ||||
if (res) { | if (res) { | ||||
learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/DeleteForm', { keyValue: keyValue}, function () { | |||||
learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/DeleteForm', { keyValue: keyValue }, function () { | |||||
refreshGirdData(); | refreshGirdData(); | ||||
}); | }); | ||||
} | } | ||||
}); | }); | ||||
} | } | ||||
}); | }); | ||||
// 启用 | |||||
$('#lr_enable').on('click', function () { | |||||
var keyValue = $('#gridtable').jfGridValue('ID'); | |||||
if (learun.checkrow(keyValue)) { | |||||
learun.layerConfirm('是否确认启用!', function (res) { | |||||
if (res) { | |||||
learun.postForm(top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/Enable', { keyValue: keyValue }, function () { | |||||
refreshGirdData(); | |||||
}); | |||||
} | |||||
}); | |||||
} | |||||
}); | |||||
}, | }, | ||||
// 初始化列表 | // 初始化列表 | ||||
initGird: function () { | initGird: function () { | ||||
$('#gridtable').lrAuthorizeJfGrid({ | $('#gridtable').lrAuthorizeJfGrid({ | ||||
url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList', | url: top.$.rootUrl + '/PersonnelManagement/ADR_Restriction/GetPageList', | ||||
headData: [ | headData: [ | ||||
{ label: "上班时间", name: "WorkTime", width: 100, align: "left"}, | |||||
{ label: "下班时间", name: "CloseTime", width: 100, align: "left"}, | |||||
{ label: "上班时间", name: "WorkTime", width: 100, align: "left" }, | |||||
{ label: "下班时间", name: "CloseTime", width: 100, align: "left" }, | |||||
//{ label: "签到有效时间", name: "SignInStartTime", width: 100, align: "left"}, | //{ label: "签到有效时间", name: "SignInStartTime", width: 100, align: "left"}, | ||||
//{ label: "-", name: "SignInEndTime", width: 100, align: "left"}, | //{ label: "-", name: "SignInEndTime", width: 100, align: "left"}, | ||||
//{ label: "签退有效时间", name: "SignOutStartTime", width: 100, align: "left"}, | //{ label: "签退有效时间", name: "SignOutStartTime", width: 100, align: "left"}, | ||||
//{ label: "-", name: "SignOutEndTime", width: 100, align: "left"}, | //{ label: "-", name: "SignOutEndTime", width: 100, align: "left"}, | ||||
{ label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left"}, | |||||
{ label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left"}, | |||||
{ label: "未签到,记为", name: "NoSignIn", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op,$cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'ADStatus', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
}}, | |||||
{ label: "未签退,记为", name: "NoSignOut", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op,$cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'ADStatus', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
}}, | |||||
{ label: "允许迟到范围(分)", name: "LateOvertime", width: 100, align: "left" }, | |||||
{ label: "允许早退范围(分)", name: "LeaveOverTime", width: 100, align: "left" }, | |||||
{ | |||||
label: "未签到,记为", name: "NoSignIn", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'ADStatus', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "未签退,记为", name: "NoSignOut", width: 100, align: "left", | |||||
formatterAsync: function (callback, value, row, op, $cell) { | |||||
learun.clientdata.getAsync('dataItem', { | |||||
key: value, | |||||
code: 'ADStatus', | |||||
callback: function (_data) { | |||||
callback(_data.text); | |||||
} | |||||
}); | |||||
} | |||||
}, | |||||
{ | |||||
label: "是否启用", name: "REnable", width: 100, align: "left", formatter: function (val) { | |||||
return val ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>"; | |||||
} | |||||
}, | |||||
], | ], | ||||
mainId:'ID', | |||||
mainId: 'ID', | |||||
isPage: true | isPage: true | ||||
}); | }); | ||||
page.search(); | page.search(); | ||||
}, | }, | ||||
search: function (param) { | search: function (param) { | ||||
param = param || {}; | param = param || {}; | ||||
$('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); | |||||
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); | |||||
} | } | ||||
}; | }; | ||||
refreshGirdData = function () { | refreshGirdData = function () { | ||||
@@ -93,6 +93,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
} | } | ||||
} | } | ||||
} | } | ||||
/// <summary> | |||||
/// 启用限制 | |||||
/// </summary> | |||||
/// <param name="keyValue">主键</param> | |||||
public void Enable(string keyValue) | |||||
{ | |||||
try | |||||
{ | |||||
aDR_RestrictionService.Enable(keyValue); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 保存实体数据(新增、修改) | /// 保存实体数据(新增、修改) | ||||
@@ -37,6 +37,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
void DeleteEntity(string keyValue); | void DeleteEntity(string keyValue); | ||||
/// <summary> | /// <summary> | ||||
/// 启用限制 | |||||
/// </summary> | |||||
/// <param name="keyValue">主键</param> | |||||
void Enable(string keyValue); | |||||
/// <summary> | |||||
/// 保存实体数据(新增、修改) | /// 保存实体数据(新增、修改) | ||||
/// </summary> | /// </summary> | ||||
/// <param name="keyValue">主键</param> | /// <param name="keyValue">主键</param> | ||||
@@ -42,6 +42,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
t.LateOvertime, | t.LateOvertime, | ||||
t.LeaveOverTime, | t.LeaveOverTime, | ||||
t.NoSignIn, | t.NoSignIn, | ||||
t.REnable, | |||||
t.NoSignOut | t.NoSignOut | ||||
"); | "); | ||||
strSql.Append(" FROM ADR_Restriction t "); | strSql.Append(" FROM ADR_Restriction t "); | ||||
@@ -49,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
var queryParam = queryJson.ToJObject(); | var queryParam = queryJson.ToJObject(); | ||||
// 虚拟参数 | // 虚拟参数 | ||||
var dp = new DynamicParameters(new { }); | var dp = new DynamicParameters(new { }); | ||||
return this.BaseRepository("CollegeMIS").FindList<ADR_RestrictionEntity>(strSql.ToString(),dp, pagination); | |||||
return this.BaseRepository("CollegeMIS").FindList<ADR_RestrictionEntity>(strSql.ToString(), dp, pagination); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||
@@ -100,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
{ | { | ||||
try | try | ||||
{ | { | ||||
this.BaseRepository("CollegeMIS").Delete<ADR_RestrictionEntity>(t=>t.ID == keyValue); | |||||
this.BaseRepository("CollegeMIS").Delete<ADR_RestrictionEntity>(t => t.ID == keyValue); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||
@@ -114,6 +115,35 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
} | } | ||||
} | } | ||||
} | } | ||||
/// <summary> | |||||
/// 启用限制 | |||||
/// </summary> | |||||
/// <param name="keyValue">主键</param> | |||||
public void Enable(string keyValue) | |||||
{ | |||||
var db = this.BaseRepository("CollegeMIS").BeginTrans(); | |||||
try | |||||
{ | |||||
var sql = "UPDATE dbo.ADR_Restriction SET REnable='false'"; | |||||
db.ExecuteBySql(sql); | |||||
var entity = db.FindEntity<ADR_RestrictionEntity>(a => a.ID == keyValue); | |||||
entity.REnable = true; | |||||
db.Update(entity); | |||||
db.Commit(); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
db.Rollback(); | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowServiceException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 保存实体数据(新增、修改) | /// 保存实体数据(新增、修改) | ||||
@@ -154,7 +184,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
{ | { | ||||
try | try | ||||
{ | { | ||||
return this.BaseRepository("CollegeMIS").FindEntity<ADR_RestrictionEntity>(m=>m.REnable==true); | |||||
return this.BaseRepository("CollegeMIS").FindEntity<ADR_RestrictionEntity>(m => m.REnable == true); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||