【修改】教师信息管理取消系部；教师证书管理进行完善；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml

@@ -147,10 +147,10 @@
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
             <div id="F_DepartmentId" checkexpession="NotNull"></div>
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">系部</div>
             <div id="DeptNo"></div>
-        </div>
+        </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 $("#ForeignLanguageNo").parent().hide();
                 $("#EmpSortNo").parent().hide();
                 $("#EmpFullTimeNo").parent().hide();
-                $("#DeptNo").parent().hide();
+                //$("#DeptNo").parent().hide();
                 $("#TitleOfTechPostNo").parent().hide();
                 $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
@@ -127,7 +127,7 @@ var bootstrap = function ($, learun) {
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
             $('#Photo').lrUploader();
             $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml

@@ -11,10 +11,10 @@
         <div class="lr-form-item-title">部门</div>
         <div id="F_DepartmentId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
+    @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
         <div class="lr-form-item-title">系部</div>
         <div id="DeptNo"></div>
-    </div>
+    </div>*@
 </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js

@@ -35,7 +35,7 @@ var bootstrap = function ($, learun) {
                 }
             });
             $('#F_DepartmentId').lrselect();
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -22,10 +22,10 @@
                                     <div class="lr-form-item-title">联系电话</div>
                                     <input id="mobile" type="text" class="form-control" />
                                 </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>*@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="F_DepartmentId"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 280, 400);
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -364,19 +364,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "系部", name: "DeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: "系部", name: "DeptNo", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                    //            key: value,
+                    //            keyId: 'deptno',
+                    //            callback: function (_data) {
+                    //                callback(_data['deptname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml

@@ -36,7 +36,7 @@
                     <td>政治面貌</td>
                     <td>@Model.PartyFaceNo</td>
                     <td>入党时间</td>
-                    <td>@(Model.JoinPartyTime.HasValue ? Model.JoinPartyTime.Value.ToShortDateString().Replace("/", "-") : "")</td>
+                    <td>@(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "")</td>
                     <td>最高学历（学位）</td>
                     <td>@Model.HighestRecord</td>
                 </tr>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml

@@ -7,21 +7,25 @@
         <div class="lr-form-item-title">教师姓名<font face="宋体">*</font></div>
         <div id="TCName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
-        <div class="lr-form-item-title">资格种类</div>
-        <div id="TCTypeID"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
-        <div class="lr-form-item-title">任教学科<font face="宋体">*</font></div>
-        <input id="TCClass" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">证书名称<font face="宋体">*</font></div>
+        <input id="TCType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">证书编号<font face="宋体">*</font></div>
         <input id="TCCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">资格种类</div>
+        <div id="TCTypeID"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">任教学科</div>
+        <input id="TCClass" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">取得时间<font face="宋体">*</font></div>
-        <input id="TCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="TCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js

@@ -16,11 +16,12 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
-            $('#TCName').lrformselect({
-                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
-                layerUrlW: 400,
-                layerUrlH: 300,
-                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            $('#TCName').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
             });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.cshtml

@@ -7,8 +7,26 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
+                    @*<div class="lr-layout-tool-item">
                         <div id="datesearch"></div>
+                    </div>*@
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师姓名</div>
+                                    <div id="TCName"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">证书名称</div>
+                                    <input id="TCType" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">资格种类</div>
+                                    <div id="TCTypeID"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Index.js

@@ -15,6 +15,9 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
@@ -42,6 +45,14 @@ var bootstrap = function ($, learun) {
                     page.search();
                 }
             });
+            $('#TCName').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
+            $('#TCTypeID').lrDataItemSelect({ code: 'jszgzl' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -101,14 +112,18 @@ var bootstrap = function ($, learun) {
                     {
                         label: "教师姓名", name: "TCName", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                 key: value,
+                                keyId: 'empid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['empname']);
                                 }
                             });
                         }
                     },
+                    { label: "证书名称", name: "TCType", width: 150, align: "left" },
+                    { label: "证书编号", name: "TCCode", width: 150, align: "left" },
                     {
                         label: "资格种类", name: "TCTypeID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -122,17 +137,18 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "任教学科", name: "TCClass", width: 100, align: "left" },
-                    { label: "证书编号", name: "TCCode", width: 100, align: "left" },
                     { label: "取得时间", name: "TCTime", width: 100, align: "left" },
                 ],
                 mainId: 'TCID',
-                isPage: true
+                isPage: true,
+                sidx:'TCTime desc'
             });
