Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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

@@ -7,7 +7,9 @@
         <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 id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">

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

@@ -8,6 +8,8 @@ var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
+    var startTime;
+    var endTime;
     var loginInfo = top.learun.clientdata.get(['userinfo']);
     var page = {
         init: function () {
@@ -15,7 +17,34 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
 
+            });
 
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
@@ -347,12 +376,14 @@ var bootstrap = function ($, learun) {
                 mainId: 'RID',
                 isPage: true
             });
-            page.search();
+            //page.search();
         },
         search: function (param) {
 
             param = param || {};
             param.SenderId = loginInfo.userId;
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' AND RSendFlag<>4';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.cshtml

@@ -7,7 +7,9 @@
         <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 id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.js

@@ -8,6 +8,8 @@ var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
+    var startTime;
+    var endTime;
     var loginInfo = top.learun.clientdata.get(['userinfo']);
     var page = {
         init: function () {
@@ -15,6 +17,34 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -166,12 +196,14 @@ var bootstrap = function ($, learun) {
                 mainId: 'RID',
                 isPage: true
             });
-            page.search();
+            //page.search();
         },
         search: function (param) {
 
             param = param || {};
             param.SenderId = loginInfo.userId;
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' AND RSendFlag=4';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

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

@@ -18,6 +18,10 @@
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
                             </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">接收人</div>
+                                <input id="Receiver" type="text" class="form-control" />
+                            </div>
                         </div>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexParty.cshtml

@@ -18,6 +18,10 @@
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
                             </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">接收人</div>
+                                <input id="Receiver" type="text" class="form-control" />
+                            </div>
                         </div>
                     </div>
                 </div>

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

@@ -27,6 +27,10 @@
         <div class="lr-form-item-title">接收校区<font face="宋体">*</font></div>
         <div id="CompanyId"  ></div>
     </div>
+     <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" > 
+        <div class="lr-form-item-title">文号<font face="宋体">*</font></div> 
+        <input id="DocNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> 
+    </div> 
     <div class="col-xs-12 lr-form-item"  data-table="Sys_SendFile" >
         <div class="lr-form-item-title">文件</div>
         <div id="Url"  ></div>

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

@@ -7,6 +7,9 @@
         <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 id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -14,6 +17,10 @@
                                     <div class="lr-form-item-title">主题</div>
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接收人</div>
+                                    <input id="Receiver" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -8,12 +8,42 @@ var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -159,6 +189,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList',
                 headData: [
                     { label: "主题", name: "Title", width: 300, align: "left" },
+                    { label: "文号", name: "DocNo", width: 300, align: "left" },
                     {
                         label: "接收对象", name: "SendType", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -180,7 +211,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: "下发时间", name: "SendTime", width: 150, align: "left"
                     },
-                     
+
                     {
                         label: "状态", name: "SendFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -201,10 +232,12 @@ var bootstrap = function ($, learun) {
                 mainId: 'SFileId',
                 isPage: true
             });
-            page.search();
+            //page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' AND SendFlag<>4';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.cshtml

@@ -7,6 +7,9 @@
         <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 id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -14,6 +17,10 @@
                                     <div class="lr-form-item-title">主题</div>
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接收人</div>
+                                    <input id="Receiver" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js

@@ -8,12 +8,42 @@ var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -90,6 +120,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' AND SendFlag=4';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.cshtml

@@ -7,6 +7,9 @@
         <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 id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -15,6 +18,10 @@
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
                             </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">接收人</div>
+                                <input id="Receiver" type="text" class="form-control" />
+                            </div>
                         </div>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js

@@ -8,12 +8,42 @@ var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -202,10 +232,12 @@ var bootstrap = function ($, learun) {
                 mainId: 'SFileId',
                 isPage: true
             });
-            page.search();
+            //page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' AND SendFlag<>4';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.cshtml

@@ -7,6 +7,9 @@
         <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 id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -15,6 +18,10 @@
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
                             </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">接收人</div>
+                                <input id="Receiver" type="text" class="form-control" />
+                            </div>
                         </div>
                     </div>
                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js

@@ -8,12 +8,42 @@ var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
     var processId = '';
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
@@ -92,11 +122,13 @@ var bootstrap = function ($, learun) {
                 mainId: 'SFileId',
                 isPage: true
             });
-            page.search();
+            //page.search();
         },
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND SendFlag=4';
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs

@@ -73,6 +73,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("RTitle", "%" + queryParam["RTitle"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.RTitle Like @RTitle ");
                 }
+                if (queryParam["StartTime"].ToString() != "1753-01-01" && queryParam["EndTime"].ToString() != "3000-01-01")
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.RReceiveTime >= @startTime AND t.RReceiveTime <= @endTime ) ");
+                }
                 //sql条件
                 if (!queryParam["SqlParameter"].IsEmpty())
                 {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs

@@ -110,7 +110,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                if (queryParam["StartTime"].ToString() != "1753-01-01" && queryParam["EndTime"].ToString() != "3000-01-01")
                 {
                     dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileEntity.cs

@@ -85,6 +85,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("SPROCESSID")]
         public string SProcessId { get; set; }
+        /// <summary>
+        /// SProcessId
+        /// </summary>
+        [Column("DOCNO")]
+        public string DocNo { get; set; }
         #endregion
         [NotMapped] 
         public string NumberPeople { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs

@@ -44,6 +44,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (queryParam["StartTime"].ToString() != "1753-01-01" && queryParam["EndTime"].ToString() != "3000-01-01")
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime ) ");
+                }
                 if (!queryParam["Title"].IsEmpty())
                 {
                     dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String);
@@ -54,6 +60,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("SenderId", "" + queryParam["SenderId"].ToString() + "", DbType.String);
                     strSql.Append(" AND t.SenderId = @SenderId ");
                 }
+                if (!queryParam["Receiver"].IsEmpty())
+                {
+                    dp.Add("Receiver", "%" + queryParam["Receiver"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Receiver Like @Receiver ");
+                }
                 //sql条件
                 if (!queryParam["SqlParameter"].IsEmpty())
                 {
@@ -76,7 +87,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         public DataTable Execute(string sql)
         {
-             return this.BaseRepository().FindTable(sql);
+            return this.BaseRepository().FindTable(sql);
         }
         /// <summary>
         /// 获取页面显示列表数据