diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 1bd11e5ed..f8c885a1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -51,8 +51,12 @@
-
文化程度
-
+
最高学历
+
+
+
+
是否审核
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 20578acca..a5487d379 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 250, 400); + }, 280, 400); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', @@ -49,14 +49,16 @@ var bootstrap = function ($, learun) { $('#RegionNo').lrselect(); //政治面貌 $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - //文化程度 - $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); + //最高学历 + $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); //民族 $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); //性别 $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + //是否审核 + $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); //学位 $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); //职称 @@ -412,7 +414,7 @@ var bootstrap = function ($, learun) { { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { - label: "文化程度", name: "CultureDegreeNo", width: 100, align: "left", + label: "最高学历", name: "HighestRecord", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 6f1210b30..13ad106bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -97,6 +97,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("NationalityNo", queryParam["NationalityNo"].ToString(), DbType.String); strSql.Append(" AND t.NationalityNo = @NationalityNo "); } + if (!queryParam["PartyFaceNo"].IsEmpty())//政治面貌 + { + dp.Add("PartyFaceNo", queryParam["PartyFaceNo"].ToString(), DbType.String); + strSql.Append(" AND t.PartyFaceNo = @PartyFaceNo "); + } if (!queryParam["GenderNo"].IsEmpty())//性别 { dp.Add("GenderNo", queryParam["GenderNo"].ToString(), DbType.String); @@ -112,6 +117,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("ProfessionalTitle", queryParam["ProfessionalTitle"].ToString(), DbType.String); strSql.Append(" AND t.ProfessionalTitle = @ProfessionalTitle "); } + if (!queryParam["HighestRecord"].IsEmpty())//最高学历 + { + dp.Add("HighestRecord", queryParam["HighestRecord"].ToString(), DbType.String); + strSql.Append(" AND t.HighestRecord = @HighestRecord "); + } + if (!queryParam["CheckMark"].IsEmpty())//是否审核 + { + dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String); + strSql.Append(" AND t.CheckMark = @CheckMark "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)