【增加】会议场地管理；会议工作管理；会议签到管理；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -61,6 +61,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList()
+        {
+            var data = conferenceRoomIBLL.GetList();
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +82,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity( keyValue );
-            var jsonData = new {
+            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity(keyValue);
+            var jsonData = new
+            {
                 ConferenceRoom = ConferenceRoomData,
             };
             return Success(jsonData);
@@ -102,9 +116,21 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             ConferenceRoomEntity entity = strEntity.ToObject<ConferenceRoomEntity>();
-            conferenceRoomIBLL.SaveEntity(keyValue,entity);
+            conferenceRoomIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoEnable(string keyValue, string status)
+        {
+            conferenceRoomIBLL.DoEnable(keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System;
 
 namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 {
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +36,16 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单页-查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
         }
         #endregion
 
@@ -82,8 +92,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity( keyValue );
-            var jsonData = new {
+            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity(keyValue);
+            var jsonData = new
+            {
                 MeetingManagement = MeetingManagementData,
             };
             return Success(jsonData);
@@ -114,10 +125,28 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            UserInfo userInfo = LoginUserInfo.Get();            MeetingManagementEntity entity = strEntity.ToObject<MeetingManagementEntity>();
-            meetingManagementIBLL.SaveEntity(userInfo,keyValue,entity);
+            UserInfo userInfo = LoginUserInfo.Get();
+            MeetingManagementEntity entity = strEntity.ToObject<MeetingManagementEntity>();
+            entity.CreateUser = userInfo.userId;
+            entity.CreateTime = DateTime.Now;
+            entity.CheckStatus = "0";
+            meetingManagementIBLL.SaveEntity(userInfo, keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, string status)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            meetingManagementIBLL.DoCheck(userInfo, keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -82,8 +82,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity( keyValue );
-            var jsonData = new {
+            var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity(keyValue);
+            var jsonData = new
+            {
                 MeetingSignInRecord = MeetingSignInRecordData,
             };
             return Success(jsonData);
@@ -114,10 +115,23 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
-            UserInfo userInfo = LoginUserInfo.Get();            MeetingSignInRecordEntity entity = strEntity.ToObject<MeetingSignInRecordEntity>();
-            meetingSignInRecordIBLL.SaveEntity(userInfo,keyValue,entity);
+            UserInfo userInfo = LoginUserInfo.Get(); MeetingSignInRecordEntity entity = strEntity.ToObject<MeetingSignInRecordEntity>();
+            meetingSignInRecordIBLL.SaveEntity(userInfo, keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 签到实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSignIn(string keyValue, bool isSignIn)
+        {
+            meetingSignInRecordIBLL.DoSignIn(keyValue, isSignIn);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

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

@@ -3,25 +3,29 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
-        <div class="lr-form-item-title">名称</div>
-        <input id="Name" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">场地名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
-        <div class="lr-form-item-title">地点</div>
-        <input id="Address" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">地点<font face="宋体">*</font></div>
+        <input id="Address" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">状态</div>
-        <input id="Status" type="text" class="form-control"  />
+        <div id="Status"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">可容纳人数</div>
-        <input id="Scale" type="text" class="form-control"  />
+        <input id="Scale" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <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 class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">添加时间<font face="宋体">*</font></div>
+        <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#CreateTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js")

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

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $("#Status").lrDataItemSelect({ code: 'EnableStatus' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -11,12 +11,12 @@
                         <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 class="lr-form-item-title">场地名称</div>
                                     <input id="Name" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">状态</div>
-                                    <input id="Status" type="text" class="form-control" />
+                                    <div id="Status"></div>
                                 </div>
                             </div>
                         </div>
@@ -31,6 +31,10 @@
                         <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">
+                        <a id="lr_enable" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
+                        <a id="lr_disable" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;禁用</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -16,18 +16,19 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $("#Status").lrDataItemSelect({ code: 'EnableStatus' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
+                learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -41,8 +42,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -53,9 +54,45 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == "1") {
+                        learun.alert.warning("当前项已启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 禁用
+            $('#lr_disable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项未启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认禁用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "0" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -68,20 +105,25 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetPageList',
                 headData: [
-                    { label: "名称", name: "Name", width: 100, align: "left"},
-                    { label: "地点", name: "Address", width: 100, align: "left"},
-                    { label: "状态", name: "Status", width: 100, align: "left"},
-                    { label: "可容纳人数", name: "Scale", width: 100, align: "left"},
-                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                    { label: "场地名称", name: "Name", width: 200, align: "left" },
+                    { label: "地点", name: "Address", width: 200, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "启用" : "禁用";
+                        }
+                    },
+                    { label: "可容纳人数", name: "Scale", width: 100, align: "left" },
+                    { label: "添加时间", name: "CreateTime", width: 100, align: "left" },
                 ],
-                mainId:'ID',
-                isPage: true
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

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

@@ -3,37 +3,53 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">会议主题</div>
-        <input id="MeetingTitle" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议主题<font face="宋体">*</font></div>
+        <input id="MeetingTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">会议地点</div>
-        <div id="MeetingPlace"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校内参入人员<font face="宋体">*</font></div>
+        <div id="InternalParticipants"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">开始时间</div>
-        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#BeginTime').trigger('change'); } })"   />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校外参入人员</div>
+        <textarea class="form-control" id="ExternalParticipants" placeholder="多个参与人员用英文半角逗号分隔"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">结束时间</div>
-        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#EndTime').trigger('change'); } })"   />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议场地<font face="宋体">*</font></div>
+        <div id="MeetingPlace" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">会议记录者</div>
-        <div id="RecordPerson"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">会议内容</div>
-        <div id="Content" style="height:200px;"></div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议开始时间<font face="宋体">*</font></div>
+        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#BeginTime').trigger('change'); } })" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">附件上传</div>
-        <div id="Files"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议结束时间<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EndTime').trigger('change'); } })" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">申请人</div>
-        <div id="CreateUser"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议记录者</div>
+        <div id="RecordPerson"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议内容<font face="宋体">*</font></div>
+        <textarea class="form-control" id="Content" style="height:150px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+            <div class="lr-form-item-title">会议内容<font face="宋体">*</font></div>
+            <div id="Content" style="height:150px;" isvalid="yes" checkexpession="NotNull"></div>
+        </div>*@
+    @*<div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+            <div class="lr-form-item-title">附件上传</div>
+            <div id="Files"></div>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系人<font face="宋体">*</font></div>
+        <input id="Linkman" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
+        <input id="LinkPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/Form.js")

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

@@ -15,21 +15,16 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#MeetingPlace').lrDataItemSelect({ code: '' });
-            $('#RecordPerson').lrformselect({
-                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
-                layerUrlW: 400,
-                layerUrlH: 300,
-                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
-            });
-            var ContentUE =  UE.getEditor('Content');
-            $('#Content')[0].ue =  ContentUE;            $('#Files').lrUploader();
-            $('#CreateUser').lrformselect({
-                layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm',
-                layerUrlW: 400,
-                layerUrlH: 300,
-                dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds'
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
             });
+            $('#RecordPerson').lrUserSelect(0);
+            //var ContentUE =  UE.getEditor('Content');
+            //$('#Content')[0].ue =  ContentUE;            $('#Files').lrUploader();
+            $('#InternalParticipants').lrUserSelect(1);
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -0,0 +1,52 @@
+@{
+    ViewBag.Title = "会议管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script src="~/Content/jquery/qrcode.min.js"></script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议主题<font face="宋体">*</font></div>
+        <input id="MeetingTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校内参入人员<font face="宋体">*</font></div>
+        <div id="InternalParticipants"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校外参入人员</div>
+        <textarea class="form-control" readonly="readonly" id="ExternalParticipants" placeholder="多个参与人员用英文半角逗号分隔"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议场地<font face="宋体">*</font></div>
+        <div id="MeetingPlace" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议开始时间<font face="宋体">*</font></div>
+        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议结束时间<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议记录者</div>
+        <div id="RecordPerson" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议内容<font face="宋体">*</font></div>
+        <textarea class="form-control" id="Content" style="height:150px;" readonly="readonly" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系人<font face="宋体">*</font></div>
+        <input id="Linkman" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
+        <input id="LinkPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">扫码签到</div>
+        <div id="qrCode"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js")

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

@@ -0,0 +1,68 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#RecordPerson').lrUserSelect(0);
+            $('#InternalParticipants').lrUserSelect(1);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                        //扫码签到
+                        makeCode(data[id].Id);           
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
+//扫码签到
+var qrcode = new QRCode(document.getElementById("qrCode"), {
+        width: 150,
+        height: 150
+    });
+function makeCode(urls) {
+        qrcode.makeCode(urls);
+    }

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

@@ -1,8 +1,10 @@
 @{
+    /**/
+
     ViewBag.Title = "会议管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -15,7 +17,7 @@
                                     <input id="MeetingTitle" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">会议地点</div>
+                                    <div class="lr-form-item-title">会议场地</div>
                                     <div id="MeetingPlace"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
@@ -31,10 +33,17 @@
                         <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_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_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>
+                        <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
+                        <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
+                        <a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
+                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>
                     </div>
                 </div>
             </div>

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

@@ -16,7 +16,12 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#MeetingPlace').lrDataItemSelect({ code: '' });
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
             $('#CreateUser').lrUserSelect(0);
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -25,11 +30,11 @@ var bootstrap = function ($, learun) {
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
-                    id: 'form',
+                    id: 'addform',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form',
-                    width: 600,
-                    height: 400,
+                    width: 1000,
+                    height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -39,12 +44,17 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    }
                     learun.layerForm({
-                        id: 'form',
+                        id: 'editform',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 1000,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -55,18 +65,72 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已审核！");
+                        return false;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
                     });
                 }
             });
-            // 打印
-            $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '查看会议工作',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn:null
+                    });
+                }
+            });
+            // 考勤
+            // 纪要
+            // 通知
+            // 审核通过
+            $('#lr_checkyes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '1') {
+                        learun.alert.warning("该项已审核通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 审核不通过
+            $('#lr_checkno').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '2') {
+                        learun.alert.warning("该项已审核不通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
             });
         },
         // 初始化列表
@@ -74,48 +138,62 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList',
                 headData: [
-                    { label: "会议主题", name: "MeetingTitle", width: 100, align: "left"},
-                    { label: "会议地点", name: "MeetingPlace", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: '',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                    { label: "开始时间", name: "BeginTime", width: 100, align: "left"},
-                    { label: "结束时间", name: "EndTime", width: 100, align: "left"},
-                    { label: "申请人", name: "CreateUser", 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: "RecordPerson", 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: "Content", width: 100, align: "left"},
-                    { label: "附件上传", name: "Files", width: 100, align: "left"},
+                    { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" },
+                    { label: "开始时间", name: "BeginTime", width: 120, align: "left" },
+                    { label: "结束时间", name: "EndTime", width: 120, align: "left" },
+                    {
+                        label: "会议记录者", name: "RecordPerson", 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: "Linkman", width: 100, align: "left" },
+                    { label: "联系电话", name: "LinkPhone", width: 100, align: "left" },
+                    {
+                        label: "申请人", name: "CreateUser", 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: 120, align: "left" },
+                    {
+                        label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "已通过" : cellvalue == "2" ? "未通过" : "未审核";
+                        }
+                    },
+                    {
+                        label: "审核人", name: "CheckUser", 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: "CheckTime", width: 120, align: "left" },
                 ],
-                mainId:'Id',
-                isPage: true
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

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

@@ -1,22 +1,36 @@
 @{
+    /**/
+
     ViewBag.Title = "会议签到记录";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <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="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="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">用户</div>
+                                    <input id="ParticipantName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </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" 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_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_signIn" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;已签到</a>
+                        <a id="lr_notSignIn" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;未签到</a>
                     </div>
                 </div>
             </div>

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

@@ -13,6 +13,9 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -52,7 +55,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DeleteForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -63,52 +66,67 @@ var bootstrap = function ($, learun) {
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
             });
+            //已签到
+            $('#lr_signIn').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var IsSignIn = $('#gridtable').jfGridValue('IsSignIn');
+                    if (IsSignIn == true) {
+                        learun.alert.warning("该项已签到！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认签到！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DoSignIn', { keyValue: keyValue, isSignIn: true }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //未签到
+            $('#lr_notSignIn').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var IsSignIn = $('#gridtable').jfGridValue('IsSignIn');
+                    if (IsSignIn != true) {
+                        learun.alert.warning("该项未签到！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认未签到！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DoSignIn', { keyValue: keyValue, isSignIn: false }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetPageList',
                 headData: [
-                    { label: "会议", name: "MeetID", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: '',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                    { label: "参与人id", name: "ParticipantID", 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: "ParticipantName", width: 100, align: "left"},
-                    { label: "是否签到", name: "IsSignIn", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                    { label: "参加时间", name: "SignInTime", width: 100, align: "left"},
+                    { label: "会议", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "用户", name: "ParticipantName", width: 100, align: "left" },
+                    {
+                        label: "状态", name: "IsSignIn", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "已签到" : "未签到";
+                        }
+                    },
+                    { label: "签到时间", name: "SignInTime", width: 100, align: "left" },
                 ],
-                mainId:'ID',
-                isPage: true
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'MeetID,ParticipantID'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

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

@@ -1344,6 +1344,7 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
@@ -6900,6 +6901,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuLeaveManagement\CheckIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ConferenceRoom/ConferenceRoomBLL.cs

@@ -42,6 +42,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ConferenceRoomEntity> GetList()
+        {
+            try
+            {
+                return conferenceRoomService.GetList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取ConferenceRoom表实体数据
         /// <param name="keyValue">主键</param>
@@ -118,6 +141,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoEnable(string keyValue, string status)
+        {
+            try
+            {
+                conferenceRoomService.DoEnable(keyValue, status);
+            }
+            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.TwoDevelopment/PersonnelManagement/ConferenceRoom/ConferenceRoomEntity.cs

@@ -20,7 +20,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("ID")]
         public string ID { get; set; }
         /// <summary>
-        /// 名字
+        /// 场地名称
         /// </summary>
         [Column("NAME")]
         public string Name { get; set; }
@@ -44,6 +44,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime CreateTime { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ConferenceRoom/ConferenceRoomIBLL.cs

@@ -21,6 +21,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<ConferenceRoomEntity> GetPageList(Pagination pagination, string queryJson);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ConferenceRoomEntity> GetList();
         /// <summary>
         /// 获取ConferenceRoom表实体数据
         /// <param name="keyValue">主键</param>
@@ -43,6 +50,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         void SaveEntity(string keyValue, ConferenceRoomEntity entity);
+
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DoEnable(string keyValue, string status);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ConferenceRoom/ConferenceRoomService.cs

@@ -29,15 +29,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.Name,
-                t.Address,
-                t.Status,
-                t.Scale,
-                t.Remark
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM ConferenceRoom t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -50,10 +42,17 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["Status"].IsEmpty())
                 {
-                    dp.Add("Status", "%" + queryParam["Status"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.Status Like @Status ");
+                    if (queryParam["Status"].ToString() == "1")
+                    {
+                        dp.Add("Status", queryParam["Status"].ToString(), DbType.String);
+                        strSql.Append(" AND t.Status = @Status ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND t.Status != '1' ");
+                    }
                 }
-                return this.BaseRepository("CollegeMIS").FindList<ConferenceRoomEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<ConferenceRoomEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -68,6 +67,33 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ConferenceRoomEntity> GetList()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM ConferenceRoom t ");
+                strSql.Append("  WHERE 1=1 and t.Status = '1' ");
+                return this.BaseRepository("CollegeMIS").FindList<ConferenceRoomEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取ConferenceRoom表实体数据
         /// <param name="keyValue">主键</param>
@@ -105,7 +131,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<ConferenceRoomEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<ConferenceRoomEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -153,6 +179,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoEnable(string keyValue, string status)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update ConferenceRoom set Status='" + status + "' where ID='" + keyValue + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs

@@ -143,6 +143,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoCheck(UserInfo userInfo, string keyValue, string status)
+        {
+            try
+            {
+                meetingManagementService.DoCheck(userInfo, keyValue, status);
+            }
+            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.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementEntity.cs

@@ -40,12 +40,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("ENDTIME")]
         public DateTime? EndTime { get; set; }
         /// <summary>
-        /// 纪要记录人
+        /// 会议记录者
         /// </summary>
         [Column("RECORDPERSON")]
         public string RecordPerson { get; set; }
         /// <summary>
-        /// 会议纪要
+        /// 会议内容
         /// </summary>
         [Column("CONTENT")]
         public string Content { get; set; }
@@ -60,10 +60,45 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         [Column("CREATEUSER")]
         public string CreateUser { get; set; }
         /// <summary>
-        /// 预约时间
+        /// 申请时间
         /// </summary>
         [Column("CREATETIME")]
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 校内参入人员
+        /// </summary>
+        [Column("INTERNALPARTICIPANTS")]
+        public string InternalParticipants { get; set; }
+        /// <summary>
+        /// 校外参入人员
+        /// </summary>
+        [Column("EXTERNALPARTICIPANTS")]
+        public string ExternalParticipants { get; set; }
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        [Column("LINKMAN")]
+        public string Linkman { get; set; }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [Column("LINKPHONE")]
+        public string LinkPhone { get; set; }
+        /// <summary>
+        /// 会议状态
+        /// </summary>
+        [Column("CHECKSTATUS")]
+        public string CheckStatus { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        [Column("CHECKUSER")]
+        public string CheckUser { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [Column("CHECKTIME")]
+        public string CheckTime { get; set; }
         #endregion
 
         #region 扩展操作
@@ -84,6 +119,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         }
         #endregion
         #region 扩展字段
+        /// <summary>
+        /// 会议场地名称
+        /// </summary>
+        [NotMapped]
+        public string ConferenceRoomName { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs

@@ -50,6 +50,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity);
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DoCheck(UserInfo userInfo, string keyValue, string status);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs

@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.Organization;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -30,19 +31,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.MeetingTitle,
-                t.MeetingPlace,
-                t.BeginTime,
-                t.EndTime,
-                t.CreateUser,
-                t.RecordPerson,
-                t.Content,
-                t.Files
-                ");
-                strSql.Append("  FROM MeetingManagement t ");
+                strSql.Append("SELECT t.*,r.Name as ConferenceRoomName ");
+                strSql.Append("  FROM MeetingManagement t left join ConferenceRoom r on t.MeetingPlace=r.ID ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -54,15 +44,15 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["MeetingPlace"].IsEmpty())
                 {
-                    dp.Add("MeetingPlace",queryParam["MeetingPlace"].ToString(), DbType.String);
+                    dp.Add("MeetingPlace", queryParam["MeetingPlace"].ToString(), DbType.String);
                     strSql.Append(" AND t.MeetingPlace = @MeetingPlace ");
                 }
                 if (!queryParam["CreateUser"].IsEmpty())
                 {
-                    dp.Add("CreateUser",queryParam["CreateUser"].ToString(), DbType.String);
+                    dp.Add("CreateUser", queryParam["CreateUser"].ToString(), DbType.String);
                     strSql.Append(" AND t.CreateUser = @CreateUser ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<MeetingManagementEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<MeetingManagementEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -87,18 +77,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.MeetingTitle,
-                t.MeetingPlace,
-                t.BeginTime,
-                t.EndTime,
-                t.CreateUser,
-                t.RecordPerson,
-                t.Content,
-                t.Files
-                ");
+                strSql.Append("SELECT t.*");
                 strSql.Append("  FROM MeetingManagement t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -111,15 +90,15 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["MeetingPlace"].IsEmpty())
                 {
-                    dp.Add("MeetingPlace",queryParam["MeetingPlace"].ToString(), DbType.String);
+                    dp.Add("MeetingPlace", queryParam["MeetingPlace"].ToString(), DbType.String);
                     strSql.Append(" AND t.MeetingPlace = @MeetingPlace ");
                 }
                 if (!queryParam["CreateUser"].IsEmpty())
                 {
-                    dp.Add("CreateUser",queryParam["CreateUser"].ToString(), DbType.String);
+                    dp.Add("CreateUser", queryParam["CreateUser"].ToString(), DbType.String);
                     strSql.Append(" AND t.CreateUser = @CreateUser ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<MeetingManagementEntity>(strSql.ToString(),dp);
+                return this.BaseRepository("CollegeMIS").FindList<MeetingManagementEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)
             {
@@ -169,12 +148,19 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <returns></returns>
         public void DeleteEntity(string keyValue)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<MeetingManagementEntity>(t=>t.Id == keyValue);
+                //会议签到记录表中删除参会人员记录
+                db.Delete<MeetingSignInRecordEntity>(x => x.MeetID == keyValue);
+                //会议工作管理表删除会议
+                db.Delete<MeetingManagementEntity>(t => t.Id == keyValue);
+
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;
@@ -191,23 +177,90 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void SaveEntity( UserInfo userInfo, string keyValue, MeetingManagementEntity entity)
+        public void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 if (!string.IsNullOrEmpty(keyValue))
                 {
-                    entity.Modify(keyValue,userInfo);
-                    this.BaseRepository("CollegeMIS").Update(entity);
+                    entity.Modify(keyValue, userInfo);
+                    db.Update(entity);
+                    //会议签到记录表中先删除参会人员记录，再增加参会人员；
+                    db.Delete<MeetingSignInRecordEntity>(x => x.MeetID == entity.Id);
                 }
                 else
                 {
                     entity.Create(userInfo);
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    db.Insert(entity);
+                    //会议签到记录表中增加参会人员；
+                }
+                //增加校内参入人员：
+                if (!string.IsNullOrEmpty(entity.InternalParticipants))
+                {
+                    if (entity.InternalParticipants.IndexOf(',') == -1)
+                    {
+                        var model = new MeetingSignInRecordEntity()
+                        {
+                            MeetID = entity.Id,
+                            ParticipantID = entity.InternalParticipants,
+                            ParticipantName = this.BaseRepository().FindEntity<UserEntity>(x => x.F_UserId == entity.InternalParticipants)?.F_RealName,
+                            IsSignIn = false
+                        };
+                        model.Create(userInfo);
+                        db.Insert(model);
+                    }
+                    else
+                    {
+                        foreach (var item in entity.InternalParticipants.Split(','))
+                        {
+                            var model = new MeetingSignInRecordEntity()
+                            {
+                                MeetID = entity.Id,
+                                ParticipantID = item,
+                                ParticipantName = this.BaseRepository().FindEntity<UserEntity>(x => x.F_UserId == item)?.F_RealName,
+                                IsSignIn = false
+                            };
+                            model.Create(userInfo);
+                            db.Insert(model);
+                        }
+                    }
                 }
+                //增加校外参入人员：
+                if (!string.IsNullOrEmpty(entity.ExternalParticipants))
+                {
+                    if (entity.ExternalParticipants.IndexOf(',') == -1)
+                    {
+                        var model = new MeetingSignInRecordEntity()
+                        {
+                            MeetID = entity.Id,
+                            ParticipantName = entity.ExternalParticipants,
+                            IsSignIn = false
+                        };
+                        model.Create(userInfo);
+                        db.Insert(model);
+                    }
+                    else
+                    {
+                        foreach (var item in entity.ExternalParticipants.Split(','))
+                        {
+                            var model = new MeetingSignInRecordEntity()
+                            {
+                                MeetID = entity.Id,
+                                ParticipantName = item,
+                                IsSignIn = false
+                            };
+                            model.Create(userInfo);
+                            db.Insert(model);
+                        }
+                    }
+                }
+
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;
@@ -219,6 +272,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoCheck(UserInfo userInfo, string keyValue, string status)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").ExecuteBySql("update MeetingManagement set CheckStatus='" + status + "',CheckUser='" + userInfo.userId + "',CheckTime='" + DateTime.Now + "' where Id='" + keyValue + "' ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs

@@ -143,6 +143,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 签到实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoSignIn(string keyValue, bool isSignIn)
+        {
+            try
+            {
+                meetingSignInRecordService.DoSignIn(keyValue, isSignIn);
+            }
+            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.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordEntity.cs

@@ -64,6 +64,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         }
         #endregion
         #region 扩展字段
+        /// <summary>
+        /// 会议主题
+        /// </summary>
+        [NotMapped]
+        public string MeetingTitle { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs

@@ -50,6 +50,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         void SaveEntity(UserInfo userInfo, string keyValue, MeetingSignInRecordEntity entity);
+
+        /// <summary>
+        /// 签到实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void DoSignIn(string keyValue, bool isSignIn);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs

@@ -30,21 +30,24 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.MeetID,
-                t.ParticipantID,
-                t.ParticipantName,
-                t.IsSignIn,
-                t.SignInTime
-                ");
-                strSql.Append("  FROM MeetingSignInRecord t ");
+                strSql.Append("SELECT t.*,m.MeetingTitle ");
+                strSql.Append("  FROM MeetingSignInRecord t left join MeetingManagement m on t.MeetID=m.Id ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["MeetingTitle"].IsEmpty())
+                {
+                    dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND m.MeetingTitle Like @MeetingTitle ");
+                }
+                if (!queryParam["ParticipantName"].IsEmpty())
+                {
+                    dp.Add("ParticipantName", "%" + queryParam["ParticipantName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ParticipantName like @ParticipantName ");
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -69,21 +72,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.MeetID,
-                t.ParticipantID,
-                t.ParticipantName,
-                t.IsSignIn,
-                t.SignInTime
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM MeetingSignInRecord t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(),dp);
+                return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)
             {
@@ -135,7 +130,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<MeetingSignInRecordEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<MeetingSignInRecordEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -155,13 +150,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void SaveEntity( UserInfo userInfo, string keyValue, MeetingSignInRecordEntity entity)
+        public void SaveEntity(UserInfo userInfo, string keyValue, MeetingSignInRecordEntity entity)
         {
             try
             {
                 if (!string.IsNullOrEmpty(keyValue))
                 {
-                    entity.Modify(keyValue,userInfo);
+                    entity.Modify(keyValue, userInfo);
                     this.BaseRepository("CollegeMIS").Update(entity);
                 }
                 else
@@ -183,6 +178,37 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 签到实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void DoSignIn(string keyValue, bool isSignIn)
+        {
+            try
+            {
+                if (isSignIn)
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update MeetingSignInRecord set IsSignIn=1,SignInTime='" + DateTime.Now + "' where ID='" + keyValue + "' ");
+                }
+                else
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update MeetingSignInRecord set IsSignIn=0,SignInTime=null where ID='" + keyValue + "' ");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }