Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StudentCertificateController.cs

@@ -0,0 +1,152 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+using Learun.Application.Base.SystemModule;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 11:05
+    /// 描 述：学生证书管理
+    /// </summary>
+    public class StudentCertificateController : MvcControllerBase
+    {
+        private StudentCertificateIBLL studentCertificateIBLL = new StudentCertificateBLL();
+        private CodeRuleIBLL codeRuleIBLL = new CodeRuleBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = studentCertificateIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StudentCertificateData = studentCertificateIBLL.GetStudentCertificateEntity(keyValue);
+            var jsonData = new
+            {
+                StudentCertificate = StudentCertificateData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStuData(string stuno, string stuname)
+        {
+            var stuData = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNoOrStuName(stuno, stuname);
+
+            return Success(stuData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="processId">流程实例主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var StudentCertificateData = studentCertificateIBLL.GetEntityByProcessId(processId);
+            var jsonData = new
+            {
+                StudentCertificate = StudentCertificateData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            studentCertificateIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StudentCertificateEntity entity = strEntity.ToObject<StudentCertificateEntity>();
+            studentCertificateIBLL.SaveEntity(keyValue, entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,51 @@
+@{
+    ViewBag.Title = "学生证书管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">学生学号<font face="宋体">*</font></div>
+        <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">证书名称<font face="宋体">*</font></div>
+        <input id="SCName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">证书级别<font face="宋体">*</font></div>
+        <input id="SCLevel" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">证书种类<font face="宋体">*</font></div>
+        <input id="SCType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">分值<font face="宋体">*</font></div>
+        <input id="SCScore" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">获取时间<font face="宋体">*</font></div>
+        <input id="SCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SCTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="SCUrl"  ></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StudentCertificate/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StudentCertificate/Form.js

@@ -0,0 +1,143 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-30 11:05
+ * 描  述：学生证书管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var type = request('type');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#SCUrl').lrUploader();
+
+            $('#StuNo').blur(function () {
+                learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StudentCertificate/GetStuData?stuno=' + $('#StuNo').val() + '&stuname=' + $('#StuName').val(), function (res) {
+                    learun.loading(false);
+                    if (res.code == learun.httpCode.success) {
+                        var data = res.data;
+                        $('#StuName').val(data.StuName);
+                        $('#DeptNo').lrselectSet(data.DeptNo);
+                        $('#MajorNo').lrselectSet(data.MajorNo);
+                        $('#ClassNo').lrselectSet(data.ClassNo);
+                    }
+                    else {
+                        learun.alert.error(res.info);
+                    }
+                });
+            });
+            $('#StuName').blur(function () {
+                learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StudentCertificate/GetStuData?stuno=' + $('#StuNo').val() + '&stuname=' + $('#StuName').val(), function (res) {
+                    learun.loading(false);
+                    if (res.code == learun.httpCode.success) {
+                        var data = res.data;
+                        $('#StuNo').val(data.StuNo);
+                        $('#DeptNo').lrselectSet(data.DeptNo);
+                        $('#MajorNo').lrselectSet(data.MajorNo);
+                        $('#ClassNo').lrselectSet(data.ClassNo);
+                    }
+                    else {
+                        learun.alert.error(res.info);
+                    }
+                });
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StudentCertificate/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StudentCertificate/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'StudentCertificate' && data[id]) {
+                            keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.processId = processId;
+        }
+        if (type == 'copy') {
+            keyValue = '';
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StudentCertificate/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,63 @@
+@{
+    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-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">证书名称</div>
+                                    <input id="SCName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">证书级别</div>
+                                    <input id="SCLevel" 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_copy" 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>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StudentCertificate/Index.js")

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

@@ -0,0 +1,191 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-30 11:05
+ * 描  述：学生证书管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 240, 400);
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form',
+                    width: 720,
+                    height: 550,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            processId = learun.newGuid();
+                            res = top[id].save(processId, refreshGirdData);
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form?keyValue=' + keyValue,
+                        width: 720,
+                        height: 550,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            //复制
+            $('#lr_copy').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '新增',
+                        url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form?keyValue=' + keyValue+'&type=copy',
+                        width: 720,
+                        height: 550,
+                        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)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StudentCertificate/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/GetPageList',
+                headData: [
+                    { label: "学生学号", name: "StuNo", width: 100, align: "left"},
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left"},
+                    { label: "专业部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                 key: value,
+                                 keyId: 'deptno',
+                                 callback: function (_data) {
+                                     callback(_data['deptname']);
+                                 }
+                             });
+                        }},
+                    { label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                 key: value,
+                                 keyId: 'majorno',
+                                 callback: function (_data) {
+                                     callback(_data['majorname']);
+                                 }
+                             });
+                        }},
+                    { label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                 key: value,
+                                 keyId: 'classno',
+                                 callback: function (_data) {
+                                     callback(_data['classname']);
+                                 }
+                             });
+                        }},
+                    { label: "证书名称", name: "SCName", width: 100, align: "left"},
+                    { label: "证书级别", name: "SCLevel", width: 100, align: "left"},
+                    { label: "证书种类", name: "SCType", width: 100, align: "left"},
+                    { label: "分值", name: "SCScore", width: 100, align: "left"},
+                    { label: "获取时间", name: "SCTime", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (!!res)
+        {
+          if (res.code == 200)
+          {
+             // 发起流程
+             var postData = {
+                  schemeCode:'',// 填写流程对应模板编号
+                  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/IndexOfMyApply.cshtml

@@ -43,6 +43,7 @@
                         @*<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_case" 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>

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

@@ -201,6 +201,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 会议签到情况
+            $('#lr_case').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '签到情况',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {

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

@@ -34,6 +34,7 @@
                     </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>
+                        <a id="lr_case" 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>*@

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

@@ -201,6 +201,20 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 会议签到情况
+            $('#lr_case').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '签到情况',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {

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

@@ -5,6 +5,7 @@
  * 描  述：会议签到记录
  */
 var refreshGirdData;
+var MeetID = request('MeetID');//会议ID
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -126,6 +127,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.MeetID = MeetID;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -861,6 +861,7 @@
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_DormitoryRuleController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateConditionController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\TeachManagementController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StudentCertificateController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EvaluateTeachLearnController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\ClassPatrolController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateStatisticController.cs" />
@@ -6852,6 +6853,10 @@
     <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StudentCertificate\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Form.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -33,6 +33,7 @@
     <typeAlias alias="TextBookIndentMethod" type="Learun.Application.WorkFlow.TextBookIndentMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuCancelDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuCancelDisciplineManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuDisciplineManagementMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="StudentCertificateMethod" type="Learun.Application.WorkFlow.StudentCertificateMethod,Learun.Application.WorkFlow" />
     
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -76,6 +77,7 @@
       <type type="IWorkFlowMethod" mapTo="TextBookIndentMethod" name="TextBookIndentMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuCancelDisciplineManagementMethod" name="StuCancelDisciplineManagementMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuDisciplineManagementMethod" name="StuDisciplineManagementMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="StudentCertificateMethod" name="StudentCertificateMethod"></type>
       
     </container>
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config

@@ -34,6 +34,7 @@
     <typeAlias alias="TextBookIndentMethod" type="Learun.Application.WorkFlow.TextBookIndentMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuCancelDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuCancelDisciplineManagementMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="StuDisciplineManagementMethod" type="Learun.Application.WorkFlow.StuDisciplineManagementMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="StudentCertificateMethod" type="Learun.Application.WorkFlow.StudentCertificateMethod,Learun.Application.WorkFlow" />
 
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -75,6 +76,7 @@
       <type type="IWorkFlowMethod" mapTo="TextBookIndentMethod" name="TextBookIndentMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuCancelDisciplineManagementMethod" name="StuCancelDisciplineManagementMethod"></type>
       <type type="IWorkFlowMethod" mapTo="StuDisciplineManagementMethod" name="StuDisciplineManagementMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="StudentCertificateMethod" name="StudentCertificateMethod"></type>
     </container>
     <container name="TsIOCcontainer">
       <!--<type type="ITSMethod" mapTo="TestTask" name="taskioc"></type>-->

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StudentCertificateMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 11:05
+    /// 描 述：学生证书管理
+    /// </summary>
+    public class StudentCertificateMap : EntityTypeConfiguration<StudentCertificateEntity>
+    {
+        public StudentCertificateMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("STUDENTCERTIFICATE");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -618,6 +618,7 @@
     <Compile Include="LogisticsManagement\Acc_DormitoryRuleMap.cs" />
     <Compile Include="EducationalAdministration\StuGraduateConditionMap.cs" />
     <Compile Include="PersonnelManagement\TeachManagementMap.cs" />
+    <Compile Include="EducationalAdministration\StudentCertificateMap.cs" />
     <Compile Include="PersonnelManagement\EvaluateTeachLearnMap.cs" />
     <Compile Include="PersonnelManagement\ClassPatrolMap.cs" />
     <Compile Include="EducationalAdministration\StuGraduateStatisticMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs

@@ -191,7 +191,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-
+        public StuInfoBasicEntity GetStuInfoBasicEntityByStuNoOrStuName(string stuno, string stuname)
+        {
+            try
+            {
+                return stuInfoBasicService.GetStuInfoBasicEntityByStuNoOrStuName(stuno, stuname);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary> 
         /// 获取左侧树形数据 
         /// <summary> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs

@@ -35,6 +35,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         StuInfoBasicEntity GetStuInfoBasicEntityByStuNo(string enCode);
 
         StuInfoBasicEntity GetStuInfoBasicEntityByStuName(string name);
+        StuInfoBasicEntity GetStuInfoBasicEntityByStuNoOrStuName(string stuno,string stuname);
         /// <summary> 
         /// 获取左侧树形数据 
         /// <summary> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -257,6 +257,33 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public StuInfoBasicEntity GetStuInfoBasicEntityByStuNoOrStuName(string stuno, string stuname)
+        {
+            try
+            {
+                string sql = "select * from StuInfoBasic where 1=1";
+                if (!string.IsNullOrEmpty(stuno))
+                {
+                    sql += $" and stuno='{stuno}'";
+                }
+                if (!string.IsNullOrEmpty(stuname))
+                {
+                    sql += $" and stuname='{stuname}'";
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(sql).FirstOrDefault();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取StuInfoBasic表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateBLL.cs

@@ -0,0 +1,165 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 11:05
+    /// 描 述：学生证书管理
+    /// </summary>
+    public class StudentCertificateBLL : StudentCertificateIBLL
+    {
+        private StudentCertificateService studentCertificateService = new StudentCertificateService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StudentCertificateEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return studentCertificateService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StudentCertificate表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StudentCertificateEntity GetStudentCertificateEntity(string keyValue)
+        {
+            try
+            {
+                return studentCertificateService.GetStudentCertificateEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public StudentCertificateEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return studentCertificateService.GetEntityByProcessId(processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                studentCertificateService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, StudentCertificateEntity entity)
+        {
+            try
+            {
+                studentCertificateService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        public void ChangeStatusByProcessId(string processId, int status)
+        {
+            try
+            {
+                studentCertificateService.ChangeStatusByProcessId(processId, 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/EducationalAdministration/StudentCertificate/StudentCertificateEntity.cs

@@ -0,0 +1,122 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 11:05
+    /// 描 述：学生证书管理
+    /// </summary>
+    public class StudentCertificateEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// StuNo
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// StuName
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// DeptNo
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// 证书名称
+        /// </summary>
+        [Column("SCNAME")]
+        public string SCName { get; set; }
+        /// <summary>
+        /// 证书级别
+        /// </summary>
+        [Column("SCLEVEL")]
+        public string SCLevel { get; set; }
+        /// <summary>
+        /// 证书获取时间
+        /// </summary>
+        [Column("SCTIME")]
+        public DateTime? SCTime { get; set; }
+        /// <summary>
+        /// 证书种类
+        /// </summary>
+        [Column("SCTYPE")]
+        public string SCType { get; set; }
+        /// <summary>
+        /// 分值
+        /// </summary>
+        [Column("SCSCORE")]
+        public decimal? SCScore { get; set; }
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [Column("SCURL")]
+        public string SCUrl { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// processId
+        /// </summary>
+        [Column("PROCESSID")]
+        public string processId { get; set; }
+        /// <summary>
+        /// Status
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.CreateTime = DateTime.Now;
+            this.CreateUserId = LoginUserInfo.Get().userId;
+            this.Status = 0;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateIBLL.cs

@@ -0,0 +1,56 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 11:05
+    /// 描 述：学生证书管理
+    /// </summary>
+    public interface StudentCertificateIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StudentCertificateEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取StudentCertificate表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StudentCertificateEntity GetStudentCertificateEntity(string keyValue);
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        StudentCertificateEntity GetEntityByProcessId(string processId);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, StudentCertificateEntity entity);
+        void ChangeStatusByProcessId(string processId, int status);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateService.cs

@@ -0,0 +1,238 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-30 11:05
+    /// 描 述：学生证书管理
+    /// </summary>
+    public class StudentCertificateService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StudentCertificateEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.StuNo,
+                t.StuName,
+                t.DeptNo,
+                t.MajorNo,
+                t.ClassNo,
+                t.SCName,
+                t.SCLevel,
+                t.SCType,
+                t.SCScore,
+                t.SCTime,
+                t.SCUrl
+                ");
+                strSql.Append("  FROM StudentCertificate t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo Like @StuNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["DeptNo"].IsEmpty())
+                {
+                    dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DeptNo = @DeptNo ");
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MajorNo = @MajorNo ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["SCName"].IsEmpty())
+                {
+                    dp.Add("SCName", "%" + queryParam["SCName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.SCName Like @SCName ");
+                }
+                if (!queryParam["SCLevel"].IsEmpty())
+                {
+                    dp.Add("SCLevel", "%" + queryParam["SCLevel"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.SCLevel Like @SCLevel ");
+                }
+                if (!queryParam["SCTime"].IsEmpty())
+                {
+                    dp.Add("SCTime",queryParam["SCTime"].ToString(), DbType.String);
+                    strSql.Append(" AND t.SCTime = @SCTime ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StudentCertificateEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StudentCertificate表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StudentCertificateEntity GetStudentCertificateEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StudentCertificateEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public StudentCertificateEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StudentCertificateEntity>(t=>t.processId == processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<StudentCertificateEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, StudentCertificateEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public void ChangeStatusByProcessId(string processId, int status)
+        {
+            try
+            {
+                
+            }
+            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/Learun.Application.TwoDevelopment.csproj

@@ -1914,6 +1914,10 @@
     <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageService.cs" />
     <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageBLL.cs" />
     <Compile Include="EducationalAdministration\TrainEquipmentManage\TrainEquipmentManageIBLL.cs" />
+    <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateEntity.cs" />
+    <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateService.cs" />
+    <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateBLL.cs" />
+    <Compile Include="EducationalAdministration\StudentCertificate\StudentCertificateIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

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

@@ -487,6 +487,17 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                     userInfos.Add(user);
                 }
             }
+            if (!string.IsNullOrEmpty(Received.RecordPerson))
+            {
+                foreach (var rid in Received.RecordPerson.Split(','))
+                {
+                    var user = this.BaseRepository().FindEntity<UserEntity>(m => m.F_UserId == rid);
+                    if (!userInfos.Contains(user))
+                    {
+                        userInfos.Add(user);
+                    }
+                }
+            }
             //foreach (var uitem in userInfos)
             //{
             //    SYS_ReceiveMessageEntity receiveMessageEntity = new SYS_ReceiveMessageEntity();

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

@@ -36,6 +36,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["MeetID"].IsEmpty())
+                {
+                    dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String);
+                    strSql.Append(" AND t.MeetID = @MeetID ");
+                }
                 if (!queryParam["MeetingTitle"].IsEmpty())
                 {
                     dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String);
@@ -219,14 +224,18 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var meetEntity = this.BaseRepository("CollegeMIS")
                     .FindEntity<MeetingSignInRecordEntity>(a =>
                         a.MeetID == scanParamMeetid && a.ParticipantID == scanParamUserid);
-                if (meetEntity != null)
+                var date = DateTime.Now;
+                var meetEntityList = this.BaseRepository("CollegeMIS")
+                    .FindEntity<MeetingManagementEntity>(x => x.Id == scanParamMeetid);
+                var beginTime = meetEntityList.BeginTime;
+                if (meetEntityList != null && beginTime > date)
                 {
                     meetEntity.IsSignIn = true;
                     meetEntity.SignInTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Update(meetEntity);
                     result = true;
-
                 }
+
                 return result;
 
             }

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

@@ -97,6 +97,7 @@
     <Compile Include="NodeMethod\ArrangeLessonTermAttemperMethod.cs" />
     <Compile Include="NodeMethod\ADR_AddApplyMethod.cs" />
     <Compile Include="NodeMethod\Ass_AcceptanceMethod.cs" />
+    <Compile Include="NodeMethod\StudentCertificateMethod.cs" />
     <Compile Include="NodeMethod\FD_PayManageMethod.cs" />
     <Compile Include="NodeMethod\Ass_ReceiveMethod.cs" />
     <Compile Include="NodeMethod\MeetingManagementApplyMethod.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/StudentCertificateMethod.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+
+namespace Learun.Application.WorkFlow
+{
+    public class StudentCertificateMethod : IWorkFlowMethod
+    {
+        StudentCertificateIBLL asset = new StudentCertificateBLL();
+       
+
+        public void Execute(WfMethodParameter parameter)
+        {
+            if (parameter.code == "agree")
+            {
+                asset.ChangeStatusByProcessId(parameter.processId, 2);
+            }
+            else
+            {
+                asset.ChangeStatusByProcessId(parameter.processId, 0);
+            }
+        }
+    }
+}