+            page.search();
         },
         search: function (param) {
             param = param || {};
-            param.StartTime = startTime;
-            param.EndTime = endTime;
+            //param.StartTime = startTime;
+            //param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -13,12 +13,12 @@
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
   <!--demo.quanjiang.com-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -2,8 +2,8 @@
 <connectionStrings>
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 
   <!--金隅-->
   <!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
@@ -11,9 +11,9 @@
   <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
   <!--<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--demo.quanjiang.com-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--西昌-->
   <!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -57,11 +57,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("mobile", "%" + queryParam["mobile"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.mobile Like @mobile ");
                 }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND t.DeptNo = @DeptNo ");
-                }
+                //if (!queryParam["DeptNo"].IsEmpty())
+                //{
+                //    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
+                //    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                //}
                 if (!queryParam["ProvinceNo"].IsEmpty())
                 {
                     dp.Add("ProvinceNo", queryParam["ProvinceNo"].ToString(), DbType.String);
@@ -190,25 +190,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@" 
-                t.EmpId, 
-                t.EmpNo, 
-                t.EmpName, 
-                t.F_CompanyId, 
-                t.F_DepartmentId, 
-                t.DeptNo, 
-                t.GenderNo, 
-                t.Photo, 
-                t.Birthday, 
-                t.NationalityNo, 
-                t.PartyFaceNo, 
-                t.IdentityCardNo, 
-                t.CultureDegreeNo, 
-                t.DegreeNo, 
-                t.mobile, 
-                t.EMail 
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM EmpInfo t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -740,10 +722,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             {
                                 model.F_DepartmentId = entity.F_DepartmentId;
                             }
-                            if (!string.IsNullOrEmpty(entity.DeptNo))
-                            {
-                                model.DeptNo = entity.DeptNo;
-                            }
+                            //if (!string.IsNullOrEmpty(entity.DeptNo))
+                            //{
+                            //    model.DeptNo = entity.DeptNo;
+                            //}
                             db.Update(model);
                         }
                     }
@@ -762,10 +744,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 {
                                     model.F_DepartmentId = entity.F_DepartmentId;
                                 }
-                                if (!string.IsNullOrEmpty(entity.DeptNo))
-                                {
-                                    model.DeptNo = entity.DeptNo;
-                                }
+                                //if (!string.IsNullOrEmpty(entity.DeptNo))
+                                //{
+                                //    model.DeptNo = entity.DeptNo;
+                                //}
                                 db.Update(model);
                             }
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs

@@ -20,32 +20,32 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("TCID")]
         public string TCID { get; set; }
         /// <summary>
-        /// TCName
+        /// 教师empid
         /// </summary>
         [Column("TCNAME")]
         public string TCName { get; set; }
         /// <summary>
-        /// TCType
+        /// 证书名称
         /// </summary>
         [Column("TCTYPE")]
         public string TCType { get; set; }
         /// <summary>
-        /// TCTypeID
+        /// 资格种类
         /// </summary>
         [Column("TCTYPEID")]
-        public int? TCTypeID { get; set; }
+        public string TCTypeID { get; set; }
         /// <summary>
-        /// TCClass
+        /// 任教学科
         /// </summary>
         [Column("TCCLASS")]
         public string TCClass { get; set; }
         /// <summary>
-        /// TCCode
+        /// 证书编号
         /// </summary>
         [Column("TCCODE")]
         public string TCCode { get; set; }
         /// <summary>
-        /// TCTime
+        /// 取得时间
         /// </summary>
         [Column("TCTIME")]
         public DateTime? TCTime { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateService.cs

@@ -29,15 +29,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.TCID,
-                t.TCName,
-                t.TCTypeID,
-                t.TCClass,
-                t.TCCode,
-                t.TCTime
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM TeacherCertificate t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -49,6 +41,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.TCTime >= @startTime AND t.TCTime <= @endTime ) ");
                 }
+                if (!queryParam["TCName"].IsEmpty())
+                {
+                    dp.Add("TCName", queryParam["TCName"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TCName=@TCName ");
+                }
+                if (!queryParam["TCType"].IsEmpty())
+                {
+                    dp.Add("TCType", '%' + queryParam["TCType"].ToString() + '%', DbType.String);
+                    strSql.Append(" AND t.TCType like @TCType ");
+                }
+                if (!queryParam["TCTypeID"].IsEmpty())
+                {
+                    dp.Add("TCTypeID", queryParam["TCTypeID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.TCTypeID=@TCTypeID ");
+                }
                 return this.BaseRepository().FindList<TeacherCertificateEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)