合并

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -6,16 +6,16 @@
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 //};
-var config = {
-   webapi: 'http://localhost:31173/',
-   web: "http://localhost:20472/"//web地址，用于配置logo
-}; 
+//var config = {
+//    webapi: 'http://localhost:31173/',
+//    web: "http://localhost:20472/"//web地址，用于配置logo
+//}; 
 
 
-// var config = {
-// 	webapi: 'http://localhost:8081/',
-// 	web: "http://localhost:8087/" //web地址，用于配置logo
-// };
+var config = {
+    webapi: 'http://localhost:8081/',
+    web: "http://localhost:8087/"//web地址，用于配置logo
+}; 
 // var config = {
 //    webapi: 'http://123.57.209.16:31173/',
 //    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
@@ -30,4 +30,4 @@ var config = {
 // var config = {
 //    webapi: 'http://123.57.209.16:31174/',
 //    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
-// };
+// }; 

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

@@ -56,6 +56,25 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面-我参加的会议
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfMyJoin()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 报表统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexStatistics()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -94,6 +113,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success(data);
         }
         /// <summary>
+        /// 获取报表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatisticList(string queryJson)
+        {
+            var data = meetingManagementIBLL.GetStatisticList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
         /// 获取表单数据
         /// <summary>
         /// <returns></returns>

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

@@ -37,6 +37,25 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 会议考勤
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexAttendance()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 会议考勤-查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormViewAttendance()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据

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

@@ -1,7 +1,7 @@
 @{
     /**/
 
-    ViewBag.Title = "会议管理";
+    ViewBag.Title = "我参加的会议";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout ">
@@ -33,19 +33,9 @@
                         <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_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
-                        <a id="lr_submit" 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>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -28,79 +28,6 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'addform',
-                    title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form',
-                    width: 1000,
-                    height: 800,
-                    callBack: function (id) {
-                        var res = false;
-                        // 验证数据
-                        res = top[id].validForm();
-                        // 保存数据
-                        if (res) {
-                            res = top[id].save('', function () {
-                                page.search();
-                            });
-                        }
-                        return res;
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
-                if (learun.checkrow(keyValue)) {
-                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
-                    if (CheckStatus == "1") {
-                        learun.alert.warning("当前项已审核通过！");
-                        return false;
-                    } else if (CheckStatus == "3") {
-                        learun.alert.warning("当前项审核中！");
-                        return false;
-                    }
-                    learun.layerForm({
-                        id: 'editform',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue,
-                        width: 1000,
-                        height: 800,
-                        callBack: function (id) {
-                            var res = false;
-                            // 验证数据
-                            res = top[id].validForm();
-                            // 保存数据
-                            if (res) {
-                                res = top[id].save('', function () {
-                                    page.search();
-                                });
-                            }
-                            return res;
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_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 () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
             // 查看
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -115,67 +42,7 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //提交
-            $('#lr_submit').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;
-                    } else if (CheckStatus == "3") {
-                        learun.alert.warning("当前项审核中！");
-                        return false;
-                    }
-                    learun.layerConfirm('是否确认提交该项！', function (res) {
-                        if (res) {
-                            processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) {
-                                refreshGirdData(res, {});
-                            });
-                        }
-                    });
-                }
-            });
-            // 考勤
-            // 纪要
-            // 通知
-            // 审核通过
-            $('#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();
-                            });
-                        }
-                    });
-                }
-            });
+            
         },
         // 初始化列表
         initGird: function () {
@@ -247,17 +114,6 @@ var bootstrap = function ($, learun) {
         }
     };
     refreshGirdData = function (res, postData) {
-        if (res && res.code && res.code == 200) {
-            // 发起流程
-            var postData = {
-                schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号
-                processId: processId,
-                level: '1',
-            };
-            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
-                learun.loading(false);
-            });
-        }
         page.search();
     };
     page.init();

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

@@ -0,0 +1,46 @@
+@{
+    ViewBag.Title = "会议考勤统计";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<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="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="meetingtitle" type="text" class="form-control" />
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">开始时间</div>
+                                    <input id="begintime" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">结束时间</div>
+                                    <input id="endtime" 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_outport" class="btn btn-default"><i class="fa fa-sign-out"></i> 导出</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i> 打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/IndexStatistics.js")

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

