【修改】教师请假管理和销假进行合并；

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

@@ -3,32 +3,36 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;" >
+    <div class="col-xs-12 lr-form-item" style="padding:0;line-height:38px;text-align:center;font-size:20px;font-weight:bold;color:#333;">
         <span>教职工销假申请表</span>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCancelLeaveManagement">
         <div class="lr-form-item-title">姓名</div>
         <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+    <div class="col-xs-6 lr-form-item" data-table="TeacherCancelLeaveManagement">
         <div class="lr-form-item-title">填表时间</div>
         <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
-        <div class="lr-form-item-title">销假类型<font face="宋体">*</font></div>
-        <div id="CancelLeaveType" isvalid="yes" checkexpession="NotNull" ></div>
+    @*<div class="col-xs-6 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+            <div class="lr-form-item-title">销假类型<font face="宋体">*</font></div>
+            <div id="CancelLeaveType" isvalid="yes" checkexpession="NotNull" ></div>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCancelLeaveManagement" style="display:none;">
+        <div class="lr-form-item-title">销假请假单<font face="宋体">*</font></div>
+        <input id="LeaveId" type="text" readonly class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCancelLeaveManagement">
         <div class="lr-form-item-title">到岗时间<font face="宋体">*</font></div>
-        <input id="WorkTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#WorkTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="WorkTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#WorkTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCancelLeaveManagement">
         <div class="lr-form-item-title">销假事由</div>
-        <textarea id="CancelLeaveReason" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="CancelLeaveReason" class="form-control" style="height:100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCancelLeaveManagement">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/Form.js")

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

@@ -6,6 +6,8 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var keyValueInLeave = request('keyValueInLeave');
+//console.log(keyValue, keyValueInLeave);
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -16,6 +18,9 @@ var validForm;
 var save;
 var bootstrap = function ($, learun) {
     "use strict";
+    if (keyValue == "null") {
+        keyValue = "";
+    }
     // 设置权限
     setAuthorize = function (data) {
                             if(!!data)
@@ -43,10 +48,13 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            if (!!keyValueInLeave) {
+                $('#LeaveId').val(keyValueInLeave);
+            }
             $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
             $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
-            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+            //$('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/FormView.cshtml

@@ -14,11 +14,15 @@
         <div class="lr-form-item-title">填表时间</div>
         <input id="CreateTime" type="text" readonly="readonly" class="form-control currentInfo lr-currentInfo-time" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="TeacherCancelLeaveManagement">
-        <div class="lr-form-item-title">销假类型<font face="宋体">*</font></div>
-        <div id="CancelLeaveType" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    @*<div class="col-xs-6 lr-form-item"  data-table="TeacherCancelLeaveManagement" >
+            <div class="lr-form-item-title">销假类型<font face="宋体">*</font></div>
+            <div id="CancelLeaveType" isvalid="yes" checkexpession="NotNull" ></div>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCancelLeaveManagement" style="display:none;">
+        <div class="lr-form-item-title">销假请假单<font face="宋体">*</font></div>
+        <input id="LeaveId" type="text" readonly class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="TeacherCancelLeaveManagement">
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCancelLeaveManagement">
         <div class="lr-form-item-title">到岗时间<font face="宋体">*</font></div>
         <input id="WorkTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/FormView.js

@@ -6,6 +6,8 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var keyValueInLeave = request('keyValueInLeave');
+//console.log(keyValue, keyValueInLeave);
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -16,26 +18,28 @@ var validForm;
 var save;
 var bootstrap = function ($, learun) {
     "use strict";
+    if (keyValue == "null") {
+        keyValue = "";
+    }
     // 设置权限
     setAuthorize = function (data) {
-                            if(!!data)
-                            {
-                                for (var field in data) {
-                                    if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
-                                        $('#' + data[field].fieldId).parent().remove();
-                                    }
-                                    else {
-                                        if (data[field].isEdit != 1) {
-                                            $('#' + data[field].fieldId).attr('disabled', 'disabled');
-                                            if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
-                                                $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
-                                                $('#' + data[field].fieldId).find('.btn-success').remove();
-                                            }
-                                        }
-                                    }
-                                }
-                                }
-                            };    
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
@@ -43,17 +47,20 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            if (!!keyValueInLeave) {
+                $('#LeaveId').val(keyValueInLeave);
+            }
             $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
             $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
-            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+            //$('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
@@ -64,23 +71,24 @@ var bootstrap = function ($, learun) {
         }
     };
     // 设置表单数据
