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 21ce58e2b..b7f92e7cb 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 @@ -46,6 +46,18 @@
职称
+
+
职务
+ +
+
+
到校时间
+ +
+
+
参加工作时间
+ +
政治面貌
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 860a51842..c03b3e9a7 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); - }, 330, 700); + }, 380, 700); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', 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 73dfa3077..05e74730b 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 @@ -62,6 +62,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration // dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); // strSql.Append(" AND t.DeptNo = @DeptNo "); //} + + if (!queryParam["JobTitle"].IsEmpty()) + { + dp.Add("JobTitle", queryParam["JobTitle"].ToString(), DbType.String); + strSql.Append(" AND t.JobTitle = @JobTitle "); + } + if (!queryParam["GroupDate"].IsEmpty()) + { + dp.Add("GroupDate", queryParam["GroupDate"].ToString(), DbType.String); + strSql.Append(" AND t.GroupDate = @GroupDate "); + } + if (!queryParam["AddWorkDate"].IsEmpty()) + { + dp.Add("AddWorkDate", queryParam["AddWorkDate"].ToString(), DbType.String); + strSql.Append(" AND t.AddWorkDate = @AddWorkDate "); + } + + if (!queryParam["ProvinceNo"].IsEmpty()) { dp.Add("ProvinceNo", queryParam["ProvinceNo"].ToString(), DbType.String);