@@ -0,0 +1,188 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-07 16:39
+ * 描  述：a
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var map = {};
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 120, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            // 导出
+            $('#lr_outport').on('click', function () {
+                learun.download({
+                    method: 'POST',
+                    url: '/Utility/ExportExcel',
+                    param: {
+                        fileName: '导出数据列表',
+                        columnJson: JSON.stringify($('#gridtable').jfGridGet('settingInfo').headData),
+                        dataJson: JSON.stringify($('#gridtable').jfGridGet('settingInfo').rowdatas)
+                    }
+                });
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetStatisticList',
+                headData: [
+                    { label: "会议标题", name: "meetingtitle", width: 100, align: "left" },
+                    { label: "会议开始时间", name: "begintime", width: 200, align: "left" },
+                    { label: "会议结束时间", name: "endtime", width: 200, align: "left" },
+                    { label: "正常(人)", name: "正常", width: 100, align: "left" },
+                    { label: "未到(人)", name: "未到", width: 100, align: "left" },
+                ],
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,11 @@
+@{
+    ViewBag.Title = "会议考勤";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item"  data-table="MeetingSignInRecord" >
+        <div class="lr-form-item-title">考勤类型</div>
+        <div id="IsSignIn" readonly="readonly" ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/FormViewAttendance.js")

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

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:16
+ * 描  述：会议考勤
+ */
+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 () {
+            
+            $('#IsSignIn').lrDataItemSelect({ code: 'meetingAdType' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/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]);
+                            
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,44 @@
+@{
+    /**/
+
+    ViewBag.Title = "会议考勤管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<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 class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">考勤类型</div>
+                                    <div id="IsSignIn"></div> 
+                                </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_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/IndexAttendance.js")

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

@@ -0,0 +1,81 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:16
+ * 描  述：会议考勤管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#IsSignIn').lrDataItemSelect({ code: 'meetingAdType' }); 
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/FormViewAttendance?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetPageList',
+                headData: [
+                    { label: "姓名", name: "ParticipantName", width: 100, align: "left" },
+                    { label: "会议", name: "MeetingTitle", width: 150, align: "left" },
+                    {
+                        label: "考勤类型", name: "IsSignIn", width: 100, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'meetingAdType',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "正常" : "未到";
+                        }
+                    },
+                    { label: "考勤时间", name: "SignInTime", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'MeetID,ParticipantID'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -7,13 +7,15 @@
         <div class="lr-form-item-title">组织名称<font face="宋体">*</font></div>
         <input id="GerName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchGER">
         <div class="lr-form-item-title">专业组长<font face="宋体">*</font></div>
-        <input id="GerBoss" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="GerBoss"></div>
+        @*<input id="GerBoss" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchGER">
         <div class="lr-form-item-title">组织成员<font face="宋体">*</font></div>
-        <textarea id="Gerpeople" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <div id="Gerpeople"></div>
+        @*<textarea id="Gerpeople" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>*@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ResearchGER" >
         <div class="lr-form-item-title">成立时间</div>

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

@@ -15,6 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#GerBoss').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' });
+            $('#Gerpeople').lrUserSelect({ type: '1' });
             $('#GerState').lrRadioCheckbox({
                 type: 'radio',
                 code: 'EnableStatus',

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

@@ -1,103 +1,129 @@
-/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
- * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
- * 创建人：超级管理员
- * 日  期：2021-05-11 18:17
- * 描  述：教科研组管理
- */
-var refreshGirdData;
-var bootstrap = function ($, learun) {
-    "use strict";
-    var page = {
-        init: function () {
-            page.initGird();
-            page.bind();
-        },
-        bind: function () {
-            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
-                page.search(queryJson);
-            }, 130, 200);
-            // 刷新
-            $('#lr_refresh').on('click', function () {
-                location.reload();
-            });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form',
-                    width: 600,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
-            // 编辑
-            $('#lr_edit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('GerID');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerForm({
-                        id: 'form',
-                        title: '编辑',
-                        url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
-                        callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
-                        }
-                    });
-                }
-            });
-            // 删除
-            $('#lr_delete').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('GerID');
-                if (learun.checkrow(keyValue)) {
-                    learun.layerConfirm('是否确认删除该项！', function (res) {
-                        if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResearchGER/DeleteForm', { keyValue: keyValue}, function () {
-                                refreshGirdData();
-                            });
-                        }
-                    });
-                }
-            });
-            // 打印
-            $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
-            });
-        },
-        // 初始化列表
-        initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/GetPageList',
-                headData: [
-                    { label: "组织名称", name: "GerName", width: 100, align: "left"},
-                    { label: "专业组长", name: "GerBoss", width: 100, align: "left"},
-                    { label: "成立时间", name: "Gertiem", width: 100, align: "left"},
-                    { label: "状态", name: "GerState", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'EnableStatus',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
-                        }},
-                ],
-                mainId:'GerID',
-                isPage: true
-            });
-            page.search();
-        },
-        search: function (param) {
-            param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
-        }
-    };
-    refreshGirdData = function () {
-        $('#gridtable').jfGridSet('reload');
-    };
-    page.init();
-}
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-11 18:17
+ * 描  述：教科研组管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 130, 200);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form',
+                    width: 600,
+                    height: 450,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('GerID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 450,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('GerID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ResearchGER/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/ResearchGER/GetPageList',
+                headData: [
+                    { label: "组织名称", name: "GerName", width: 100, align: "left"},
+                    {
+                        label: "专业组长", name: "GerBoss", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "成立时间", name: "Gertiem", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        },
+                        sort: true
+                    },
+                    { label: "状态", name: "GerState", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 1) {
+                                return '<span class=\"label label-success\">启用</span>';
+                            } else if (cellvalue == 0) {
+                                return '<span class=\"label label-danger\">禁用</span>';
+                            }
+                        }
+                        //formatterAsync: function (callback, value, row, op,$cell) {
+                        //     learun.clientdata.getAsync('dataItem', {
+                        //         key: value,
+                        //         code: 'EnableStatus',
+                        //         callback: function (_data) {
+                        //             callback(_data.text);
+                        //         }
+                        //     });
+                        //}
+                    },
+                ],
+                mainId:'GerID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -1383,8 +1383,11 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexStatistics.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.js" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\ResearchMent\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
@@ -7175,6 +7178,10 @@
     <Content Include="Areas\LR_OrganizationModule\Views\User\FamilyIndex.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\FormViewAttendance.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexStatistics.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/MeetingManagement/MeetingManagementBLL.cs

@@ -114,6 +114,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+
+        /// <summary>
+        /// 获取MeetingManagement表实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public DataTable GetStatisticList(string queryJson)
+        {
+            try
+            {
+                return meetingManagementService.GetStatisticList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         #endregion
 
         #region 提交数据

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

@@ -40,6 +40,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         MeetingManagementEntity GetMeetingManagementEntityByProcessId(string processId);
+        /// <summary>
+        /// 获取报表数据
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        DataTable GetStatisticList(string queryJson);
         #endregion
 
         #region 提交数据

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

@@ -166,6 +166,55 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取报表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public DataTable GetStatisticList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT  ");
+                strSql.Append(@"
+                t.meetingtitle,
+                t.begintime,
+                t.endtime,
+                t.正常,
+                t.未到
+                ");
+                strSql.Append("  FROM (select m.MeetingTitle,isnull(t.正常,0) 正常,isnull(t.未到,0) 未到,m.BeginTime,m.EndTime from MeetingManagement m left join (select meetid,sum(case issignin when 1 then 1 else 0 end) as 正常, sum(case issignin when 0 then 1 else 0 end) as 未到  from MeetingSignInRecord group by meetid) t on t.MeetID=m.Id)t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["meetingtitle"].IsEmpty())
+                {
+                    dp.Add("meetingtitle", "%" + queryParam["meetingtitle"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.meetingtitle Like @meetingtitle ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.begintime >= @startTime AND t.begintime <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindTable(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据

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

@@ -46,6 +46,18 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     dp.Add("ParticipantName", "%" + queryParam["ParticipantName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.ParticipantName like @ParticipantName ");
                 }
+                if (!queryParam["IsSignIn"].IsEmpty())
+                {
+                    if (queryParam["IsSignIn"].ToString() == "true")
+                    {
+                        strSql.Append(" AND t.IsSignIn=1 ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND t.IsSignIn=0 ");
+                    }
+
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<MeetingSignInRecordEntity>(strSql.ToString(), dp, pagination);
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchGER/ResearchGEREntity.cs

@@ -49,6 +49,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("POSTSCRIPT")]
         public string postscript { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("GERCREATEUSERID")]
+        public string GerCreateUserId { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("GERCREATEUSERNAME")]
+        public string GerCreateUserName { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("GERCREATETIME")]
+        public DateTime? GerCreateTime { get; set; }
         #endregion
 
         #region 扩展操作
@@ -58,6 +73,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         public void Create()
         {
             this.GerID = Guid.NewGuid().ToString();
+            var userinfo = LoginUserInfo.Get();
+            this.GerCreateUserId = userinfo.userId;
+            this.GerCreateUserName = userinfo.realName;
+            this.GerCreateTime = DateTime.Now;
         }
         /// <summary>
         /// 编辑调用