@@ -58,6 +58,10 @@ | |||||
<div class="lr-form-item-title">是否审核</div> | <div class="lr-form-item-title">是否审核</div> | ||||
<div id="CheckMark"></div> | <div id="CheckMark"></div> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item"> | |||||
<div class="lr-form-item-title">职工状态</div> | |||||
<div id="IsInActiveStatus"></div> | |||||
</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -72,6 +72,8 @@ var bootstrap = function ($, learun) { | |||||
url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck', | url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck', | ||||
// 访问数据接口参数 | // 访问数据接口参数 | ||||
}); | }); | ||||
//职工状态 | |||||
$('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' }); | |||||
// 刷新 | // 刷新 | ||||
$('#lr_refresh').on('click', function () { | $('#lr_refresh').on('click', function () { | ||||
location.reload(); | location.reload(); | ||||
@@ -20,7 +20,7 @@ | |||||
<div class="listDotT" id="F_FullHead"></div> | <div class="listDotT" id="F_FullHead"></div> | ||||
<div class="listDotTime"> | <div class="listDotTime"> | ||||
<span>发布时间:<span id="F_CreateDate"></span></span> | <span>发布时间:<span id="F_CreateDate"></span></span> | ||||
<span>发布:<span id="F_CreateUserName"></span></span> | |||||
<span>信息来源:<span id="F_CreateUserName"></span></span> | |||||
<span>公告类别:<span id="F_Category"></span></span> | <span>公告类别:<span id="F_Category"></span></span> | ||||
</div> | </div> | ||||
<div class="listDotBox" id="F_NewsContent"> | <div class="listDotBox" id="F_NewsContent"> | ||||
@@ -127,6 +127,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String); | dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String); | ||||
strSql.Append(" AND t.CheckMark = @CheckMark "); | strSql.Append(" AND t.CheckMark = @CheckMark "); | ||||
} | } | ||||
if (!queryParam["IsInActiveStatus"].IsEmpty())//职工状态 | |||||
{ | |||||
dp.Add("IsInActiveStatus", queryParam["IsInActiveStatus"].ToString(), DbType.String); | |||||
strSql.Append(" AND t.IsInActiveStatus = @IsInActiveStatus "); | |||||
} | |||||
return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(strSql.ToString(), dp, pagination); | return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(strSql.ToString(), dp, pagination); | ||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||