2023年5月9日提出的问题处理

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js

@@ -266,6 +266,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: "房间状态", name: "REnabled", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
+                            console.log(value);
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
                                 code: 'RoomState',

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

@@ -0,0 +1,196 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-06-17 11:00
+    /// 描 述：体温上报
+    /// </summary>
+    public class HealthPunchStuController : MvcControllerBase
+    {
+        private HealthPunchStuIBLL healthPunchStuIBLL = new HealthPunchStuBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Statistics()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticsTeach()
+        {
+            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 = healthPunchStuIBLL.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 HealthPunchStuData = healthPunchStuIBLL.GetHealthPunchStuEntity(keyValue);
+            var jsonData = new
+            {
+                HealthPunchStu = HealthPunchStuData,
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatistics(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = healthPunchStuIBLL.GetStatistics(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetStatisticsTeach(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = healthPunchStuIBLL.GetStatisticsTeach(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            healthPunchStuIBLL.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)
+        {
+            HealthPunchStuEntity entity = strEntity.ToObject<HealthPunchStuEntity>();
+            healthPunchStuIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult PunchCard(string keyValue, string strEntity)
+        {
+            HealthPunchStuEntity entity = strEntity.ToObject<HealthPunchStuEntity>();
+            var result = healthPunchStuIBLL.PunchCard(keyValue, entity);
+            return Success(result);
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,138 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-06-17 09:17
+    /// 描 述：健康打卡时段
+    /// </summary>
+    public class HealthPunchTimeController : MvcControllerBase
+    {
+        private HealthPunchTimeIBLL healthPunchTimeIBLL = new HealthPunchTimeBLL();
+
+        #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 = healthPunchTimeIBLL.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 HealthPunchTimeData = healthPunchTimeIBLL.GetHealthPunchTimeEntity(keyValue);
+            var jsonData = new
+            {
+                HealthPunchTime = HealthPunchTimeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            healthPunchTimeIBLL.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)
+        {
+            HealthPunchTimeEntity entity = strEntity.ToObject<HealthPunchTimeEntity>();
+            var model = healthPunchTimeIBLL.GetTypeEntity(entity.Description);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                if (model != null)
+                {
+                    return Fail("当前时间段已存在！");
+                }
+            }
+            else
+            {
+                if (model != null && model.ID != keyValue)
+                {
+                    return Fail("当前时间段已存在！");
+                }
+            }
+            healthPunchTimeIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult EnableForm(string keyValue)
+        {
+            healthPunchTimeIBLL.EnableEntity(keyValue);
+            return Success("修改成功！");
+        }
+
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "体温上报";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="HealthPunchStu" >
+        <div class="lr-form-item-title">学生姓名</div>
+        <input id="StuNo" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="HealthPunchStu">
+        <div class="lr-form-item-title">体温上报<font face="宋体">*</font></div>
+        <input id="Temperature" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="HealthPunchStu" >
+        <div class="lr-form-item-title">打卡所在地址<font face="宋体">*</font></div>
+        <textarea id="Address" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/HealthPunchStu/Form.js")

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

@@ -0,0 +1,67 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-06-17 11:00
+ * 描  述：体温上报
+ */
+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 () {
+            $('#StuNo')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#StuNo').val(learun.clientdata.get(['userinfo']).realName);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/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())
+        };
+        var Num = $('#Temperature').val();
+        var NumOne = Num.split('.');
+        if (NumOne.length != 2) {
+            learun.alert.warning("请填写正确的体温！例如 : 36.0或37.5");
+            return false;
+        }
+        if (Num < 33 || Num > 44) {
+            learun.alert.warning("请填写正确的体温！");
+            return false;
+        }
+        Num = Num.substring(2);
+        if (Num.length != 2) {
+            learun.alert.warning("请填写正确的体温！例如 : 36.0或37.5");
+            return false;
+        }
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/PunchCard?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,26 @@
+@{
+    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>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/HealthPunchStu/Index.js")

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

@@ -0,0 +1,137 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-06-17 11:00
+ * 描  述：体温上报
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#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/HealthPunchStu/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/GetPageList',
+                headData: [
+                    { label: "学工号", name: "StuNo", width: 100, align: "left" },
+                    { label: "学生姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "Sex", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "男" : "女";
+                        }
+                    },
+                    {
+                        label: "所属院校", name: "F_School", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "所属专业", name: "MajorNo", width: 150, 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: 150, 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: "Grade", width: 100, align: "left" },
+                    { label: "联系方式", name: "Phone", width: 100, align: "left" },
+                    { label: "体温", name: "Temperature", width: 100, align: "left" },
+                    { label: "打卡所在地址", name: "Address", width: 200, align: "left" },
+                    { label: "打卡时间", name: "CreateTime", width: 140, align: "left" },
+                    { label: "备注", name: "Remark", width: 200, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc',  
+            });
+            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/EducationalAdministration/Views/HealthPunchStu/Statistics.cshtml

@@ -0,0 +1,61 @@
+@{
+    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>
+                                    <div id="F_School"></div>
+                                </div>
+                                <div class="col-xs-12 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="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="IsStatus"></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_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_lock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 禁/启用</a>
+                            <a id="lr_unlock" 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/EducationalAdministration/Views/HealthPunchStu/Statistics.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HealthPunchStu/Statistics.js

@@ -0,0 +1,177 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-06-17 09:17
+ * 描  述：健康打卡时段
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    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: '昨天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59', 'd', -1) } },
+                    { name: '前天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -2) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59', 'd', -2) } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '0',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#F_School').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#IsStatus').lrselect({
+                data: [{ text: "未打卡", value: "0" }, { text: "缺卡", value: "1" }, { text: "已打卡", value: "2" }],
+                text: "text",
+                value: "value"
+            })
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1 order by majorno asc" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno asc" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1 order by classno asc" }
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                value: "classno",
+                text: "classname"
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/GetStatistics',
+                headData: [
+                    {
+                        label: "院校", name: "F_School", width: 130, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 130, 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: 90, 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: "StuNo", width: 90, align: "left" },
+                    { label: "学生姓名", name: "StuName", width: 150, align: "left" },
+                    { label: "联系方式", name: "Phone", width: 100, align: "left" },
+                    {
+                        label: "日期", name: "DKDate", width: 90, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "早打卡地址", name: "Address1", width: 200, align: "left" },
+                    { label: "午打卡地址", name: "Address2", width: 200, align: "left" },
+                    { label: "晚打卡地址", name: "Address3", width: 200, align: "left" },
+                    { label: "早体温", name: "Temperature1", width: 80, align: "left" },
+                    { label: "午体温", name: "Temperature2", width: 80, align: "left" },
+                    { label: "晚体温", name: "Temperature3", width: 80, align: "left" },
+                    {
+                        label: "打卡状态", name: "Num", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-danger\">未打卡</span>';
+                            } else if (cellvalue < "3") {
+                                return '<span class=\"label label-warning\">缺卡</span>';
+                            } else if (cellvalue == "3") {
+                                return "<span class=\"label label-success\">已打卡</span>";
+                            }
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'DKDate desc,MajorNo asc,ClassNo asc',
+
+            });
+            page.search();
+        },
+        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/EducationalAdministration/Views/HealthPunchStu/StatisticsTeach.cshtml

@@ -0,0 +1,42 @@
+@{
+    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-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="IsStatus"></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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/HealthPunchStu/StatisticsTeach.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HealthPunchStu/StatisticsTeach.js

@@ -0,0 +1,147 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-06-17 09:17
+ * 描  述：健康打卡时段
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    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: '昨天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59', 'd', -1) } },
+                    { name: '前天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -2) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59', 'd', -2) } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '0',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#IsStatus').lrselect({
+                data: [{ text: "未打卡", value: "0" }, { text: "缺卡", value: "1" }, { text: "已打卡", value: "2" }],
+                text: "text",
+                value: "value"
+            })
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/HealthPunchStu/GetStatisticsTeach',
+                headData: [
+                    {
+                        label: "院校", name: "F_School", width: 130, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 130, 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: 90, 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: "StuNo", width: 90, align: "left" },
+                    { label: "学生姓名", name: "StuName", width: 150, align: "left" },
+                    { label: "联系方式", name: "Phone", width: 100, align: "left" },
+                    {
+                        label: "日期", name: "DKDate", width: 90, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    { label: "早打卡地址", name: "Address1", width: 200, align: "left" },
+                    { label: "午打卡地址", name: "Address2", width: 200, align: "left" },
+                    { label: "晚打卡地址", name: "Address3", width: 200, align: "left" },
+                    { label: "早体温", name: "Temperature1", width: 80, align: "left" },
+                    { label: "午体温", name: "Temperature2", width: 80, align: "left" },
+                    { label: "晚体温", name: "Temperature3", width: 80, align: "left" },
+                    {
+                        label: "打卡状态", name: "Num", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-danger\">未打卡</span>';
+                            } else if (cellvalue < "3") {
+                                return '<span class=\"label label-warning\">缺卡</span>';
+                            } else if (cellvalue == "3") {
+                                return "<span class=\"label label-success\">已打卡</span>";
+                            }
+                        }
+                    },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'DKDate desc,MajorNo asc,ClassNo asc',
+
+            });
+            page.search();
+        },
+        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/EducationalAdministration/Views/HealthPunchTime/Form.cshtml

@@ -0,0 +1,35 @@
+@{
+    ViewBag.Title = "健康打卡时段";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="HealthPunchTime" >
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="StarTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="HealthPunchTime" >
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="HealthPunchTime" >
+        <div class="lr-form-item-title">描述<font face="宋体">*</font></div>
+        <div id="Description" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="HealthPunchTime" style="display: none; ">
+        <div class="lr-form-item-title">是否启用<font face="宋体">*</font></div>
+        <div id="CheckMark" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="HealthPunchTime" style="display: none; " >
+        <div class="lr-form-item-title">当前用户</div>
+        <input id="CreateUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="HealthPunchTime" style="display: none; " >
+        <div class="lr-form-item-title">当前时间</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="HealthPunchTime" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/HealthPunchTime/Form.js")

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

@@ -0,0 +1,56 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-06-17 09:17
+ * 描  述：健康打卡时段
+ */
+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 () {
+            $('#Description').lrDataItemSelect({ code: 'HealthPunchType' });
+            $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#CheckMark').lrselectSet("0");
+            $('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/HealthPunchTime/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 + '/EducationalAdministration/HealthPunchTime/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -0,0 +1,42 @@
+@{
+    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>
+                                    <div id="Description"></div>
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">是否启用</div>
+                                        <div id="CheckMark"></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_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_lock" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 禁/启用</a>
+                        @*<a id="lr_unlock" 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/EducationalAdministration/Views/HealthPunchTime/Index.js")

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

@@ -0,0 +1,148 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-06-17 09: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);
+            }, 220, 400);
+            $('#Description').lrDataItemSelect({ code: 'HealthPunchType' });
+            $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/HealthPunchTime/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (CheckMark !== 1) {
+                        learun.alert.warning("当前项目已启用不能编辑！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/HealthPunchTime/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    if (CheckMark !== 1) {
+                        learun.alert.warning("当前项目已启用不能删除！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/HealthPunchTime/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  启用
+            $('#lr_lock').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                console.log(keyValue)
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认启用！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/HealthPunchTime/EnableForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/HealthPunchTime/GetPageList',
+                headData: [
+                    { label: "开始时间", name: "StarTime", width: 100, align: "left" },
+                    { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+                    {
+                        label: "描述", name: "Description", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'HealthPunchType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "录入用户", name: "CreateUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "录入时间", name: "CreateTime", width: 200, align: "left" },
+                    {
+                        label: "是否启用", name: "CheckMark", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "<span class=\"label label-success\">启用</span>" :
+                                "<span class=\"label label-danger\">禁用</span>";
+                        }
+                    },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'Description asc',
+
+            });
+            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/EducationalAdministration/Views/SignUpAboutOnline/Form.js

@@ -20,7 +20,7 @@ var bootstrap = function ($, learun) {
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
-            $('#IsAccommodate').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#IsAccommodate').lrDataItemSelect({ code: 'YesOrNoBit' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -211,9 +211,10 @@ var bootstrap = function ($, learun) {
                     {
                         label: "是否住宿", name: "IsAccommodate", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
+
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'YesOrNoInt',
+                                code: 'YesOrNoBit',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

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

@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
             $('#Nationals').lrDataItemSelect({ code: 'National' });
             //政治面貌
             //$('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
-            $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' });
+            $('#Political').lrDataItemSelect({ code: 'PolityStatus' });
              $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml

@@ -147,7 +147,7 @@
 </div>
 <script>
 	var data = {
-		school: "北京金隅科技学校",
+		school: "北屯职业技术学校",
 		name: "薛礼根",
 		id: "14060219930602****",
 		type: "汉族",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.cshtml

@@ -88,9 +88,9 @@
         <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 class="lr-layout-tool-item">
                         <div id="DeptNo" type="lrselect" class="lr-select"></div>
-                    </div>*@
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="MajorNo" type="lrselect" class="lr-select"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js

@@ -21,7 +21,7 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#btn_Search').on('click', function () {
                 var p = {};
-                //p.DeptNo = $('#DeptNo').lrselectGet();
+                p.DeptNo = $('#DeptNo').lrselectGet();
                 p.MajorNo = $('#MajorNo').lrselectGet();
                 p.ClassNo = $('#ClassNo').lrselectGet();
                 p.StuNo = $('#StuNo').lrselectGet();
@@ -70,19 +70,19 @@ var bootstrap = function ($, learun) {
 
         },
         bindSelect: function () {
-            //$('#DeptNo').lrDataSourceSelect({
-            //    placeholder: "请选择系", code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
-            //        var deptno = "";
-            //        if (val) {
-            //            deptno = val.deptno;
-            //        }
-            //        $('#MajorNo').lrselectRefresh({
-            //            url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
-            //            text: "MajorName",
-            //            value: "MajorNo"
-            //        })
-            //    }
-            //});
+            $('#DeptNo').lrDataSourceSelect({
+                placeholder: "请选择系", code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
+                    var deptno = "";
+                    if (val) {
+                        deptno = val.deptno;
+                    }
+                    $('#MajorNo').lrselectRefresh({
+                        url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
+                        text: "MajorName",
+                        value: "MajorNo"
+                    })
+                }
+            });
             $('#MajorNo').lrDataSourceSelect({
                 placeholder: "请选择专业", code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
                     function (val) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.cshtml

@@ -88,9 +88,9 @@
         <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 class="lr-layout-tool-item">
                         <div id="ClassNo" type="lrselect" class="lr-select"></div>
-                    </div>*@
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="StuNo" type="lrselect" class="lr-select"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndexTeacher.js

@@ -22,7 +22,7 @@ var bootstrap = function ($, learun) {
                 var p = {};
                 p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
                 p.Semester = $('#Semester').lrselectGet();
-                //p.ClassNo = $('#ClassNo').lrselectGet();
+                p.ClassNo = $('#ClassNo').lrselectGet();
                 p.TableName = $('#TableName').lrselectGet();
                 p.StuNo = $('#StuNo').lrselectGet();
                 if (p.AcademicYearNo == null || p.AcademicYearNo == "") {
@@ -33,10 +33,10 @@ var bootstrap = function ($, learun) {
                     learun.alert.warning("请选择学期！");
                     return;
                 }
-                //if (p.ClassNo == null || p.ClassNo == "") {
-                //    learun.alert.warning("请选择班级！");
-                //    return;
-                //}
+                if (p.ClassNo == null || p.ClassNo == "") {
+                    learun.alert.warning("请选择班级！");
+                    return;
+                }
                 $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoData', p,
                     function (data) {
                         var temparr = [];

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js

@@ -215,10 +215,13 @@ var bootstrap = function ($, learun) {
                     {
                         label: "状态", name: "SendFlag", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
+                            console.log(cellvalue);
                             if (cellvalue === 1) {
                                 return '<span class=\"label label-warning\">审批中</span>';
                             } else if (cellvalue === 2) {
                                 return '<span class=\"label label-success\">已下发</span>';
+                            } else if (cellvalue === 4) {
+                                return '<span class=\"label label-default\" >下发完毕</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_LGManager/Views/ContractManage/Index.js

@@ -27,8 +27,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/LR_LGManager/ContractManage/Form',
-                    width: 600,
-                    height: 400,
+                    width: 700,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -42,8 +42,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/LR_LGManager/ContractManage/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 700,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -90,8 +90,7 @@ var bootstrap = function ($, learun) {
                     { label: "乙方", name: "Buyers", width: 100, align: "left"},
                     { label: "乙方代表", name: "Buyers_Representative", width: 100, align: "left"},
                     { label: "签约地点", name: "SignedAt", width: 100, align: "left"},
-                    { label: "签约日期", name: "SignedDate", width: 100, align: "left"},
-                    { label: "合同详细", name: "Contract_Explain", width: 100, align: "left"},
+                    { label: "签约日期", name: "SignedDate", width: 100, align: "left"}
                 ],
                 mainId:'Id',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_LGManager/Views/ContractType/Index.js

@@ -78,14 +78,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "类型名称", name: "TypeName", width: 100, align: "left"},
                     { label: "启用", name: "IsUse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                 ],
                 mainId:'Id',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_LGManager/Views/E_journal/Index.js

@@ -26,8 +26,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/LR_LGManager/E_journal/Form',
-                    width: 600,
-                    height: 400,
+                    width: 700,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -41,8 +41,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/LR_LGManager/E_journal/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 700,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -75,8 +75,7 @@ var bootstrap = function ($, learun) {
                     { label: "期刊名称", name: "JournalName", width: 100, align: "left"},
                     { label: "期数", name: "Phase", width: 100, align: "left"},
                     { label: "来源", name: "Author", width: 100, align: "left"},
-                    { label: "发布日期", name: "Createdate", width: 100, align: "left"},
-                    { label: "详细内容", name: "JournalContent", width: 100, align: "left"},
+                    { label: "发布日期", name: "Createdate", width: 100, align: "left"}
                 ],
                 mainId:'Id',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_LGManager/Views/Endorsements/Index.js

@@ -91,14 +91,8 @@ var bootstrap = function ($, learun) {
                     { label: "扣分", name: "Penalty", width: 100, align: "left"},
                     { label: "罚款", name: "Fine_Money", width: 100, align: "left"},
                     { label: "是否处理", name: "Finish_Punish", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "备注", name: "Endors_Description", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_LGManager/Views/EventApp/Index.js

@@ -86,14 +86,8 @@ var bootstrap = function ($, learun) {
                     { label: "申请日期", name: "App_Date", width: 100, align: "left"},
                     { label: "审核意见", name: "LeaderView", width: 100, align: "left"},
                     { label: "申请通过与否", name: "IsPassed", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "备注", name: "Remark", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_LGManager/Views/Vote_Manage/Index.js

@@ -81,14 +81,8 @@ var bootstrap = function ($, learun) {
                     { label: "反对票", name: "Vote_Against", width: 100, align: "left"},
                     { label: "赞成票", name: "Vote_for", width: 100, align: "left"},
                     { label: "投票是否完成", name: "IsFinish", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "投票结果", name: "Vote_Desc", width: 100, align: "left"},
                 ],

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

@@ -38,6 +38,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
              return View();
         }
+
+        [HttpGet]
+        public ActionResult FormView()
+        {
+             return View();
+        }
         #endregion
 
         #region  获取数据

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

@@ -21,11 +21,10 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                    </div>
+                  
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -77,7 +77,17 @@ var bootstrap = function ($, learun) {
                     { label: "纪要标题", name: "Title", width: 150, align: "left" },
                     { label: "内容", name: "Content", width: 150, align: "left" },
                     { label: "创建时间", name: "CreateTime", width: 100, align: "left" },
-                    { label: "创建人", name: "CreateUser", width: 100, align: "left" },
+                    {
+                        label: "创建人", name: "CreateUser", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        } },
                 ],
                 mainId: 'ID',
                 isPage: true,

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

@@ -17,7 +17,8 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="PMDues">
         <div class="lr-form-item-title">缴费状态</div>
-        <input id="PayStatus" type="text" class="form-control" />
-    </div>
+        <div id="PayStatus">
+            </div>
+        </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/PMDues/Form.js")

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

@@ -15,6 +15,10 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#PayStatus').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoBit',
+            });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -17,10 +17,6 @@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
-                        <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>
-                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -68,8 +68,10 @@ var bootstrap = function ($, learun) {
                     { label: "党员", name: "PID", width: 100, align: "left"},
                     { label: "金额", name: "Amount", width: 100, align: "left"},
                     { label: "支付时间", name: "PayTime", width: 100, align: "left"},
-                    { label: "缴费状态", name: "PayStatus", width: 100, align: "left"},
-                    { label: "审核状态", name: "CheckStatus", width: 100, align: "left"},
+                    {
+                        label: "缴费状态", name: "PayStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }}
                 ],
                 mainId:'ID',
                 isPage: true

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

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "党建会议管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">会议主题<font face="宋体">*</font></div>
+        <input id="Title" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  readonly="readonly"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">会议纪要</div>
+        <textarea id="Tips" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">会议资料</div>
+        <div id="Files" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">会议时间<font face="宋体">*</font></div>
+        <input id="Time" type="text" class="form-control lr-input-wdatepicker"  isvalid="yes" checkexpession="NotNull"  readonly="readonly"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">会议地点</div>
+        <input id="Address" type="text" class="form-control"  readonly="readonly"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">参与人员</div>
+        <textarea id="People" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PMMeeting">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly="readonly"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/PMMeeting/FormView.js")

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

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-10 10:02
+ * 描  述：党建会议管理
+ */
+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 () {
+            $('#Files').lrUploader();
+            $("#lrUploader_uploadBtn_Files").hide();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/PMMeeting/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/PMMeeting/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -22,11 +22,10 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                    </div>
+                    <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_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                    <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

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

@@ -49,6 +49,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/PMMeeting/FormView?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        btn:null
+                    });
+                }
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
@@ -71,7 +84,6 @@ var bootstrap = function ($, learun) {
                     { label: "姓名", name: "Name", width: 100, align: "left"},
                     { label: "会议主题", name: "Title", width: 100, align: "left"},
                     { label: "会议纪要", name: "Tips", width: 100, align: "left"},
-                    { label: "会议资料", name: "Files", width: 100, align: "left"},
                     { label: "会议时间", name: "Time", width: 100, align: "left"},
                     { label: "会议地点", name: "Address", width: 100, align: "left"},
                     { label: "参与人员", name: "People", width: 100, align: "left"},

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

@@ -15,6 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#EStatus').lrDataItemSelect({ code: 'JobStatus' });
+
             $('#EID').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
@@ -27,7 +29,6 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#EStatus').lrDataItemSelect({ code: 'JobStatus' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -104,10 +104,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "教师姓名", name: "EID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
                                 key: value,
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
@@ -117,9 +119,9 @@ var bootstrap = function ($, learun) {
                             return cellvalue == 1 ? "男" : "女"
                         }
                     },
-                    {
-                        label: "出生年月", name: "Birthday", width: 100, align: "left"
-                    },
+                    //{
+                    //    label: "出生年月", name: "Birthday", width: 100, align: "left"
+                    //},
                     { label: "评定时间", name: "TTTime", width: 100, align: "left" },
                     {
                         label: "评定职称", name: "TTTitlesID", width: 100, align: "left",

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

@@ -73,10 +73,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "教师姓名", name: "EID", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
                                 key: value,
+                                keyId: 'f_userid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/CognitiveAbility/Index.js

@@ -78,14 +78,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "认知类型", name: "Ability_Type", width: 100, align: "left"},
                     { label: "启用", name: "IsUse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "能力问题", name: "Ability_Subject", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/EnvironmentFactor/Index.js

@@ -80,14 +80,8 @@ var bootstrap = function ($, learun) {
                     { label: "环境名称", name: "EnvironmentName", width: 100, align: "left"},
                     { label: "责任人", name: "Manager", width: 100, align: "left"},
                     { label: "启用", name: "IsUse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "环境说明", name: "Environment_Description", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Form.js

@@ -17,7 +17,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#Sex').lrRadioCheckbox({
                 type: 'radio',
-                code: '001',
+                code: 'usersexbit',
             });
             $('#Nation').lrDataItemSelect({ code: 'National' });
             $('#Politics').lrDataItemSelect({ code: 'PolityStatus' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/GreenChannel/Index.js

@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {
                                  key: value,
-                                 code: '001',
+                                 code: 'usersexbit',
                                  callback: function (_data) {
                                      callback(_data.text);
                                  }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/NewStuPhysical/Index.js

@@ -115,14 +115,8 @@ var bootstrap = function ($, learun) {
                     { label: "学生姓名", name: "Stuname", width: 100, align: "left"},
                     { label: "学号", name: "StuNo", width: 100, align: "left"},
                     { label: "是否有异常", name: "HaveAbnormal", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "体检日期", name: "CheckDate", width: 100, align: "left"},
                     { label: "体检结果", name: "PhysicalResult", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/ReliefPolicy/Index.js

@@ -77,14 +77,8 @@ var bootstrap = function ($, learun) {
                     { label: "政策名称", name: "Policy_name", width: 100, align: "left"},
                     { label: "减免金额", name: "Policy_money", width: 100, align: "left"},
                     { label: "启用", name: "Isuse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "政策详细说明", name: "Policy_Description", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SemesterPolicy/Index.js

@@ -89,14 +89,8 @@ var bootstrap = function ($, learun) {
                     { label: "政策名称", name: "Policy_name", width: 100, align: "left"},
                     { label: "减免金额", name: "Policy_money", width: 100, align: "left"},
                     { label: "启用", name: "Isuse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "政策说明", name: "Policy_Description", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/Student_Emotion/Index.js

@@ -78,14 +78,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "类型", name: "Emotion_Type", width: 100, align: "left"},
                     { label: "启用", name: "IsUse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "情绪问询", name: "Emotion_Subject", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/StudyMotive/Index.js

@@ -78,14 +78,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "类型", name: "Motive_Type", width: 100, align: "left"},
                     { label: "启用", name: "IsUse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "动机问询", name: "Motive_Subject", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/SubjectAttainment/Index.js

@@ -88,14 +88,8 @@ var bootstrap = function ($, learun) {
                              });
                         }},
                     { label: "启用", name: "IsUse", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('dataItem', {
-                                 key: value,
-                                 code: 'YesOrNoBit',
-                                 callback: function (_data) {
-                                     callback(_data.text);
-                                 }
-                             });
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                     { label: "核心素养", name: "CoreQuality", width: 100, align: "left"},
                     { label: "素养说明", name: "Attainment_Description", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -13,6 +13,7 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
 using Quanjiang.DigitalScholl.WebLicense;
 using Learun.Application.TwoDevelopment.LogisticsManagement;
 using System.Linq;
+using Learun.Application.Mapping;
 using Learun.Application.OA;
 using Learun.Application.TwoDevelopment.LR_Desktop;
 using Learun.Application.TwoDevelopment.Permission;
@@ -61,6 +62,7 @@ namespace Learun.Application.Web.Controllers
         private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL();
         private StudentLeaveIBLL studentLeaveIBLL = new StudentLeaveBLL();
         private StudentLeave_zcIBLL studentLeave_ZcIBLL = new StudentLeave_zcBLL();
+        MessageRindIBLL messageRindIbll=new MessageRindBLL();
         #region  视图功能
 
         public ActionResult ChangePwd()
@@ -520,6 +522,22 @@ namespace Learun.Application.Web.Controllers
             {
                 ViewBag.wsbsdt = 1;
             }
+            var empinfo = empInfoIbll.GetEmpInfoEntityByEmpNo(userinfo.account);
+            if (empinfo != null&&empinfo.Birthday.HasValue&&empinfo.Birthday.Value.ToString("yyyy-MM-dd")==DateTime.Now.ToString("yyyy-MM-dd")) 
+            {
+                //生日提醒
+                MessageRemindEntity messageRemindEntity = new MessageRemindEntity();
+                messageRemindEntity.Create();
+                messageRemindEntity.ReceiptId = userinfo.userId;
+                messageRemindEntity.ReceiptName = userinfo.realName;
+                messageRemindEntity.SenderId = "system";
+                messageRemindEntity.SenderName = "超级管理员";
+                messageRemindEntity.TheTitle = "生日提醒";
+                messageRemindEntity.TheContent = "今天是您的生日，智慧校园祝您生日快乐！";
+                messageRemindEntity.SendTime = DateTime.Now;
+                messageRemindEntity.ReadSigns = false;
+                messageRindIbll.SaveEntity(null, messageRemindEntity);
+            }
             switch (learn_UItheme)
             {
                 case "1":

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

@@ -337,6 +337,8 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamStudentController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Exam_ExamTeacherTimeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Exam_InvigilateTeacherController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchStuController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\HealthPunchTimeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LeaveSchoolAController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\LR_Base_LogoController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\MealCardRunTabController.cs" />
@@ -1198,6 +1200,12 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_InvigilateTeacher\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormPeople.js" />
     <Content Include="Areas\EducationalAdministration\Views\FillinFrom\FormIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Statistics.js" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\StatisticsTeach.js" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\InternShipLog\UploadForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\InternshipPlanPost\UploadForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\InternShipSummary\UploadForm.js" />
@@ -1396,6 +1404,12 @@
     <Content Include="Areas\EducationalAdministration\Views\PracticeAssess\UploadForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PracticeUnitVisit\UploadForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\PracticeMaterial\UploadForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\Statistics.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchStu\StatisticsTeach.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\HealthPunchTime\Index.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\StuInfoBasic\Printxjk.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />
@@ -1894,6 +1908,7 @@
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyApply.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingNotice\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\PMMeeting\FormView.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
@@ -8452,6 +8467,7 @@
     <Content Include="Areas\LogisticsManagement\Views\NetworkRepair\Statistics.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\NetworkPracticalRepair\Statistics.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\LogisticsLaultRepair\Statistics.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\PMMeeting\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/HealthPunchStuMap.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-06-17 11:00
+    /// 描 述：体温上报
+    /// </summary>
+    public class HealthPunchStuMap : EntityTypeConfiguration<HealthPunchStuEntity>
+    {
+        public HealthPunchStuMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("HEALTHPUNCHSTU");
+            //主键
+            this.HasKey(t => t.ID);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/HealthPunchTimeMap.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-06-17 09:17
+    /// 描 述：健康打卡时段
+    /// </summary>
+    public class HealthPunchTimeMap : EntityTypeConfiguration<HealthPunchTimeEntity>
+    {
+        public HealthPunchTimeMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("HEALTHPUNCHTIME");
+            //主键
+            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

@@ -96,6 +96,8 @@
     <Compile Include="EducationalAdministration\Exam_ExamStudent.cs" />
     <Compile Include="EducationalAdministration\Exam_ExamTeacherTimeMap.cs" />
     <Compile Include="EducationalAdministration\Exam_InvigilateTeacherMap.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchStuMap.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchTimeMap.cs" />
     <Compile Include="EducationalAdministration\LeaveSchoolMap.cs" />
     <Compile Include="EducationalAdministration\MealCardRunTabMap.cs" />
     <Compile Include="EducationalAdministration\PM_CertificateMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs

@@ -225,7 +225,7 @@ namespace Learun.Application.OA
             this.F_CreateDate = DateTime.Now;
             this.F_ReleaseTime = DateTime.Now;
             this.F_DeleteMark = 0;
-            this.F_EnabledMark = 0;
+            this.F_EnabledMark = 1;
             F_Status = "0";
             this.F_PV = 0;
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HealthPunchStu/HealthPunchStuBLL.cs

@@ -0,0 +1,191 @@
+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-06-17 11:00
+    /// 描 述：体温上报
+    /// </summary>
+    public class HealthPunchStuBLL : HealthPunchStuIBLL
+    {
+        private HealthPunchStuService healthPunchStuService = new HealthPunchStuService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchStuEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return healthPunchStuService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取HealthPunchStu表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public HealthPunchStuEntity GetHealthPunchStuEntity(string keyValue)
+        {
+            try
+            {
+                return healthPunchStuService.GetHealthPunchStuEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 统计数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchStuEntity> GetStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return healthPunchStuService.GetStatistics(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 统计数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchStuEntity> GetStatisticsTeach(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return healthPunchStuService.GetStatisticsTeach(pagination, queryJson);
+            }
+            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
+            {
+                healthPunchStuService.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>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, HealthPunchStuEntity entity)
+        {
+            try
+            {
+                healthPunchStuService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public string PunchCard(string keyValue, HealthPunchStuEntity entity)
+        {
+            try
+            {
+                return healthPunchStuService.PunchCard(keyValue, entity);
+            }
+            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/HealthPunchStu/HealthPunchStuEntity.cs

@@ -0,0 +1,167 @@
+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-06-17 11:00
+    /// 描 述：体温上报
+    /// </summary>
+    public class HealthPunchStuEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// 打卡开始时间
+        /// </summary>
+        [Column("STARTTIME")]
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 打卡结束时间
+        /// </summary>
+        [Column("ENDRTIME")]
+        public string EndRTime { get; set; }
+        /// <summary>
+        /// 学号
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 学生名称
+        /// </summary>
+        [Column("STUNAME")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// Sex
+        /// </summary>
+        [Column("SEX")]
+        public int? Sex { get; set; }
+        /// <summary>
+        /// 温度
+        /// </summary>
+        [Column("TEMPERATURE")]
+        public string Temperature { get; set; }
+        /// <summary>
+        /// 年级
+        /// </summary>
+        [Column("GRADE")]
+        public string Grade { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// DeptNo
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
+        /// <summary>
+        /// MajorNo
+        /// </summary>
+        [Column("MAJORNO")]
+        public string MajorNo { get; set; }
+        /// <summary>
+        /// F_School
+        /// </summary>
+        [Column("F_SCHOOL")]
+        public string F_School { get; set; }
+        /// <summary>
+        /// Phone
+        /// </summary>
+        [Column("PHONE")]
+        public string Phone { get; set; }
+        /// <summary>
+        /// Year
+        /// </summary>
+        [Column("YEAR")]
+        public string Year { get; set; }
+        /// <summary>
+        /// DKDate
+        /// </summary>
+        [Column("DKDATE")]
+        public DateTime? DKDate { get; set; }
+        /// <summary>
+        /// Moth
+        /// </summary>
+        [Column("MOTH")]
+        public string Moth { get; set; }
+        /// <summary>
+        /// Day
+        /// </summary>
+        [Column("DAY")]
+        public string Day { get; set; }
+        /// <summary>
+        /// DKType
+        /// </summary>
+        [Column("DKTYPE")]
+        public string DKType { get; set; }
+        /// <summary>
+        /// Address
+        /// </summary>
+        [Column("ADDRESS")]
+        public string Address { get; set; }
+        /// <summary>
+        /// 打卡时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.ID = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+
+        [NotMapped]
+        public string Address1 { get; set; }
+        [NotMapped]
+        public string Address2 { get; set; }
+        [NotMapped]
+        public string Address3 { get; set; }
+
+        [NotMapped]
+        public string Temperature1 { get; set; }
+        [NotMapped]
+        public string Temperature2 { get; set; }
+        [NotMapped]
+        public string Temperature3 { get; set; }
+        [NotMapped]
+        public string Num { get; set; }
+        #endregion
+
+        public class StuList
+        {
+            public string StuName { get; set; }
+            public string StuNo { get; set; }
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HealthPunchStu/HealthPunchStuIBLL.cs

@@ -0,0 +1,65 @@
+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-06-17 11:00
+    /// 描 述：体温上报
+    /// </summary>
+    public interface HealthPunchStuIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<HealthPunchStuEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取HealthPunchStu表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        HealthPunchStuEntity GetHealthPunchStuEntity(string keyValue);
+        /// <summary>
+        /// 统计数据
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        IEnumerable<HealthPunchStuEntity> GetStatistics(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 教师统计数据
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        IEnumerable<HealthPunchStuEntity> GetStatisticsTeach(Pagination pagination, string queryJson);
+        #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, HealthPunchStuEntity entity);
+
+        string PunchCard(string keyValue, HealthPunchStuEntity entity);
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HealthPunchStu/HealthPunchStuService.cs

@@ -0,0 +1,465 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-06-17 11:00
+    /// 描 述：体温上报
+    /// </summary>
+    public class HealthPunchStuService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchStuEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"* ");
+                strSql.Append("  FROM HealthPunchStu t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<HealthPunchStuEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取HealthPunchStu表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public HealthPunchStuEntity GetHealthPunchStuEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<HealthPunchStuEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchStuEntity> GetStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                string sql1 = " ";
+                string sql2 = " ";
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    sql1 = " and DkDate >= '" + queryParam["StartTime"].ToDate()
+                        + "' and DkDate <= '" + queryParam["EndTime"].ToDate() + "' ";
+                }
+                if (!queryParam["F_School"].IsEmpty())
+                {
+                    sql2 = " and F_School ='" + queryParam["F_School"].ToString() + "' ";
+                }
+                if (!queryParam["MajorNo"].IsEmpty())
+                {
+                    sql2 += " and MajorNo ='" + queryParam["MajorNo"].ToString() + "'";
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    sql2 += " and ClassNo ='" + queryParam["ClassNo"].ToString() + "'";
+                }
+
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    sql2 += " and StuNo like '%" + queryParam["StuNo"].ToString() + "%'";
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    sql2 += " and StuName like '%" + queryParam["StuName"].ToString() + "%'";
+                }
+                if (!queryParam["IsStatus"].IsEmpty())
+                {
+                    string Num = queryParam["IsStatus"].ToString();
+                    if (Num == "0")
+                    {
+                        sql2 += " and t.num = '" + Num + "' ";
+                    }
+                    else if (Num == "1")
+                    {
+                        sql2 += " and t.num < '3' and t.num <> '0' ";
+                    }
+                    else if (Num == "2")
+                    {
+                        sql2 += " and t.num = '3' ";
+                    }
+                }
+
+                strSql.Append(@" select * from (
+                                select  zb.F_SchoolId as F_School,zb.MajorNo,zb.ClassNo,zb.StuNo,zb.StuName,zb.mobile,isnull(fb.DkDate,Getdate()) as DkDate,
+                                fb.Address1,fb.Address2,fb.Address3,fb.Temperature1,fb.Temperature2,fb.Temperature3,isnull(fb.Num,0) as Num from StuInfoBasic zb 
+                                left join (
+                                select hps.*,aa.address as Address1,aa.Temperature as Temperature1 ,bb.address as Address2,bb.Temperature as Temperature2,cc.address as Address3 ,cc.Temperature
+                                as Temperature3,dd.Num  from (
+                                select StuNo,StuName,DkDate from HealthPunchStu hps  where 1=1  " + sql1 + "");
+                strSql.Append(@" group by StuNo,StuName,DkDate) hps
+                                left join (select * from HealthPunchStu where 1=1  " + sql1 + "");
+                strSql.Append(@" ) AA  on AA.StuNo=hps.StuNo and AA.StuName=hps.StuName and AA.dkType=1
+                                left join (select * from HealthPunchStu where 1=1  " + sql1 + "");
+                strSql.Append(@" ) BB on  BB.StuNo=hps.Stuno and BB.StuName=hps.StuName and BB.dkType=2
+                                left join (select * from HealthPunchStu where 1=1  " + sql1 + "");
+                strSql.Append(@" ) CC on  CC.StuNo=hps.Stuno and CC.StuName=hps.StuName and CC.dkType=3
+                                left join (select Stuno,Count(*) as num from HealthPunchStu hps where 1=1 " + sql1 + " ");
+                strSql.Append(@"  group by Stuno  ) dd on dd.StuNo=hps.Stuno
+                                ) fb on fb.Stuno = zb.stuno and fb.StuName = zb.StuName  
+            )t   where 1= 1 " + sql1 + sql2 + " ");
+                return this.BaseRepository("CollegeMIS").FindList<HealthPunchStuEntity>(strSql.ToString(), pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchStuEntity> GetStatisticsTeach(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var account = LoginUserInfo.Get().account;
+                var classinfo = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(x => x.ClassDiredctorNo == account).ToList();
+                var strSql = new StringBuilder();
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                string sql1 = " ";
+                string sql2 = " ";
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    sql1 = " and DkDate >= '" + queryParam["StartTime"].ToDate()
+                        + "' and DkDate <= '" + queryParam["EndTime"].ToDate() + "' ";
+                }
+                if (classinfo.Count > 0)
+                {
+                    var classno = classinfo.FirstOrDefault();
+                    if (classinfo.Count == 1)
+                    {
+                        sql2 += " and ClassNo ='" + classno.ClassNo + "'";
+                    }
+                    else
+                    {
+                        sql2 += " and (";
+                        for (int i = 0; i < classinfo.Count; i++)
+                        {
+                            if (i == 0)
+                            {
+                                sql2 += " classno ='" + classinfo[i].ClassNo + "' ";
+                            }
+                            else
+                            {
+                                sql2 += " or classno ='" + classinfo[i].ClassNo + "' ";
+                            }
+                        }
+                        sql2 += ")";
+                    }
+                }
+                else
+                {
+                    sql2 += " and t.num = '-1' ";
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    sql2 += " and ClassNo ='" + queryParam["ClassNo"].ToString() + "'";
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    sql2 += " and StuNo like '%" + queryParam["StuNo"].ToString() + "%'";
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    sql2 += " and StuName like '%" + queryParam["StuName"].ToString() + "%'";
+                }
+                if (!queryParam["IsStatus"].IsEmpty())
+                {
+                    string Num = queryParam["IsStatus"].ToString();
+                    if (Num == "0")
+                    {
+                        sql2 += " and t.num = '" + Num + "' ";
+                    }
+                    else if (Num == "1")
+                    {
+                        sql2 += " and t.num < '3' and t.num <> '0' ";
+                    }
+                    else if (Num == "2")
+                    {
+                        sql2 += " and t.num = '3' ";
+                    }
+                }
+
+                strSql.Append(@" select * from (
+                                select  zb.F_SchoolId as F_School,zb.MajorNo,zb.ClassNo,zb.StuNo,zb.StuName,zb.mobile,isnull(fb.DkDate,Getdate()) as DkDate,
+                                fb.Address1,fb.Address2,fb.Address3,fb.Temperature1,fb.Temperature2,fb.Temperature3,isnull(fb.Num,0) as Num from StuInfoBasic zb 
+                                left join (
+                                select hps.*,aa.address as Address1,aa.Temperature as Temperature1 ,bb.address as Address2,bb.Temperature as Temperature2,cc.address as Address3 ,cc.Temperature
+                                as Temperature3,dd.Num  from (
+                                select StuNo,StuName,DkDate from HealthPunchStu hps  where 1=1  " + sql1 + "");
+                strSql.Append(@" group by StuNo,StuName,DkDate) hps
+                                left join (select * from HealthPunchStu where 1=1  " + sql1 + "");
+                strSql.Append(@" ) AA  on AA.StuNo=hps.StuNo and AA.StuName=hps.StuName and AA.dkType=1
+                                left join (select * from HealthPunchStu where 1=1  " + sql1 + "");
+                strSql.Append(@" ) BB on  BB.StuNo=hps.Stuno and BB.StuName=hps.StuName and BB.dkType=2
+                                left join (select * from HealthPunchStu where 1=1  " + sql1 + "");
+                strSql.Append(@" ) CC on  CC.StuNo=hps.Stuno and CC.StuName=hps.StuName and CC.dkType=3
+                                left join (select Stuno,Count(*) as num from HealthPunchStu hps where 1=1 " + sql1 + " ");
+                strSql.Append(@"  group by Stuno  ) dd on dd.StuNo=hps.Stuno
+                                ) fb on fb.Stuno = zb.stuno and fb.StuName = zb.StuName  
+            )t   where 1= 1 " + sql1 + sql2 + " ");
+                return this.BaseRepository("CollegeMIS").FindList<HealthPunchStuEntity>(strSql.ToString(), pagination);
+            }
+            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<HealthPunchStuEntity>(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>
+        public void SaveEntity(string keyValue, HealthPunchStuEntity entity)
+        {
+            try
+            {
+                var userInfo = LoginUserInfo.Get();
+                var stuInfo = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(x => x.StuNo == userInfo.account);
+                if (stuInfo != null)
+                {
+                    entity.StuNo = stuInfo.StuNo;
+                    entity.StuName = userInfo.realName;
+                    entity.Phone = stuInfo.mobile;
+                    entity.F_School = stuInfo.F_SchoolId;
+                    entity.DeptNo = stuInfo.DeptNo;
+                    entity.MajorNo = stuInfo.MajorNo;
+                    entity.ClassNo = stuInfo.ClassNo;
+                    entity.Grade = stuInfo.Grade;
+                    entity.Sex = Convert.ToInt32(stuInfo.GenderNo);
+                    entity.CreateTime = DateTime.Now;
+                    entity.DKDate = DateTime.Now;
+                    entity.Year = DateTime.Now.Year.ToString();
+                    entity.Moth = DateTime.Now.Month.ToString();
+                    entity.Day = DateTime.Now.Day.ToString();
+                }
+                entity.Create();
+                this.BaseRepository("CollegeMIS").Insert(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public string PunchCard(string keyValue, HealthPunchStuEntity entity)
+        {
+            try
+            {
+                //获取打卡规则
+                var dktime1 = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchTimeEntity>(x => x.CheckMark == 0 && x.Description == "1");
+                var dktime2 = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchTimeEntity>(x => x.CheckMark == 0 && x.Description == "2");
+                var dktime3 = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchTimeEntity>(x => x.CheckMark == 0 && x.Description == "3");
+
+                var datenow = DateTime.Now.ToString("yyyy-MM-dd");
+                DateTime Nowdate = DateTime.Now;
+                DateTime todyTime = DateTime.Now.Date;
+                var userInfo = LoginUserInfo.Get();
+
+                if (dktime1 != null && dktime2 != null && dktime3 != null)
+                {
+                    DateTime Startime1 = Convert.ToDateTime(datenow + " " + dktime1.StarTime);
+                    DateTime Startime2 = Convert.ToDateTime(datenow + " " + dktime1.EndTime);
+                    DateTime Startime3 = Convert.ToDateTime(datenow + " " + dktime2.StarTime);
+                    DateTime Startime4 = Convert.ToDateTime(datenow + " " + dktime2.EndTime);
+                    DateTime Startime5 = Convert.ToDateTime(datenow + " " + dktime3.StarTime);
+                    DateTime Startime6 = Convert.ToDateTime(datenow + " " + dktime3.EndTime);
+
+                    #region 学生数据
+                    var stuInfo = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(x => x.StuNo == userInfo.account);
+                    if (stuInfo != null)
+                    {
+                        entity.StuNo = stuInfo.StuNo;
+                        entity.StuName = userInfo.realName;
+                        entity.Phone = stuInfo.mobile;
+                        entity.F_School = stuInfo.F_SchoolId;
+                        entity.DeptNo = stuInfo.DeptNo;
+                        entity.MajorNo = stuInfo.MajorNo;
+                        entity.ClassNo = stuInfo.ClassNo;
+                        entity.Grade = stuInfo.Grade;
+                        entity.Sex = Convert.ToInt32(stuInfo.GenderNo);
+                        entity.CreateTime = DateTime.Now;
+                        entity.DKDate = DateTime.Now;
+                        entity.Year = DateTime.Now.Year.ToString();
+                        entity.Moth = DateTime.Now.Month.ToString();
+                        entity.Day = DateTime.Now.Day.ToString();
+                    }
+                    else
+                    {
+                        return "学生数据不存在!";
+                    }
+                    #endregion
+
+                    if (Startime1 <= Nowdate && Startime2 >= Nowdate) //早上打卡
+                    {
+                        var HealthPunchStu = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchStuEntity>(x => x.DKDate == todyTime && x.DKType == "1" && x.StuNo == userInfo.account);
+                        if (HealthPunchStu == null)
+                        {
+                            entity.DKType = "1";
+                        }
+                        else
+                        {
+                            return "请勿重复打卡!";
+                        }
+                    }
+                    else if (Startime3 <= Nowdate && Startime4 >= Nowdate)
+                    {
+                        var HealthPunchStu = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchStuEntity>(x => x.DKDate == todyTime && x.DKType == "2" && x.StuNo == userInfo.account);
+                        if (HealthPunchStu == null)
+                        {
+                            entity.DKType = "2";
+                        }
+                        else
+                        {
+                            return "请勿重复打卡!";
+                        }
+                    }
+                    else if (Startime5 <= Nowdate && Startime6 >= Nowdate)
+                    {
+                        var HealthPunchStu = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchStuEntity>(x => x.DKDate == todyTime && x.DKType == "3" && x.StuNo == userInfo.account);
+                        if (HealthPunchStu == null)
+                        {
+                            entity.DKType = "3";
+                        }
+                        else
+                        {
+                            return "请勿重复打卡";
+                        }
+                    }
+                    else
+                    {
+                        return "请在规定的时间段内打卡!";
+                    }
+                }
+                else
+                {
+                    return "请先设置打卡时间";
+                }
+                entity.Create();
+                this.BaseRepository("CollegeMIS").Insert(entity);
+                return "保存成功";
+            }
+            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/EducationalAdministration/HealthPunchTime/HealthPunchTimeBLL.cs

@@ -0,0 +1,166 @@
+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-06-17 09:17
+    /// 描 述：健康打卡时段
+    /// </summary>
+    public class HealthPunchTimeBLL : HealthPunchTimeIBLL
+    {
+        private HealthPunchTimeService healthPunchTimeService = new HealthPunchTimeService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchTimeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return healthPunchTimeService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取HealthPunchTime表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public HealthPunchTimeEntity GetHealthPunchTimeEntity(string keyValue)
+        {
+            try
+            {
+                return healthPunchTimeService.GetHealthPunchTimeEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        public HealthPunchTimeEntity GetTypeEntity(string keyValue)
+        {
+            try
+            {
+                return healthPunchTimeService.GetTypeEntity(keyValue);
+            }
+            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
+            {
+                healthPunchTimeService.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>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, HealthPunchTimeEntity entity)
+        {
+            try
+            {
+                healthPunchTimeService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void EnableEntity(string keyValue)
+        {
+            try
+            {
+                healthPunchTimeService.EnableEntity(keyValue);
+            }
+            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/HealthPunchTime/HealthPunchTimeEntity.cs

@@ -0,0 +1,80 @@
+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-06-17 09:17
+    /// 描 述：健康打卡时段
+    /// </summary>
+    public class HealthPunchTimeEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// ID
+        /// </summary>
+        [Column("ID")]
+        public string ID { get; set; }
+        /// <summary>
+        /// StarTime
+        /// </summary>
+        [Column("STARTIME")]
+        public string StarTime { get; set; }
+        /// <summary>
+        /// EndTime
+        /// </summary>
+        [Column("ENDTIME")]
+        public string EndTime { get; set; }
+        /// <summary>
+        /// 描述
+        /// </summary>
+        [Column("DESCRIPTION")]
+        public string Description { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// CreateUser
+        /// </summary>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// CheckMark
+        /// </summary>
+        [Column("CHECKMARK")]
+        public int? CheckMark { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.ID = Guid.NewGuid().ToString();
+        }
+        /// <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/HealthPunchTime/HealthPunchTimeIBLL.cs

@@ -0,0 +1,53 @@
+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-06-17 09:17
+    /// 描 述：健康打卡时段
+    /// </summary>
+    public interface HealthPunchTimeIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<HealthPunchTimeEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取HealthPunchTime表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        HealthPunchTimeEntity GetHealthPunchTimeEntity(string keyValue);
+        HealthPunchTimeEntity GetTypeEntity(string Type);
+
+        #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, HealthPunchTimeEntity entity);
+
+        void EnableEntity(string keyValue);
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HealthPunchTime/HealthPunchTimeService.cs

@@ -0,0 +1,206 @@
+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-06-17 09:17
+    /// 描 述：健康打卡时段
+    /// </summary>
+    public class HealthPunchTimeService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<HealthPunchTimeEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.ID,
+                t.StarTime,
+                t.EndTime,
+                t.Description,
+                t.CheckMark,
+                t.CreateUser,
+                t.CreateTime,
+                t.Remark
+                ");
+                strSql.Append("  FROM HealthPunchTime t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Description"].IsEmpty())
+                {
+                    dp.Add("Description", queryParam["Description"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Description = @Description ");
+                }
+                if (!queryParam["CheckMark"].IsEmpty())
+                {
+                    dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CheckMark = @CheckMark ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<HealthPunchTimeEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取HealthPunchTime表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public HealthPunchTimeEntity GetHealthPunchTimeEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<HealthPunchTimeEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        public HealthPunchTimeEntity GetTypeEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<HealthPunchTimeEntity>(x => x.Description == keyValue);
+            }
+            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<HealthPunchTimeEntity>(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>
+        public void SaveEntity(string keyValue, HealthPunchTimeEntity 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 EnableEntity(string keyValue)
+        {
+            try
+            {
+                var entity = this.BaseRepository("CollegeMIS").FindEntity<HealthPunchTimeEntity>(keyValue);
+                if (entity.CheckMark == 0)
+                {
+                    entity.CheckMark = 1;
+                }
+                else if (entity.CheckMark == 1)
+                {
+                    entity.CheckMark = 0;
+                }
+                this.BaseRepository("CollegeMIS").Update(entity);
+            }
+            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/EducationalAdministration/SignUpAboutOnline/SignUpAboutOnlineEntity.cs

@@ -78,7 +78,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 创建时间
         /// </summary>
         [Column("CREATETIME")]
-        public DateTime CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
         /// <summary>
         /// 报名日期
         /// </summary>

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

@@ -209,6 +209,14 @@
     <Compile Include="EducationalAdministration\Exam_InvigilateTeacher\Exam_InvigilateTeacherEntity.cs" />
     <Compile Include="EducationalAdministration\Exam_InvigilateTeacher\Exam_InvigilateTeacherIBLL.cs" />
     <Compile Include="EducationalAdministration\Exam_InvigilateTeacher\Exam_InvigilateTeacherService.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuBLL.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuEntity.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuIBLL.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchStu\HealthPunchStuService.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchTime\HealthPunchTimeBLL.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchTime\HealthPunchTimeEntity.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchTime\HealthPunchTimeIBLL.cs" />
+    <Compile Include="EducationalAdministration\HealthPunchTime\HealthPunchTimeService.cs" />
     <Compile Include="EducationalAdministration\LeaveSchoolA\LeaveSchoolABLL.cs" />
     <Compile Include="EducationalAdministration\LeaveSchoolA\LeaveSchoolAIBLL.cs" />
     <Compile Include="EducationalAdministration\LeaveSchoolA\LeaveSchoolAService.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/ExemptionApplication/ExemptionApplicationService.cs

@@ -30,20 +30,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.Grade,
-                t.Semester,
-                t.Stuname,
-                t.App_Date,
-                t.App_Money,
-                t.Passed,
-                t.Provided,
-                t.Provide_date,
-                t.CreateUserId,
-                t.App_Description
-                ");
+                strSql.Append("SELECT * ");
                 strSql.Append("  FROM Exemption_Application t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();