-    setFormData = function (processId,param,callback) {
+    setFormData = function (processId, param, callback) {
         if (!!processId) {
             $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
                 for (var id in data) {
                     if (!!data[id] && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
-                        }
-                        else {
-                        if(id == 'TeacherCancelLeaveManagement' && data[id] ){
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'TeacherCancelLeaveManagement' && data[id]) {
                             keyValue = data[id].Id;
                         }
-                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
-                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                     }
-                });
-            }
-                callback && callback();        }
+                }
+            });
+        }
+        callback && callback();
+    }
     // 验证数据是否填写完整
     validForm = function () {
         if (!$('body').lrValidform()) {
@@ -91,8 +99,8 @@ var bootstrap = function ($, learun) {
     // 保存数据
     save = function (processId, callBack, i) {
         var formData = $('body').lrGetFormData();
-        if(!!processId){
-            formData.ProcessId =processId;
+        if (!!processId) {
+            formData.ProcessId = processId;
         }
         var postData = {
             strEntity: JSON.stringify(formData)

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

@@ -13,13 +13,17 @@
                         <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="CancelLeaveType"></div>
+                                    <div class="lr-form-item-title">请假种类</div>
+                                    <div id="LeaveType"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
                                     <div id="CreateUserId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">联系电话</div>
+                                    <input id="Telephone" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -29,8 +33,7 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;销假</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">

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

@@ -17,47 +17,26 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+            $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
             $('#CreateUserId').lrUserSelect(0);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/Form',
-                    width: 1000,
-                    height: 800,
-                    callBack: function (id) {
-                        var res = false;
-                        // 验证数据
-                        res = top[id].validForm();
-                        // 保存数据
-                        if (res) {
-                            res = top[id].save('', function () {
-                                page.search();
-                            });
-                        }
-                        return res;
-                    }
-                });
-            });
             // 编辑
             $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
+                var keyValueInLeave = $('#gridtable').jfGridValue('IdInLeave');
+                if (learun.checkrow(keyValueInLeave)) {
+                    var keyValue = $('#gridtable').jfGridValue('Id');
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus != "0") {
-                        learun.alert.warning("当前项已提交！");
+                    if (keyValue != null && CheckStatus != "0") {
+                        learun.alert.warning("当前项已提交销假！");
                         return false;
                     }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/Form?keyValue=' + keyValue + '&keyValueInLeave=' + keyValueInLeave,
                         width: 1000,
                         height: 800,
                         callBack: function (id) {
@@ -81,13 +60,13 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
                     if (CheckStatus != "0") {
-                        learun.alert.warning("当前项已提交！");
+                        learun.alert.warning("当前项已提交销假！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                page.search();
                             });
                         }
                     });
@@ -113,7 +92,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
                     if (CheckStatus != "0") {
-                        learun.alert.warning("当前项已提交！");
+                        learun.alert.warning("当前项已提交销假！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -129,49 +108,83 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/GetPageList',
                 headData: [
+                    //{
+                    //    label: "请假姓名", name: "CreateUserIdInLeave", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('user', {
+                    //            key: value,
+                    //            callback: function (_data) {
+                    //                callback(_data.name);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: "请假填表时间", name: "CreateTimeInLeave", width: 130, align: "left" },
+                    { label: "联系电话", name: "Telephone", width: 100, align: "left" },
                     {
-                        label: "姓名", name: "CreateUserId", width: 100, align: "left",
+                        label: "请假种类", name: "LeaveType", width: 60, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
+                                code: 'LeaveType',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "填表时间", name: "CreateTime", width: 130, align: "left" },
+                    { label: "请假开始时间", name: "StartTime", width: 120, align: "left" },
+                    { label: "请假结束时间", name: "EndTime", width: 120, align: "left" },
                     {
-                        label: "销假类型", name: "CancelLeaveType", width: 100, align: "left",
+                        label: "请假天数", name: "LeaveDay", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'LeaveType',
+                                code: 'LeaveDay',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "到岗时间", name: "WorkTime", width: 120, align: "left" },
-                    { label: "销假事由", name: "CancelLeaveReason", width: 200, align: "left" },
+                    { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
                     {
-                        label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                        label: "请假审核状态", name: "CheckStatusInLeave", width: 80, align: "left", formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";
                         }
                     },
+                    {
+                        label: "姓名", name: "CreateUserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "销假填表时间", name: "CreateTime", width: 130, align: "left" },
+                    { label: "到岗时间", name: "WorkTime", width: 120, align: "left" },
+                    { label: "销假事由", name: "CancelLeaveReason", width: 150, align: "left" },
+                    {
+                        label: "销假审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : cellvalue == "0" ? "<span class=\"label label-default\">草稿</span>" : "";
+                        }
+                    },
                 ],
                 mainId: 'Id',
                 isPage: true,
-                sidx: 'CreateTime desc'
+                sidx: 'CreateTimeInLeave desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.CreateUserIdInLeave = learun.clientdata.get(['userinfo']).userId; //登录用户的已审核通过的请假单
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementEntity.cs

@@ -74,6 +74,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+        /// <summary>
+        /// 销假请假单Id
+        /// </summary>
+        [Column("LEAVEID")]
+        public string LeaveId { get; set; }
         #endregion
 
         #region 扩展操作
@@ -94,6 +99,56 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         }
         #endregion
         #region 扩展字段
+        /// <summary>
+        /// Id
+        /// </summary>
+        [NotMapped]
+        public string IdInLeave { get; set; }
+        /// <summary>
+        /// 请假类型
+        /// </summary>
+        [NotMapped]
+        public string LeaveType { get; set; }
+        /// <summary>
+        /// 请假开始时间
+        /// </summary>
+        [NotMapped]
+        public DateTime? StartTime { get; set; }
+        /// <summary>
+        /// 请假结束时间
+        /// </summary>
+        [NotMapped]
+        public DateTime? EndTime { get; set; }
+        /// <summary>
+        /// 请假天数
+        /// </summary>
+        [NotMapped]
+        public string LeaveDay { get; set; }
+        /// <summary>
+        /// 请假事由
+        /// </summary>
+        [NotMapped]
+        public string LeaveReason { get; set; }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [NotMapped]
+        public string Telephone { get; set; }
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        [NotMapped]
+        public string CreateUserIdInLeave { get; set; }
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        [NotMapped]
+        public DateTime? CreateTimeInLeave { get; set; }
+        /// <summary>
+        /// 审核状态（0草稿，1审核中，2审核通过，3,审核不通过）
+        /// </summary>
+        [NotMapped]
+        public string CheckStatusInLeave { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementService.cs

@@ -30,21 +30,37 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.* ");
-                strSql.Append("  FROM TeacherCancelLeaveManagement t ");
-                strSql.Append("  WHERE 1=1 ");
+                strSql.Append("SELECT t.Id as IdInLeave,t.LeaveType,t.StartTime,t.EndTime,t.LeaveDay,t.LeaveReason,t.Telephone,t.CreateUserId as CreateUserIdInLeave,t.CreateTime as CreateTimeInLeave,t.CheckStatus as CheckStatusInLeave,t2.* ");
+                strSql.Append("  FROM TeacherLeaveManagement t ");
+                strSql.Append("  left join TeacherCancelLeaveManagement t2 on t.Id=t2.LeaveId ");
+                strSql.Append("  WHERE 1=1 and t.CheckStatus='2' ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["CancelLeaveType"].IsEmpty())
                 {
                     dp.Add("CancelLeaveType",queryParam["CancelLeaveType"].ToString(), DbType.String);
-                    strSql.Append(" AND t.CancelLeaveType = @CancelLeaveType ");
+                    strSql.Append(" AND t2.CancelLeaveType = @CancelLeaveType ");
                 }
                 if (!queryParam["CreateUserId"].IsEmpty())
                 {
                     dp.Add("CreateUserId",queryParam["CreateUserId"].ToString(), DbType.String);
-                    strSql.Append(" AND t.CreateUserId = @CreateUserId ");
+                    strSql.Append(" AND t2.CreateUserId = @CreateUserId ");
+                }
+                if (!queryParam["LeaveType"].IsEmpty())
+                {
+                    dp.Add("LeaveType", queryParam["LeaveType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LeaveType = @LeaveType ");
+                }
+                if (!queryParam["Telephone"].IsEmpty())
+                {
+                    dp.Add("Telephone", "%" + queryParam["Telephone"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Telephone Like @Telephone ");
+                }
+                if (!queryParam["CreateUserIdInLeave"].IsEmpty())
+                {
+                    dp.Add("CreateUserIdInLeave", queryParam["CreateUserIdInLeave"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CreateUserId = @CreateUserIdInLeave ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<TeacherCancelLeaveManagementEntity>(strSql.ToString(),dp, pagination);
             }