@@ -23,9 +23,9 @@ | |||||
<input id="mobile" type="text" class="form-control" /> | <input id="mobile" type="text" class="form-control" /> | ||||
</div> | </div> | ||||
@*<div class="col-xs-6 lr-form-item"> | @*<div class="col-xs-6 lr-form-item"> | ||||
<div class="lr-form-item-title">系部</div> | |||||
<div id="DeptNo"></div> | |||||
</div>*@ | |||||
<div class="lr-form-item-title">系部</div> | |||||
<div id="DeptNo"></div> | |||||
</div>*@ | |||||
<div class="col-xs-6 lr-form-item"> | <div class="col-xs-6 lr-form-item"> | ||||
<div class="lr-form-item-title">部门</div> | <div class="lr-form-item-title">部门</div> | ||||
<div id="F_DepartmentId"></div> | <div id="F_DepartmentId"></div> | ||||
@@ -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">子女14周岁以下</div> | |||||
<div id="IsChildren"></div> | |||||
</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -59,6 +59,9 @@ var bootstrap = function ($, learun) { | |||||
$('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); | $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); | ||||
//是否审核 | //是否审核 | ||||
$('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); | $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); | ||||
//子女是否14周岁以下 | |||||
$('#IsChildren').lrDataItemSelect({ code: 'YesOrNoInt' }); | |||||
//学位 | //学位 | ||||
$('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); | $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); | ||||
//职称 | //职称 | ||||
@@ -127,6 +127,15 @@ 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["IsChildren"].IsEmpty())//子女是否14周岁以下 | |||||
{ | |||||
if (queryParam["IsChildren"].ToString() == "1") | |||||
{ | |||||
strSql.Append(" AND t.empid in (select empid from PM_FamilySituation where DATEDIFF(YEAR, birthday, getdate())<14) "); | |||||
} | |||||
} | |||||
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) | ||||