通知公告优化

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml

@@ -8,10 +8,29 @@
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入标题" />
+                        <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlt">查询</span></a>
+                        <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>
+                                    <input id="F_FullHead" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">发布人员</div>
+                                    <div id="F_CreateUserId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">公告类别</div>
+                                    <div id="F_CategoryId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">信息来源</div>
+                                    <div id="F_SourceName"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js

@@ -15,11 +15,38 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
-            // 查询
-            $('#btn_Search').on('click', function () {
-                var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
+            $('#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,
+                // 默认
+                selectfn: function (begin, end) {
+                    logbegin = begin;
+                    logend = end;
+
+                    page.search();
+                }
             });
+            $('#multiple_condition_query').lrMultipleQuery(function (keyword) {
+                page.search(keyword);
+            }, 220, 400);
+            $('#F_CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#F_SourceName').lrDepartmentSelect();
+            $('#F_CategoryId').lrDataItemSelect({ code: 'NoticeCategory' }); 
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -225,7 +252,8 @@ var bootstrap = function ($, learun) {
             page.search();
         },
         search: function (param) {
-            $('#gridtable').jfGridSet('reload', param);
+            $('#gridtable').jfGridSet('reload', { keyword: JSON.stringify(param) });
+            //$('#gridtable').jfGridSet('reload', param);
         }
     };
     // 保存数据后回调刷新

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs

@@ -31,15 +31,39 @@ namespace Learun.Application.OA
                 var user = LoginUserInfo.Get();
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT * FROM LR_OA_News t WHERE t.F_TypeId = 2 and F_Status<>'-1' and F_DeleteMark=0");
-                if (!string.IsNullOrEmpty(keyword))
+                var queryParam = keyword.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_FullHead"].IsEmpty())
                 {
-                    strSql.Append(" AND F_FullHead like @keyword");
+                    dp.Add("F_FullHead", "%" + queryParam["F_FullHead"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.F_FullHead Like @F_FullHead ");
+                }
+                if (!queryParam["F_CreateUserId"].IsEmpty())
+                {
+                    dp.Add("F_CreateUserId", queryParam["F_CreateUserId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.F_CreateUserId = @F_CreateUserId ");
+                }
+                if (!queryParam["F_CategoryId"].IsEmpty())
+                {
+                    dp.Add("F_CategoryId", queryParam["F_CategoryId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.F_CategoryId = @F_CategoryId ");
+                }
+                if (!queryParam["F_SourceName"].IsEmpty())
+                {
+                    dp.Add("F_SourceName", queryParam["F_SourceName"].ToString(), DbType.String);
+                    strSql.Append(" AND t.F_SourceName Like @F_SourceName ");
                 }
+
+                //if (!string.IsNullOrEmpty(keyword))
+                //{
+                //    strSql.Append(" AND F_FullHead like @keyword");
+                //}
                 if (user.Description != "超级管理员")
                 {
                     strSql.Append(" AND F_CreateUserName ='" + user.realName + "'");
                 }
-                return this.BaseRepository().FindList<NewsEntity>(strSql.ToString(), new { keyword = "%" + keyword + "%" }, pagination);
+                return this.BaseRepository().FindList<NewsEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {