From 210c105577c051c4446b50e95c023ef12a4f2e8f Mon Sep 17 00:00:00 2001
From: hwh2023 <598694955@qq.com>
Date: Mon, 31 Jul 2023 16:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=8A=9F=E8=83=BD=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/EmpInfo/Index.cshtml                 | 12 ++++++++++++
 .../Views/EmpInfo/Index.js                     |  2 +-
 .../EmpInfo/EmpInfoService.cs                  | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

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 @@
                                     <div class="lr-form-item-title">职称</div>
                                     <input id="JobTitle" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">职务</div>
+                                    <input id="JobTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">到校时间</div>
+                                    <input id="GroupDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GroupDate').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">参加工作时间</div>
+                                    <input id="AddWorkDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AddWorkDate').trigger('change'); } })" />
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">政治面貌</div>
                                     <div id="PartyFaceNo"></div>
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);