【增加】办事大厅增加流程统计：党委会申请统计；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -290,6 +290,15 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 党委会党委专题会申请统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult MonitorIndexOfdwhsq()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -467,6 +476,27 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             };
             return Success(jsonData);
         }
+        /// <summary>
+        /// 党委会党委专题会申请流程表单统计
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询条件</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListOfdwhsq(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var list = nWFProcessIBLL.GetPageListOfdwhsq(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = list,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records,
+            };
+            return Success(jsonData);
+        }
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.cshtml

@@ -0,0 +1,72 @@
+@{
+    ViewBag.Title = "流程监控";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div id="lr_layout" class="lr-layout lr-layout-left-center">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
+            <div class="lr-layout-body">
+                <ul class="lr-left-list" id="lr_left_list">
+                    <li class="active lrlg" data-value="1">未完成</li>
+                    <li data-value="2" class="lrlg">已完成</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <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">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <input id="F_CreateUserName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议主题</div>
+                                    <input id="LC_hyzt" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议内容</div>
+                                    <input id="LC_hynr" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议时间</div>
+                                    <input id="LC_hysj" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </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="lrlg">查询</span></a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_eye" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlg">查看</span></a>
+                    </div>
+                </div>
+            </div>
+
+            <div class="lr-layout-body" id="gridtable">
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js")
+
+
+
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfdwhsq.js

@@ -0,0 +1,143 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：力软-前端开发组
+ * 日 期：2018.12.19
+ * 描 述：流程监控
+ */
+var bootstrap = function ($, learun) {
+    "use strict";
+    var categoryId = '1';
+    var logbegin = '';
+    var logend = '';
+
+    var page = {
+        init: function () {
+            $('#lr_verify').hide();
+            page.initleft();
+            page.initGrid();
+            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,
+                selectfn: function (begin, end) {
+                    logbegin = begin;
+                    logend = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 280, 400);
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_eye').on('click', function () {
+                page.eye();
+            });
+        },
+        initleft: function () {
+            $('#lr_left_list li').on('click', function () {
+                var $this = $(this);
+                var $parent = $this.parent();
+                $parent.find('.active').removeClass('active');
+                $this.addClass('active');
+                categoryId = $this.attr('data-value');
+                page.search();
+            });
+        },
+        initGrid: function () {
+            $('#gridtable').lrAuthorizeJfGridLei({
+                url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPageListOfdwhsq',
+                headData: [
+                    { label: "会议主题", name: "LC_hyzt", width: 150, align: "center" },
+                    { label: "会议时间", name: "LC_hysj", width: 100, align: "center" },
+                    { label: "会议内容", name: "LC_hynr", width: 200, align: "center" },
+                    { label: "参会人员", name: "LC_chry", width: 100, align: "center" },
+                    { label: "申请人", name: "F_CreateUserName", width: 100, align: "center" },
+                    {
+                        label: "流程审批状态", name: "F_EnabledMark", width: 70, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (row.F_IsFinished == 0) {
+                                if (cellvalue == 1) {
+                                    if (row.F_IsUrge == "1" && categoryId == '2') {
+                                        return "<span class=\"label label-danger\">催办加急</span>";
+                                    }
+                                    return "<span class=\"label label-success\">运行中</span>";
+                                } else if (cellvalue == 2) {
+                                    return "<span class=\"label label-primary\">草稿</span>";
+                                } else if (cellvalue == 3) {
+                                    return "<span class=\"label label-danger\">作废</span>";
+                                } else {
+                                    return "<span class=\"label label-danger\">终止</span>";
+                                }
+                            }
+                            else {
+                                return "<span class=\"label label-warning\">结束</span>";
+                            }
+
+                        }
+                    },
+                ],
+                mainId: 'F_Id',
+                isPage: true,
+                sidx: 'F_CreateDate DESC',
+                dblclick: function () {
+                    page.eye();
+                }
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = logbegin;
+            param.EndTime = logend;
+            param.categoryId = categoryId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        eye: function () {
+            var processId = $('#gridtable').jfGridValue('F_Id') || '';
+            var title = $('#gridtable').jfGridValue('F_Title');
+            var schemeName = $('#gridtable').jfGridValue('F_SchemeName');
+
+            if (schemeName != title && title) {
+                title = schemeName + "(" + title + ")";
+            }
+            else {
+                title = schemeName;
+            }
+
+            if (learun.checkrow(processId)) {
+                learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
+            }
+        }
+    };
+
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1375,6 +1375,7 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\AddTaskForm.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\htPrint.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFiling.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfdwhsq.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfmeeting.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfyyspd.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexZiChan.js" />
@@ -7725,6 +7726,7 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfyyspd.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\UseCar.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfmeeting.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexOfdwhsq.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/LC_dwhsqMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LR_LGManager;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-07 14:26
+    /// 描 述：流程党委会党委专题会申请
+    /// </summary>
+    public class LC_dwhsqMap : EntityTypeConfiguration<LC_dwhsqEntity>
+    {
+        public LC_dwhsqMap()
+        {
+            #region  表、主键
+            //表
+            this.ToTable("LC_DWHSQ");
+            //主键
+            this.HasKey(t => t.LC_ID);
+            #endregion
+
+            #region  配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -148,6 +148,7 @@
     <Compile Include="LR_IM\IMSysUserMap.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialApplyMap.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItemMap.cs" />
+    <Compile Include="LR_LGManager\LC_dwhsqMap.cs" />
     <Compile Include="LR_LGManager\LC_meetingMap.cs" />
     <Compile Include="LR_LGManager\LC_yyspdMap.cs" />
     <Compile Include="LR_LGManager\LC_hetongMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/LC_dwhsq/LC_dwhsqEntity.cs

@@ -0,0 +1,159 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.LR_LGManager
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 创 建：超级管理员
+    /// 日 期：2020-05-07 14:26
+    /// 描 述：流程党委会党委专题会申请
+    /// </summary>
+    public class LC_dwhsqEntity
+    {
+        #region  实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_ID")]
+        public string LC_ID { get; set; }
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        /// <returns></returns>
+        [Column("F_CREATEUSERNAME")]
+        public string F_CreateUserName { get; set; }
+        /// <summary>
+        /// 会议主题
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_HYZT")]
+        public string LC_hyzt { get; set; }
+        /// <summary>
+        /// 会议内容
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_HYNR")]
+        public string LC_hynr { get; set; }
+        /// <summary>
+        /// 参会人员
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_CHRY")]
+        public string LC_chry { get; set; }
+        /// <summary>
+        /// LC_fj
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_FJ")]
+        public string LC_fj { get; set; }
+        /// <summary>
+        /// 会议时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("LC_HYSJ")]
+        public string LC_hysj { get; set; }
+        
+        #endregion
+
+        #region  扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.LC_ID = Guid.NewGuid().ToString();
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.F_CreateUserName = userInfo.realName;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.LC_ID = keyValue;
+            UserInfo userInfo = LoginUserInfo.Get();
+        }
+        #endregion
+        #region 扩展数据
+        /// <summary> 
+        /// 主键 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_Id { get; set; }
+        /// <summary> 
+        /// 流程模板主键 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_SchemeId { get; set; }
+        /// <summary> 
+        /// 流程模板编码 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_SchemeCode { get; set; }
+        /// <summary> 
+        /// 流程模板名称 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_SchemeName { get; set; }
+        /// <summary> 
+        /// 流程进程自定义标题 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_Title { get; set; }
+        /// <summary> 
+        /// 流程进程等级 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public int? F_Level { get; set; }
+        /// <summary> 
+        /// 流程进程有效标志 1正常2草稿3作废4终止
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public int? F_EnabledMark { get; set; }
+        /// <summary> 
+        /// 流程进程是否结束1是0不是 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public int? F_IsFinished { get; set; }
+        /// <summary> 
+        /// 是否被催办 1 被催办了
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public int? F_IsUrge { get; set; }
+        /// <summary> 
+        /// 创建时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public DateTime? F_CreateDate { get; set; }
+        /// <summary> 
+        /// 创建人主键 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_CreateUserId { get; set; }
+        /// <summary> 
+        /// 创建人名称 
+        /// </summary> 
+        /// <returns></returns> 
+        [NotMapped]
+        public string F_CreateUserNameInProcess { get; set; }
+
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -363,6 +363,7 @@
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemIBLL.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemService.cs" />
     <Compile Include="LR_LGManager\LC_meeting\LC_meetingEntity.cs" />
+    <Compile Include="LR_LGManager\LC_dwhsq\LC_dwhsqEntity.cs" />
     <Compile Include="LR_LGManager\LC_yyspd\LC_yyspdEntity.cs" />
     <Compile Include="LR_LGManager\LC_hetong\LC_hetongEntity.cs" />
     <Compile Include="LR_LGManager\StampApply\StampApplyBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs

@@ -257,6 +257,31 @@ namespace Learun.Application.WorkFlow
             }
         }
 
+        /// <summary>
+        /// 党委会党委专题会申请流程表单统计
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询条件</param>
+        /// <returns></returns>
+        public IEnumerable<LC_dwhsqEntity> GetPageListOfdwhsq(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return nWFProcessSerive.GetPageListOfdwhsq(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessIBLL.cs

@@ -136,6 +136,14 @@ namespace Learun.Application.WorkFlow
         IEnumerable<LC_meetingEntity> GetPageListOfmeeting(Pagination pagination, string queryJson);
 
 
+        /// <summary>
+        /// 党委会党委专题会申请流程表单统计
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询条件</param>
+        /// <returns></returns>
+        IEnumerable<LC_dwhsqEntity> GetPageListOfdwhsq(Pagination pagination, string queryJson);
+
         #endregion
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs

@@ -1022,6 +1022,96 @@ namespace Learun.Application.WorkFlow
             }
         }
 
+        /// <summary>
+        /// 党委会党委专题会申请流程表单统计
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询条件</param>
+        /// <returns></returns>
+        public IEnumerable<LC_dwhsqEntity> GetPageListOfdwhsq(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var misdbname = BaseRepository("CollegeMIS").getDbConnection().Database;
+                var basedbname = BaseRepository().getDbConnection().Database;
+
+                var strSql = new StringBuilder();
+                strSql.Append("select y.*,t.F_Id,t.F_SchemeId,t.F_SchemeCode,t.F_SchemeName,t.F_Title,t.F_Level,t.F_EnabledMark,t.F_IsFinished,t.F_CreateDate,t.F_CreateUserId,t.F_CreateUserName as F_CreateUserNameInProcess from LR_NWF_Process t left join LR_NWF_SchemeInfo s on t.F_SchemeCode=s.F_Code ");
+                strSql.Append($" left join {misdbname}.dbo.LC_dwhsq y on y.LC_ID=t.F_Id ");
+                strSql.Append(" where 1=1 and t.F_EnabledMark !=2 and t.F_EnabledMark != 3 and t.F_IsChild = 0 ");
+                strSql.Append(" and s.F_Code='LC_dwhsq' ");
+
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+
+                // 分类
+                if (!queryParam["categoryId"].IsEmpty()) // 1:未完成 2:已完成
+                {
+                    if (queryParam["categoryId"].ToString() == "1")
+                    {
+                        strSql.Append(" and t.F_IsFinished = 0 ");
+                    }
+                    else
+                    {
+                        strSql.Append(" and t.F_IsFinished = 1 ");
+                    }
+                }
+                //申请人
+                if (!queryParam["F_CreateUserName"].IsEmpty())
+                {
+                    dp.Add("F_CreateUserName", "%" + queryParam["F_CreateUserName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND y.F_CreateUserName like @F_CreateUserName ");
+                }
+                //会议主题
+                if (!queryParam["LC_hyzt"].IsEmpty())
+                {
+                    dp.Add("LC_hyzt", "%" + queryParam["LC_hyzt"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND y.LC_hyzt like @LC_hyzt ");
+                }
+                //会议内容
+                if (!queryParam["LC_hynr"].IsEmpty())
+                {
+                    dp.Add("LC_hynr", "%" + queryParam["LC_hynr"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND y.LC_hynr like @LC_hynr ");
+                }
+                //会议时间
+                if (!queryParam["LC_hysj"].IsEmpty())
+                {
+                    dp.Add("LC_hysj", "%" + queryParam["LC_hysj"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND y.LC_hysj like @LC_hysj ");
+                }
+                //关键字：申请人、会议主题、会议内容、会议时间
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND (y.F_CreateUserName like @keyword or y.LC_hyzt like @keyword or y.LC_hysj like @keyword or y.LC_hynr like @keyword ) ");
+                }
+                // 会议时间
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("StartTime", queryParam["StartTime"].ToString(), DbType.Date);
+                    dp.Add("EndTime", queryParam["EndTime"].ToString(), DbType.Date);
+                    strSql.Append(" and (y.LC_hysj >= @StartTime and y.LC_hysj <= @EndTime)");
+                }
+
+                var result = this.BaseRepository().FindList<LC_dwhsqEntity>(strSql.ToString(), dp);
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
 
         #endregion