合并

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

@@ -30,10 +30,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
-        /// <summary>
-        /// 表单页
-        /// <summary>
-        /// <returns></returns>
+
+        [HttpGet]
+        public ActionResult ManageIndexTeacher()
+        {
+            return View();
+        }
         [HttpGet]
         public ActionResult IndexForStudent()
         {
@@ -41,13 +43,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             ViewBag.StuNo = userinfo.account;
             return View();
         }
-        /// <summary>
-        /// 表单页
-        /// <summary>
-        /// <returns></returns>
         [HttpGet]
-        public ActionResult FormView()
+        public ActionResult IndexForTeacher()
         {
+            var userinfo = LoginUserInfo.Get();
+            ViewBag.EmpNo = userinfo.account;
             return View();
         }
 
@@ -76,9 +76,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
-        
+
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTeacherPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = yktStateMentIbll.GetTeacherPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
         #endregion
-        
+
 
     }
 }

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

@@ -120,7 +120,7 @@ var bootstrap = function ($, learun) {
                     { label: "专业", name: "MajorName", width: 100, align: "left" },
                     { label: "班级", name: "ClassName", width: 100, align: "left" },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
-                    { label: "消费金额", name: "MONEY", width: 100, align: "left" },
+                    { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics: true },
                     //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
                     { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
                     { label: "科目", name: "SUBJECT", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js

@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     { label: "专业", name: "MajorName", width: 100, align: "left" },
                     { label: "班级", name: "ClassName", width: 100, align: "left" },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
-                    { label: "消费金额", name: "MONEY", width: 100, align: "left" },
+                    { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics: true },
                     //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
                     { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
                     { label: "科目", name: "SUBJECT", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<script>
+    var EmpNo = "@ViewBag.EmpNo";
+</script>
+<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>
+                <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/YKTStateMent/IndexForTeacher.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.js

@@ -0,0 +1,85 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-11 14:34
+ * 描  述：宿舍调换申请
+ */
+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') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '2',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/YKTStateMent/GetTeacherPageList',
+                headData: [
+                    { label: "一卡通账号", name: "YKTNO", width: 100, align: "left" },
+                    { label: "教职工号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "姓名", name: "EmpName", width: 100, align: "left" },
+                    { label: "部门", name: "DepartmentName", width: 100, align: "left" },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
+                    { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics: true },
+                    //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
+                    { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
+                    { label: "科目", name: "SUBJECT", width: 100, align: "left" },
+                    { label: "终端名称", name: "TERMNAME", width: 150, align: "left" }
+                ],
+                sidx: 'A.OPDT',
+                sord: 'desc',
+                isPage: true
+            });
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartDate = startTime;
+            param.EndDate = endTime;
+            param.EmpNo = EmpNo;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.cshtml

@@ -0,0 +1,46 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">一卡通账号</div>
+                                    <input id="YKTNO" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">教职工号</div>
+                                    <input id="EmpNo" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="EmpName" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">部门</div>
+                                    <div id="DepartmentId"></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/YKTStateMent/ManageIndexTeacher.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.js

@@ -0,0 +1,88 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-07-11 14:34
+ * 描  述：宿舍调换申请
+ */
+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') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '2',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#DepartmentId').lrDepartmentSelect({ type:'tree'});
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/YKTStateMent/GetTeacherPageList',
+                headData: [
+                    { label: "一卡通账号", name: "YKTNO", width: 100, align: "left" },
+                    { label: "教职工号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "姓名", name: "EmpName", width: 100, align: "left" },
+                    { label: "部门", name: "DepartmentName", width: 100, align: "left" },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
+                    { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics:true },
+                    //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
+                    { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
+                    { label: "科目", name: "SUBJECT", width: 100, align: "left" },
+                    { label: "终端名称", name: "TERMNAME", width: 150, align: "left" }
+                ],
+                //mainId: 'AId',
+                sidx: 'A.OPDT',
+                sord: 'desc',
+                isPage: true
+            });
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartDate = startTime;
+            param.EndDate = endTime;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LR_OA_NewsReadController.cs

@@ -18,6 +18,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
     public class LR_OA_NewsReadController : MvcControllerBase
     {
         private LR_OA_NewsReadIBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL();
+        private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
 
         #region  视图功能
 
@@ -156,6 +157,16 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
                 //修改当前通知公告的浏览量
                 lR_OA_NewsReadIBLL.UpdateNewsPV(newsId);
             }
+            //判断消息提醒表中的消息是否已读
+            var mrentity = messageRindIBLL.GetMessageRemindEntityByInstanceId(newsId, loginUserInfo.userId);
+            if (mrentity != null)
+            {
+                if (!mrentity.ReadSigns.HasValue || mrentity.ReadSigns.Value != true)
+                {
+                    //修改消息为已读
+                    messageRindIBLL.SaveReadSigns(mrentity.MessageId);
+                }
+            }
 
             return Success("阅读成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs

@@ -182,6 +182,23 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
             return Success("保存成功！");
         }
 
+        /// <summary>
+        /// 更改状态为已读
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SaveReadSignsByUserId()
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            if (!string.IsNullOrEmpty(loginUserInfo.userId))
+            {
+                messageRindIBLL.SaveReadSignsByUserId(loginUserInfo.userId);
+            }
+            return Success("保存成功！");
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml

@@ -25,9 +25,20 @@
     "/Views/LR_Content/style/lr-iframe-index.css",
     "~/Content/jquery/plugin/toastr/toastr.css"
     )
-
+    <style>
+        #allRead {
+            display: inline-block;
+            padding: 5px 10px;
+            color: blue;
+            border: 1px solid blue;
+            border-radius: 3px;
+            cursor:pointer;
+            margin-bottom:5px;
+        }
+    </style>
 </head>
 <body>
+    <div id="allRead" class="btn btn-default">全部已读</div>
     <div id='content'>
 
     </div>
@@ -39,7 +50,7 @@
     "~/Areas/LR_Desktop/Views/MessageRind/Index.js"
     )
 
-<script type='text/javascript'>
+    <script type='text/javascript'>
     var name = '@(ViewBag.Name)';
     $(document).ready(function () {
         getdata();
@@ -116,6 +127,21 @@
 
 
         });
+
+        //点击“全部已读”
+        $('#allRead').on('click', function () {
+            $.ajax({
+                url: top.$.rootUrl + '/LR_Desktop/MessageRind/SaveReadSignsByUserId',
+                type: "post",
+                data: { },
+                dataType: "json",
+                async: false,
+                success: function (data) {
+                    location.reload();
+                }
+            })
+        });
+
     });
 
     //function funLook(param) {
@@ -136,6 +162,6 @@
 
     //}
 
-</script>
+    </script>
 </body>
 </html>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs

@@ -1,6 +1,7 @@
 using Learun.Application.Base.SystemModule;
 using Learun.Application.OA.File.FilePreview;
 using Learun.Util;
+using Quanjiang.DigitalSchool.AsposeHelper;
 using System.Web;
 using System.Web.Mvc;
 
@@ -195,7 +196,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetExcelData(data.F_FilePath);
+                    AsposeCore.GetExcelData(data.F_FilePath);
+                    //filePreviewIBLL.GetExcelData(data.F_FilePath);
                 }
             }
             if (data.F_FileType == "docx" || data.F_FileType == "doc")
@@ -203,7 +205,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetWordData(data.F_FilePath);
+                    AsposeCore.GetWordData(data.F_FilePath);
+                    //filePreviewIBLL.GetWordData(data.F_FilePath);
                 }
             }
             if (data.F_FileType == "ppt" || data.F_FileType == "pptx")
@@ -211,7 +214,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                 filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名
                 if (!DirFileHelper.IsExistFile(filepath))
                 {
-                    filePreviewIBLL.GetPptData(data.F_FilePath);
+                    AsposeCore.GetWordData(data.F_FilePath);
+                    //filePreviewIBLL.GetPptData(data.F_FilePath);
                 }
             }
             Response.ClearContent();
@@ -264,6 +268,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
                     break;
             }
             Response.Charset = "GB2312";
+            Response.Charset = "utf-8"; //修改txt文件预览乱码
             Response.WriteFile(filepath);
             //Response.BinaryWrite(ms.ToArray());
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_PunishmentController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,17 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+
+        /// <summary>
+        /// 统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexStatistics()
+        {
+            return View();
         }
         #endregion
 
@@ -61,6 +71,27 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             };
             return Success(jsonData);
         }
+        
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForStatistics(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = acc_PunishmentIBLL.GetPageListForStatistics(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +100,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Acc_PunishmentData = acc_PunishmentIBLL.GetAcc_PunishmentEntity( keyValue );
-            var jsonData = new {
+            var Acc_PunishmentData = acc_PunishmentIBLL.GetAcc_PunishmentEntity(keyValue);
+            var jsonData = new
+            {
                 Acc_Punishment = Acc_PunishmentData,
             };
             return Success(jsonData);
@@ -102,7 +134,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Acc_PunishmentEntity entity = strEntity.ToObject<Acc_PunishmentEntity>();
-            acc_PunishmentIBLL.SaveEntity(keyValue,entity);
+            acc_PunishmentIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_RewardController.cs

@@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
         {
              return View();
         }
+        /// <summary>
+        /// 奖励统计
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexStatistics()
+        {
+            return View();
+        }
+        
         #endregion
 
         #region  获取数据
@@ -62,6 +72,26 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return Success(jsonData);
         }
         /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForStatistics(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = acc_RewardIBLL.GetPageListForStatistics(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
         /// 获取表单数据
         /// <summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml

@@ -4,28 +4,28 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">学年</div>
-        <div id="SYear"></div>
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="SYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">学期</div>
-        <div id="Semester"></div>
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">宿舍楼</div>
-        <div id="Dormitory"></div>
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">单元</div>
-        <div id="Unit"></div>
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">楼层</div>
-        <div id="Floor"></div>
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Punishment">
-        <div class="lr-form-item-title">宿舍</div>
-        <div id="RId"></div>
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_Punishment">
         <div class="lr-form-item-title">惩罚</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.cshtml

@@ -0,0 +1,71 @@
+@{
+    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 class="lr-form-item">
+                            <div class="lr-form-item-title">统计条件</div>
+                        </div>
+                    </div>*@
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学年</div>
+                            <div id="SYear"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学期</div>
+                            <div id="Semester"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍楼</div>
+                            <div id="Dormitory"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">单元</div>
+                            <div id="Unit"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">楼层</div>
+                            <div id="Floor"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍</div>
+                            <div id="RId"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;统计</a>
+                    </div>
+
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" 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/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js

@@ -0,0 +1,158 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-11 16:46
+ * 描  述：宿舍奖励
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+           page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 420, 400);
+            $('#SYear').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#SYear').lrselectSet('1');
+            $('#Semester').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Dormitory').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Unit').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Floor').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#RId').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                refreshGirdData();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/Acc_Punishment/GetPageListForStatistics',
+                headData: [
+                    { label: "学年", name: "SYear", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    {
+                        label: "宿舍楼", name: "Dormitory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "单元", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "楼层", name: "Floor", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "宿舍", name: "RId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "num", width: 100, align: "left" },
+                 ],
+                mainId: 'ID',
+                isPage: true
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            var $content = $('body').find('.lr-layout-tool-left');
+            param = $content.lrGetFormData();
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml

@@ -4,28 +4,28 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">学年</div>
-        <div id="SYear"></div>
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="SYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">学期</div>
-        <div id="Semester"></div>
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">宿舍楼</div>
-        <div id="Dormitory"></div>
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="Dormitory" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">单元</div>
-        <div id="Unit"></div>
+        <div class="lr-form-item-title">单元<font face="宋体">*</font></div>
+        <div id="Unit" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">楼层</div>
-        <div id="Floor"></div>
+        <div class="lr-form-item-title">楼层<font face="宋体">*</font></div>
+        <div id="Floor" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Acc_Reward">
-        <div class="lr-form-item-title">宿舍</div>
-        <div id="RId"></div>
+        <div class="lr-form-item-title">宿舍<font face="宋体">*</font></div>
+        <div id="RId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Acc_Reward">
         <div class="lr-form-item-title">奖励</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.cshtml

@@ -0,0 +1,71 @@
+@{
+    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 class="lr-form-item">
+                            <div class="lr-form-item-title">统计条件</div>
+                        </div>
+                    </div>*@
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学年</div>
+                            <div id="SYear"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">学期</div>
+                            <div id="Semester"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍楼</div>
+                            <div id="Dormitory"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">单元</div>
+                            <div id="Unit"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">楼层</div>
+                            <div id="Floor"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">宿舍</div>
+                            <div id="RId"></div>
+                        </div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;统计</a>
+                    </div>
+
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" 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/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js

@@ -0,0 +1,158 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-08-11 16:46
+ * 描  述：宿舍奖励
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+           page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 420, 400);
+            $('#SYear').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#SYear').lrselectSet('1');
+            $('#Semester').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Dormitory').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Unit').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#Floor').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            $('#RId').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoInt',
+            });
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                refreshGirdData();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/Acc_Reward/GetPageListForStatistics',
+                headData: [
+                    { label: "学年", name: "SYear", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    {
+                        label: "宿舍楼", name: "Dormitory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "单元", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "楼层", name: "Floor", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "宿舍", name: "RId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "num", width: 100, align: "left" },
+                 ],
+                mainId: 'ID',
+                isPage: true
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            var $content = $('body').find('.lr-layout-tool-left');
+            param = $content.lrGetFormData();
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

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

@@ -245,43 +245,43 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             }
             var leaveList = stuAttendanceLeaveIBLL.GetList();
             var formatData = from d in timeTables
-                              let tt = d.LessonTime.Substring(1)
-                              group d by tt into g
-                              orderby g.Key
-                              select new
-                              {
-                                  time = g.Key,
-                                  list = from e in timeTables
-                                         let ee = e.LessonTime.Substring(1)
-                                         where ee == g.Key
-                                         select new
-                                         {
-                                             day = e.LessonTime.ToCharArray()[0],
-                                             curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName),
-                                             lessonName = e.LessonName,
-                                             teacher = e.EmpName,
-                                             classRoom = e.ClassroomName?.Trim(),
-                                             academicyear = semesterAndYear.AcademicYearShort,
-                                             semester = strSemester,
-                                             lessonNo = e?.LessonNo,
-                                             teachClassNo = e?.TeachClassNo,
-                                             empno = e?.EmpNo,
-                                             lessonTime = e.LessonTime,
-                                             lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
-                                             classRoomNo = e?.ClassRoomNo.Trim(),
-                                             lessonSortNo = e.LessonSortNo,
-                                             e.OLPEId,
-                                             className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName,
-                                             leaveType = leaveList.Any(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0,
-                                             checkType = leaveList.FirstOrDefault(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck,
-
-                                         }
-                              }
+                             let tt = d.LessonTime.Substring(1)
+                             group d by tt into g
+                             orderby g.Key
+                             select new
+                             {
+                                 time = g.Key,
+                                 list = from e in timeTables
+                                        let ee = e.LessonTime.Substring(1)
+                                        where ee == g.Key
+                                        select new
+                                        {
+                                            day = e.LessonTime.ToCharArray()[0],
+                                            curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName),
+                                            lessonName = e.LessonName,
+                                            teacher = e.EmpName,
+                                            classRoom = e.ClassroomName?.Trim(),
+                                            academicyear = semesterAndYear.AcademicYearShort,
+                                            semester = strSemester,
+                                            lessonNo = e?.LessonNo,
+                                            teachClassNo = e?.TeachClassNo,
+                                            empno = e?.EmpNo,
+                                            lessonTime = e.LessonTime,
+                                            lessonDate = e.LessonDate.ToString("yyyy-MM-dd"),
+                                            classRoomNo = e?.ClassRoomNo.Trim(),
+                                            lessonSortNo = e.LessonSortNo,
+                                            e.OLPEId,
+                                            className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName,
+                                            leaveType = leaveList.Any(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0,
+                                            checkType = leaveList.FirstOrDefault(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck,
+
+                                        }
+                             }
 
                 ;
 
 
-           // var leaveList = stuAttendanceLeaveIBLL.GetList();
+            // var leaveList = stuAttendanceLeaveIBLL.GetList();
             //var formatData = timeTables.OrderBy(a => a.LessonTime.Substring(1))
             //    .Select(a => new
             //    {
@@ -327,7 +327,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetDataInEducation(string startTime, string endTime, string classNo, string empNo, string schoolId)
+        public ActionResult GetDataInEducation(string startTime, string endTime, string classNo, string empNo, string schoolId, string classroomNo)
         {
             var userInfo = LoginUserInfo.Get();
             //开始时间
@@ -341,7 +341,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 
             var timeTableList = new List<TimeTable>();
             //课程表
-            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId, classroomNo);
             timeTableList.AddRange(data);
             //选修课课程表
             //20220718因 更改教务课表显示格式为班级作为列头，选修课无班级所以不能显示在课表内
@@ -356,9 +356,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
                 return JsonResult(noDataResult);
             }
             //最大节次
-            int maxlessontime = timeTables.Max(m =>Convert.ToInt32(m.LessonTime.Substring(1)));
+            int maxlessontime = timeTables.Max(m => Convert.ToInt32(m.LessonTime.Substring(1)));
             //班级列表
-            var classinfolist = timeTables.Select(m => new { m.TeachClassNo, m.ClassName}).OrderBy(m => m.TeachClassNo).GroupBy(m=>new {m.TeachClassNo,m.ClassName});
+            var classinfolist = timeTables.Select(m => new { m.TeachClassNo, m.ClassName }).OrderBy(m => m.TeachClassNo).GroupBy(m => new { m.TeachClassNo, m.ClassName });
             var formatData = from d in timeTables
                              let tt = d.LessonTime.Substring(1)
                              group d by tt into g
@@ -415,7 +415,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 
             var timeTableList = new List<TimeTable>();
             //课程表
-            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId, "");
             timeTableList.AddRange(data);
             //选修课课程表
             //var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
@@ -492,6 +492,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success(data);
         }
 
+        /// <summary>
+        /// 课程表【教务】--教室下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetClassroomData(string schoolId = "")
+        {
+            var data = arrangeLessonTermIBLL.GetClassroomData(schoolId);
+
+            return Success(data);
+        }
+
         /// <summary>
         /// 表单--修改教师所带的课程【教务】--课程下拉框信息
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.cshtml

@@ -123,6 +123,9 @@
                     <div class="lr-layout-tool-item">
                         <div id="EmpNo" type="lrselect" class="lr-select"></div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="ClassroomNo" type="lrselect" class="lr-select"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <a id="lr_search" class="btn btn-primary">查询</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js

@@ -153,6 +153,7 @@ var bootstrap = function ($, learun) {
                 p.schoolId = $('#F_SchoolId').lrselectGet();
                 p.ClassNo = $('#ClassNo').lrselectGet();
                 p.EmpNo = $('#EmpNo').lrselectGet();
+                p.ClassroomNo = $('#ClassroomNo').lrselectGet();
                 page.search(p);
             });
             // 按条件清空排课数据
@@ -284,6 +285,14 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            //教室
+            $('#ClassroomNo').lrselect({
+                placeholder: "请选择教室",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassroomData',
+                value: 'value',
+                text: 'text'
+            });
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs

@@ -6,6 +6,7 @@ using System.Web.Routing;
 using Hangfire;
 using Learun.Application.Extention.TaskScheduling;
 using Learun.Application.WorkFlow;
+using Quanjiang.DigitalSchool.AsposeHelper;
 
 namespace Learun.Application.Web
 {
@@ -37,6 +38,8 @@ namespace Learun.Application.Web
             //cache.RemoveAll(6);
             WfJobScheduler.Start();
             QuartzHelper.InitJob();
+            //执行aspose初始化
+            AsposeCore.AsposeCoreInit();
         }
 
         /// <summary>

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

@@ -990,6 +990,8 @@
     <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.js" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.js" />
+    <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\ManageIndexTeacher.js" />
+    <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\ImportForm.css" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\ImportForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForStudent.js" />
@@ -1393,6 +1395,8 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexImport.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Punishment\IndexStatistics.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Reward\IndexStatistics.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
@@ -7184,6 +7188,10 @@
       <Project>{4D841EAD-3FD8-4FAC-BC67-C4CE6C0D1181}</Project>
       <Name>Quanjiang.DigitalScholl.WebLicense</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Quanjiang.DigitalSchool.Aspose\Quanjiang.DigitalSchool.Aspose.csproj">
+      <Project>{767d20c4-b983-4940-bf97-74d5479ca558}</Project>
+      <Name>Quanjiang.DigitalSchool.Aspose</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\LR_OrganizationModule\Views\User\StudentIndex.cshtml" />
@@ -8048,6 +8056,10 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Acc_DormitoryChange\FormView.cshtml" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\CopyForm.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Reward\IndexStatistics.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_Punishment\IndexStatistics.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForTeacher.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\ManageIndexTeacher.cshtml" />
     <Content Include="Content\excel\StuInfoBasicUpdateImport.xls" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\ImportForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml

@@ -1060,118 +1060,118 @@
     @*<script src="/Content/js/DragSSO/sortable.js"></script>*@
     @*<script src="/Content/js/DragSSO/inSecHead.js"></script>*@
     <script src="~/Content/jquery/jquery.md5.min.js"></script>
-    <script>
-        $.lrToken = $('@Html.AntiForgeryToken()').val();
-        var DigitalschoolMisLoginurl = "@ViewBag.DigitalschoolMisLoginurl";
-        var Returnurl = "@ViewBag.Returnurl";
-        //判断是否有登录二维码：有，显示扫码登录；否，不显示；
-        if ("@ViewBag.HasQRCode" == "True") {
-            $('#loginTabCode').show();
-            $('#qrCodeText').html("@ViewBag.QRCodeText");
+<script>
+    $('.loginCon').removeClass('noreg');
+    $.lrToken = $('@Html.AntiForgeryToken()').val();
+    var DigitalschoolMisLoginurl = "@ViewBag.DigitalschoolMisLoginurl";
+    var Returnurl = "@ViewBag.Returnurl";
+    //判断是否有登录二维码：有，显示扫码登录；否，不显示；
+    if ("@ViewBag.HasQRCode" == "True") {
+        $('#loginTabCode').show();
+        $('#qrCodeText').html("@ViewBag.QRCodeText");
+    } else {
+        $('#loginTabCode').hide();
+    }
+    var qrcode = new QRCode(document.getElementById("qrCode"), {
+        width: 200,
+        height: 200
+    });
+    qrcode.makeCode("@ViewBag.QRCodeUrl");
+    //密码按钮
+    $('#psw_change').css({
+        'background': 'url(/Content/images/Login/psw0.png) no-repeat center center'
+    });
+    //点击密码icon  显示／隐藏
+    $('#psw_change').click(function (event) {
+        var event = event || window.event;
+        event.stopPropagation();
+        var $this = $(this);
+        $this.toggleClass('psw_show');
+        //如果当前隐藏  变显示
+        if ($this.hasClass('psw_show')) {
+            $this.css({
+                'background': 'url(/Content/images/Login/psw1.png) no-repeat center center'
+            });
+            $this.prev().attr('type', 'text');
         } else {
-            $('#loginTabCode').hide();
+            $this.css(
+                'background', 'url(/Content/images/Login/psw0.png) no-repeat center center'
+            );
+            $this.prev().attr('type', 'password');
         }
-        var qrcode = new QRCode(document.getElementById("qrCode"), {
-            width: 200,
-            height: 200
-        });
-        qrcode.makeCode("@ViewBag.QRCodeUrl");
-        //密码按钮
-        $('#psw_change').css({
-            'background': 'url(/Content/images/Login/psw0.png) no-repeat center center'
+    });
+    // 点击切换验证码
+    $("#lr_verifycode_img").click(function () {
+        $("#lr_verifycode_input").val('');
+        $("#lr_verifycode_img").attr("src", "/Login/VerifyCode?time=" + Math.random());
+    });
+    //错误次数
+    //var errornum = $('#errornum').val();
+    //if (errornum >= 3) {
+    //    $('.loginCon').removeClass('noreg');
+    //    $("#lr_verifycode_img").trigger('click');
+    //}
+    // 登录按钮事件
+    $("#lr_login_btn").on('click', function () {
+        
+        var $username = $("#lr_username"), $password = $("#lr_password"), $verifycode = $("#lr_verifycode_input");
+        var username = $.trim($username.val()), password = $.trim($password.val()), verifycode = $.trim($verifycode.val());
+        if (username == "") {
+            tip('请输入账户');
+            $username.focus();
+            return false;
+        }
+        if (password == "") {
+            tip('请输入密码');
+            $password.focus();
+            return false;
+        }
+        if ($("#lr_verifycode_input").is(":visible") && verifycode == "") {
+            tip('请输入验证码');
+            $verifycode.focus();
+            return false;
+        }
+        password = $.md5(password);
+        layer.msg('登录中...', {
+            icon: 16
+            , shade: 0.01
         });
-        //点击密码icon  显示／隐藏
-        $('#psw_change').click(function (event) {
-            var event = event || window.event;
-            event.stopPropagation();
-            var $this = $(this);
-            $this.toggleClass('psw_show');
-            //如果当前隐藏  变显示
-            if ($this.hasClass('psw_show')) {
-                $this.css({
-                    'background': 'url(/Content/images/Login/psw1.png) no-repeat center center'
-                });
-                $this.prev().attr('type', 'text');
-            } else {
-                $this.css(
-                    'background', 'url(/Content/images/Login/psw0.png) no-repeat center center'
-                );
-                $this.prev().attr('type', 'password');
+        $.ajax({
+            url: "/Login/CheckLogin",
+            headers: { __RequestVerificationToken: $.lrToken },
+            data: { username: username, password: password, verifycode: verifycode, up: "", defaultPwdTip:"" },
+            type: "post",
+            dataType: "json",
+            success: function (res) {
+                if (res.code == 200) {
+                    window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                }
+                else if (res.code == 400) {
+                    tip(res.info, true);
+                    $("#lr_verifycode_img").trigger('click');
+                    layer.closeAll();
+                }
+                else if (res.code == 500) {
+                    layer.closeAll();
+                    tip('服务端异常，请联系管理员', true);
+                }
             }
         });
-        // 点击切换验证码
-        $("#lr_verifycode_img").click(function () {
-            $("#lr_verifycode_input").val('');
-            $("#lr_verifycode_img").attr("src", "/Login/VerifyCode?time=" + Math.random());
-        });
-        //错误次数
-        var errornum = $('#errornum').val();
-        if (errornum >= 3) {
-            $('.loginCon').removeClass('noreg');
-            $("#lr_verifycode_img").trigger('click');
-        }
-        // 登录按钮事件
-        $("#lr_login_btn").on('click', function () {
-            layer.msg('登录中...', {
-                icon: 16
-                , shade: 0.01
-            });
-            var $username = $("#lr_username"), $password = $("#lr_password"), $verifycode = $("#lr_verifycode_input");
-            var username = $.trim($username.val()), password = $.trim($password.val()), verifycode = $.trim($verifycode.val());
-            if (username == "") {
-                tip('请输入账户');
-                $username.focus();
-                return false;
-            }
-            if (password == "") {
-                tip('请输入密码');
-                $password.focus();
-                return false;
-            }
-            if ($("#lr_verifycode_input").is(":visible") && verifycode == "") {
-                tip('请输入验证码');
-                $verifycode.focus();
-                return false;
-            }
-            password = $.md5(password);
-            $.ajax({
-                url: "/Login/CheckLogin",
-                headers: { __RequestVerificationToken: $.lrToken },
-                data: { username: username, password: password, verifycode: verifycode, up: "", defaultPwdTip:"" },
-                type: "post",
-                dataType: "json",
-                success: function (res) {
-                    if (res.code == 200) {
-                        window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
-                    }
-                    else if (res.code == 400) {
-                        tip(res.info, true);
-                        $('#errornum').val(res.data);
-                        if (res.data >= 3) {
-                            $('.lr-login-reg').show();
-                            $("#lr_verifycode_img").trigger('click');
-                        }
-                    }
-                    else if (res.code == 500) {
-                        tip('服务端异常，请联系管理员', true);
-                    }
-                }
-            });
 
 
-        });
-        //登录错误提示显示
-        var tip = function (msg) {
-            var $tip = $('.error_info');
-            $tip.hide();
-            if (!!msg) {
-                $tip.find('span').html(msg);
-                $tip.show();
-            }
+    });
+    //登录错误提示显示
+    var tip = function (msg) {
+        var $tip = $('.error_info');
+        $tip.hide();
+        if (!!msg) {
+            $tip.find('span').html(msg);
+            $tip.show();
         }
+    }
 
-        
-    </script>
+
+</script>
 
 </body>
 </html>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Bootstraper.cs

@@ -38,6 +38,7 @@ namespace Learun.Application.WebApi
         protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
         {
             base.ApplicationStartup(container, pipelines);
+            StaticConfiguration.DisableErrorTraces = false;
             Nancy.Json.JsonSettings.MaxJsonLength = int.MaxValue;
         }
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesNoLoginApi.cs

@@ -32,7 +32,6 @@ namespace Learun.Application.WebApi.Modules
 
             return Success(list);
         }
-
         /// <summary>
         /// 上传附件图片文件
         /// <summary>
@@ -40,14 +39,14 @@ namespace Learun.Application.WebApi.Modules
         public Response Upload(dynamic _)
         {
             var files = (List<HttpFile>)this.Context.Request.Files;
-            var folderId = this.GetReqData();
-
+            string folderId = Guid.NewGuid().ToString();
             string filePath = Config.GetValue("AnnexesFile");
             string uploadDate = DateTime.Now.ToString("yyyyMMdd");
-            string FileEextension = Path.GetExtension(files[0].Name);
+            string fileEextension = Path.GetExtension(files[0].Name);
+            string fileType = fileEextension.Replace(".", "");
             string fileGuid = Guid.NewGuid().ToString();
 
-            string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, FileEextension);
+            string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, "system", uploadDate, fileGuid, fileEextension);
 
             //创建文件夹
             string path = Path.GetDirectoryName(virtualPath);
@@ -67,17 +66,16 @@ namespace Learun.Application.WebApi.Modules
                 fileAnnexesEntity.F_FileName = files[0].Name;
                 fileAnnexesEntity.F_FilePath = virtualPath;
                 fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString();
-                fileAnnexesEntity.F_FileExtensions = FileEextension;
-                fileAnnexesEntity.F_FileType = FileEextension.Replace(".", "");
-                fileAnnexesEntity.F_CreateUserId = userInfo.userId;
-                fileAnnexesEntity.F_CreateUserName = userInfo.realName;
+                fileAnnexesEntity.F_FileExtensions = fileEextension;
+                fileAnnexesEntity.F_FileType = fileType;
+                fileAnnexesEntity.F_CreateUserId = "system";
+                fileAnnexesEntity.F_CreateUserName = "system";
 
                 annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity);
             }
 
-            return SuccessString(fileGuid);
+            return SuccessString(folderId);
         }
-
         /// <summary>
         /// 删除文件
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs

@@ -112,13 +112,13 @@ namespace Learun.Application.WebApi.Modules
 
         }
 
-        
+
         /// <summary>
         /// 全院课程表【按班级分组】
         /// </summary>
         /// <param name="_"></param>
         /// <returns></returns>
-        
+
         private Response GetTimeTableData(dynamic _)
         {
             var param = this.GetReq<TimeParameter>();
@@ -139,7 +139,7 @@ namespace Learun.Application.WebApi.Modules
             //课程表数据
             var timeTableList = new List<Learun.Application.TwoDevelopment.EducationalAdministration.TimeTable>();
             //必修课课程表
-            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, "");
+            var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, "", "");
             timeTableList.AddRange(data);
             //选修课课程表
             var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, "");
@@ -171,7 +171,7 @@ namespace Learun.Application.WebApi.Modules
             }).OrderBy(x => x.LessonSortNo).ThenBy(x => x.ClassNo).ToList();
 
             result.ClassDataList = dataTemp;
-            
+
             return Success(result);
 
         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs

@@ -437,12 +437,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="endDate">查询截止时间</param>
         /// <param name="classNo">班级编号</param>
         /// <param name="empNo">教师编号</param>
+        /// <param name="classroomNo">教室编号</param>
         /// <returns></returns>
-        public IEnumerable<TimeTable> GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId)
+        public IEnumerable<TimeTable> GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId, string classroomNo)
         {
             try
             {
-                return arrangeLessonTermService.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+                return arrangeLessonTermService.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId, classroomNo);
             }
             catch (Exception ex)
             {
@@ -504,6 +505,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 课程表【教务】--教室下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<SelectModel> GetClassroomData(string schoolId)
+        {
+            try
+            {
+                return arrangeLessonTermService.GetClassroomData(schoolId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 教学调度【教务】--课程下拉框信息
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs

@@ -105,8 +105,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="endDate">查询截止时间</param>
         /// <param name="classNo">班级编号</param>
         /// <param name="empNo">教师编号</param>
+        /// <param name="classroomNo">教室编号</param>
         /// <returns></returns>
-        IEnumerable<TimeTable> GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId);
+        IEnumerable<TimeTable> GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId, string classroomNo);
 
         /// <summary>
         /// 课程表【教务】--班级下拉框信息
@@ -120,6 +121,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="startDate"></param>
         /// <returns></returns>
         IEnumerable<SelectModel> GetTeacherData(string schoolId);
+
+        /// <summary>
+        /// 课程表【教务】--教室下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<SelectModel> GetClassroomData(string schoolId);
         bool GetAny();
         IEnumerable<CdDeptEntity> GetDepts(string academicYearNo, string semester);
         IEnumerable<CdDeptEntity> GetDeptsNotRecord(string academicYearNo, string semester);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -307,7 +307,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="teachClassNo"></param>
         /// <returns></returns>
         public IEnumerable<StuSelectLessonListEntity> AttendanceStudents(Pagination pagination, string queryJson)
-         {
+        {
             try
             {
                 var queryParam = queryJson.ToJObject();
@@ -1593,8 +1593,9 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
         /// <param name="endDate">查询截止时间</param>
         /// <param name="classNo">班级编号</param>
         /// <param name="empNo">教师编号</param>
+        /// <param name="classroomNo">教室编号</param>
         /// <returns></returns>
-        public IEnumerable<TimeTable> GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId)
+        public IEnumerable<TimeTable> GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId, string classroomNo)
         {
             var semesterAndYear = Common.GetSemesterAndYear(startDate);
             var strAcademicYear = semesterAndYear.AcademicYearShort;
@@ -1621,6 +1622,10 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                 {
                     result = result.Where(x => x.F_SchoolId == schoolId);
                 }
+                if (!string.IsNullOrEmpty(classroomNo))
+                {
+                    result = result.Where(x => x.ClassRoomNo == classroomNo);
+                }
                 return result;
             }
             catch (Exception ex)
@@ -1644,9 +1649,9 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
         {
             try
             {
-                //前三年-后三年
-                var preYear = DateTime.Now.AddYears(-3).Year;
-                var nextYear = DateTime.Now.AddYears(3).Year;
+                //前五年-后五年
+                var preYear = DateTime.Now.AddYears(-5).Year;
+                var nextYear = DateTime.Now.AddYears(5).Year;
                 var yearList = new List<string>();
                 for (int i = preYear; i <= nextYear; i++)
                 {
@@ -1688,9 +1693,9 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
         {
             try
             {
-                //前三年-后三年
-                var preYear = DateTime.Now.AddYears(-3).Year;
-                var nextYear = DateTime.Now.AddYears(3).Year;
+                //前五年-后五年
+                var preYear = DateTime.Now.AddYears(-5).Year;
+                var nextYear = DateTime.Now.AddYears(5).Year;
                 var yearList = new List<string>();
                 for (int i = preYear; i <= nextYear; i++)
                 {
@@ -1746,6 +1751,49 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
             }
         }
 
+        /// <summary>
+        /// 课程表【教务】--教室下拉框信息
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<SelectModel> GetClassroomData(string schoolId)
+        {
+            try
+            {
+                //前五年-后五年
+                var preYear = DateTime.Now.AddYears(-5).Year;
+                var nextYear = DateTime.Now.AddYears(5).Year;
+                var yearList = new List<string>();
+                for (int i = preYear; i <= nextYear; i++)
+                {
+                    yearList.Add(string.Format("'{0}-{1}'", i.ToString().Substring(2), (i + 1).ToString().Substring(2)));
+                }
+                var yearListStr = string.Join(",", yearList.ToArray());
+
+                var strSql = new StringBuilder();
+                strSql.Append("select distinct a.ClassroomNo as value,c.ClassroomName as text from ");
+                strSql.Append("ArrangeLessonTerm a inner join ClassroomInfo c on a.ClassroomNo=c.ClassroomNo ");
+                strSql.Append("where a.AcademicYearNo in (" + yearListStr + ") ");
+                if (!string.IsNullOrEmpty(schoolId))
+                {
+                    strSql.Append(" and a.F_SchoolId = '" + schoolId + "' ");
+                }
+
+                var result = this.BaseRepository("CollegeMIS").FindList<SelectModel>(strSql.ToString()).OrderBy(x => x.value);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         public IEnumerable<CdDeptEntity> GetDepts(string academicYearNo, string semester)
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentBLL.cs

@@ -42,9 +42,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-        
+
+        public IEnumerable<YKTStateMentEntity> GetTeacherPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return yKTStateMentService.GetTeacherPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
-        
+
 
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs

@@ -52,6 +52,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public string IdentityCardNo { get; set; }
         public string mobile { get; set; }
 
+        public string EmpNo { get; set; }
+        public string EmpName { get; set; }
+        public string DepartmentName { get; set; }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentIBLL.cs

@@ -22,9 +22,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<YKTStateMentEntity> GetPageList(Pagination pagination, string queryJson);
-       
+
+        IEnumerable<YKTStateMentEntity> GetTeacherPageList(Pagination pagination, string queryJson);
+
         #endregion
-        
+
 
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs

@@ -79,6 +79,54 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public IEnumerable<YKTStateMentEntity> GetTeacherPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                var strSql = new StringBuilder();
+                strSql.Append(@"SELECT  A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,
+B.TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCardNo
+                FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
+                left join ds_empinfo C on A.OUTID = C.mobile
+                left join ds_department d on c.departmentid=d.id
+                where 1=1 and EmpNo is not null");
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    strSql.Append($" AND C.EmpNo like '%{queryParam["EmpNo"].ToString()}%' ");
+                }
+                if (!queryParam["EmpName"].IsEmpty())
+                {
+                    strSql.Append($" AND C.EmpName like '%{queryParam["EmpName"].ToString()}%' ");
+                }
+                if (!queryParam["DepartmentId"].IsEmpty())
+                {
+                    strSql.Append($" AND C.DepartmentId='{queryParam["DepartmentId"].ToString()}' ");
+                }
+                if (!queryParam["YKTNO"].IsEmpty())
+                {
+                    strSql.Append($" AND a.CUSTOMERID like '%{queryParam["CUSTOMERID"].ToString()}%' ");
+                }
+                if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty())
+                {
+                    strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))");
+                }
+
+                return BaseRepository("TLMZYMIDDLEString").FindList<YKTStateMentEntity>(strSql.ToString(), pagination);
+            }
+            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/LR_Desktop/MessageRind/MessageRindBLL.cs

@@ -66,7 +66,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
             }
         }
 
-        
+
         /// <summary>
         /// 未读消息的数量
         /// </summary>
@@ -114,6 +114,29 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
             }
         }
 
+        /// <summary>
+        /// 获取MessageRemind表实体数据
+        /// </summary>
+        /// <param name="InstanceId">主键</param>
+        /// <returns></returns>
+        public MessageRemindEntity GetMessageRemindEntityByInstanceId(string InstanceId, string userId)
+        {
+            try
+            {
+                return messageRindService.GetMessageRemindEntityByInstanceId(InstanceId, userId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据
@@ -188,6 +211,30 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 }
             }
         }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="userId">主键</param>
+        public void SaveReadSignsByUserId(string userId)
+        {
+            try
+            {
+                messageRindService.SaveReadSignsByUserId(userId);
+            }
+            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/LR_Desktop/MessageRind/MessageRindIBLL.cs

@@ -37,6 +37,13 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         MessageRemindEntity GetMessageRemindEntity(string keyValue);
+
+        /// <summary>
+        /// 获取MessageRemind表实体数据
+        /// </summary>
+        /// <param name="InstanceId">主键</param>
+        /// <returns></returns>
+        MessageRemindEntity GetMessageRemindEntityByInstanceId(string InstanceId, string userId);
         #endregion
 
         #region 提交数据
@@ -57,6 +64,12 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// </summary>
         /// <param name="keyValue"></param>
         void SaveReadSigns(string keyValue);
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="userId">主键</param>
+        void SaveReadSignsByUserId(string userId);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs

@@ -141,6 +141,30 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
             }
         }
 
+        /// <summary>
+        /// 获取MessageRemind表实体数据
+        /// </summary>
+        /// <param name="InstanceId">主键</param>
+        /// <returns></returns>
+        public MessageRemindEntity GetMessageRemindEntityByInstanceId(string InstanceId, string userId)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<MessageRemindEntity>(x => x.InstanceId == InstanceId && x.ReceiptId == userId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据
@@ -230,6 +254,31 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 }
             }
         }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="userId">主键</param>
+        public void SaveReadSignsByUserId(string userId)
+        {
+            try
+            {
+                string sql = $"update MessageRemind set ReadSigns=1 where ReceiptId='{userId}' and ReadSigns<>1 ";
+                this.BaseRepository().ExecuteBySql(sql);
+            }
+            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/LogisticsManagement/Acc_Punishment/Acc_PunishmentBLL.cs

@@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        public IEnumerable<Acc_PunishmentEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return acc_PunishmentService.GetPageListForStatistics(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取Acc_Punishment表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
     /// 日 期：2020-08-11 16:48
     /// 描 述：惩罚管理
     /// </summary>
-    public class Acc_PunishmentEntity 
+    public class Acc_PunishmentEntity
     {
         #region  实体成员
         /// <summary>
@@ -112,6 +112,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public string num { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<Acc_PunishmentEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<Acc_PunishmentEntity> GetPageListForStatistics(Pagination pagination, string queryJson);
         /// <summary>
         /// 获取Acc_Punishment表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs

@@ -57,6 +57,74 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+
+        /// <summary>
+        /// 奖励统计
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<Acc_PunishmentEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                var filedSql = "";
+                var groupSql = "";
+                strSql.Append("SELECT ");
+
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["SYear"].IsEmpty() && queryParam["SYear"].ToString().Trim() == "1")
+                {
+                    filedSql += " SYear,";
+                }
+                if (!queryParam["Semester"].IsEmpty() && queryParam["Semester"].ToString().Trim() == "1")
+                {
+                    filedSql += " Semester,";
+                }
+                if (!queryParam["Dormitory"].IsEmpty() && queryParam["Dormitory"].ToString().Trim() == "1")
+                {
+                    filedSql += " Dormitory,";
+                }
+                if (!queryParam["Unit"].IsEmpty() && queryParam["Unit"].ToString().Trim() == "1")
+                {
+                    filedSql += " Unit,";
+                }
+                if (!queryParam["Floor"].IsEmpty() && queryParam["Floor"].ToString().Trim() == "1")
+                {
+                    filedSql += " Floor,";
+                }
+                if (!queryParam["RId"].IsEmpty() && queryParam["RId"].ToString().Trim() == "1")
+                {
+                    filedSql += " RId,";
+                }
+                if (!string.IsNullOrEmpty(filedSql))
+                {
+                    strSql.Append(filedSql);
+                    groupSql = " group by " + filedSql.Substring(0, filedSql.Length - 1);
+                }
+
+                strSql.Append(" count(1) as num  FROM Acc_Punishment t ");
+                strSql.Append("  WHERE 1=1 ");
+                strSql.Append(groupSql);
+                return this.BaseRepository("CollegeMIS").FindList<Acc_PunishmentEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
         /// <summary>
         /// 获取Acc_Punishment表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardBLL.cs

@@ -42,6 +42,30 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<Acc_RewardEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return acc_RewardService.GetPageListForStatistics(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取Acc_Reward表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
     /// 日 期：2020-08-11 16:46
     /// 描 述：宿舍奖励
     /// </summary>
-    public class Acc_RewardEntity 
+    public class Acc_RewardEntity
     {
         #region  实体成员
         /// <summary>
@@ -112,6 +112,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         }
         #endregion
         #region  扩展字段
+        [NotMapped]
+        public string num { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<Acc_RewardEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<Acc_RewardEntity> GetPageListForStatistics(Pagination pagination, string queryJson);
         /// <summary>
         /// 获取Acc_Reward表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs

@@ -57,6 +57,72 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        /// <summary>
+        /// 奖励统计
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public IEnumerable<Acc_RewardEntity> GetPageListForStatistics(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                var filedSql = "";
+                var groupSql = "";
+                strSql.Append("SELECT ");
+
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["SYear"].IsEmpty()&& queryParam["SYear"].ToString().Trim()=="1")
+                {
+                    filedSql += " SYear,";
+                }
+                if (!queryParam["Semester"].IsEmpty() && queryParam["Semester"].ToString().Trim() == "1")
+                {
+                    filedSql += " Semester,";
+                }
+                if (!queryParam["Dormitory"].IsEmpty() && queryParam["Dormitory"].ToString().Trim() == "1")
+                {
+                    filedSql += " Dormitory,";
+                }
+                if (!queryParam["Unit"].IsEmpty() && queryParam["Unit"].ToString().Trim() == "1")
+                {
+                    filedSql += " Unit,";
+                }
+                if (!queryParam["Floor"].IsEmpty() && queryParam["Floor"].ToString().Trim() == "1")
+                {
+                    filedSql += " Floor,";
+                }
+                if (!queryParam["RId"].IsEmpty() && queryParam["RId"].ToString().Trim() == "1")
+                {
+                    filedSql += " RId,";
+                }
+                if (!string.IsNullOrEmpty(filedSql))
+                {
+                    strSql.Append(filedSql);
+                    groupSql = " group by " + filedSql.Substring(0, filedSql.Length - 1);
+                }
+
+                strSql.Append(" count(1) as num  FROM Acc_Reward t ");
+                strSql.Append("  WHERE 1=1 ");
+                strSql.Append(groupSql);
+                return this.BaseRepository("CollegeMIS").FindList<Acc_RewardEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取Acc_Reward表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/AsposeCore.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Aspose.Cells;
+using Aspose.Words;
+using Learun.Util;
+using SaveFormat = Aspose.Words.SaveFormat;
+
+namespace Quanjiang.DigitalSchool.AsposeHelper
+{
+    public class AsposeCore
+    {
+        public static void  AsposeCoreInit()
+        {
+            new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4yMDA2MDIwMTI2MzM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+OTM2ZTVmZDEtODY2Mi00YWJmLTk1YmQtYzhkYzBmNTNhZmE2PC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjEwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT5wSkpjQndRdnYxV1NxZ1kyOHFJYUFKSysvTFFVWWRrQ2x5THE2RUNLU0xDQ3dMNkEwMkJFTnh5L3JzQ1V3UExXbjV2bTl0TDRQRXE1aFAzY2s0WnhEejFiK1JIWTBuQkh1SEhBY01TL1BSeEJES0NGbWg1QVFZRTlrT0FxSzM5NVBSWmJRSGowOUNGTElVUzBMdnRmVkp5cUhjblJvU3dPQnVqT1oyeDc4WFE9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
+            new Aspose.Cells.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4yMDA2MDIwMTI2MzM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+OTM2ZTVmZDEtODY2Mi00YWJmLTk1YmQtYzhkYzBmNTNhZmE2PC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjEwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT5wSkpjQndRdnYxV1NxZ1kyOHFJYUFKSysvTFFVWWRrQ2x5THE2RUNLU0xDQ3dMNkEwMkJFTnh5L3JzQ1V3UExXbjV2bTl0TDRQRXE1aFAzY2s0WnhEejFiK1JIWTBuQkh1SEhBY01TL1BSeEJES0NGbWg1QVFZRTlrT0FxSzM5NVBSWmJRSGowOUNGTElVUzBMdnRmVkp5cUhjblJvU3dPQnVqT1oyeDc4WFE9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
+        }
+        public static void GetWordData(string path)
+        {
+            try
+            {
+                Document document = new Document(path);
+                document.Save(path.Substring(0, path.LastIndexOf(".")) + ".pdf",SaveFormat.Pdf);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        public static void GetExcelData(string path)
+        {
+            try
+            {
+                Workbook document = new Workbook(path);
+                document.Save(path.Substring(0, path.LastIndexOf(".")) + ".pdf", Aspose.Cells.SaveFormat.Pdf);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+    }
+}

Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Quanjiang.DigitalSchool.Aspose")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Quanjiang.DigitalSchool.Aspose")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("767d20c4-b983-4940-bf97-74d5479ca558")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Quanjiang.DigitalSchool.Aspose.csproj

@@ -55,7 +55,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Aspose.Cells" version="20.10.0" targetFramework="net461" />
+  <package id="Aspose.Words" version="20.10.0" targetFramework="net461" />
+</packages>

Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln

@@ -126,6 +126,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalSchool.IMS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalScholl.Tools", "Quanjiang.Application.Tools\Quanjiang.DigitalScholl.Tools.csproj", "{E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalSchool.Aspose", "Quanjiang.DigitalSchool.Aspose\Quanjiang.DigitalSchool.Aspose.csproj", "{767D20C4-B983-4940-BF97-74D5479CA558}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Android = Debug|Android
@@ -1624,6 +1626,42 @@ Global
 		{E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}.Release|Windows-x64.Build.0 = Release|Any CPU
 		{E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}.Release|Windows-x86.ActiveCfg = Release|Any CPU
 		{E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}.Release|Windows-x86.Build.0 = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Android.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Android.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|iOS.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|iOS.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-ARM.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-ARM.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x64.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x64.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x86.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x86.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Android.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Android.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Any CPU.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Any CPU.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|iOS.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|iOS.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-ARM.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-ARM.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x64.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x64.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x86.ActiveCfg = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x86.Build.0 = Debug|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Android.ActiveCfg = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Android.Build.0 = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Any CPU.Build.0 = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|iOS.ActiveCfg = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|iOS.Build.0 = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-ARM.ActiveCfg = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-ARM.Build.0 = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x64.ActiveCfg = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x64.Build.0 = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x86.ActiveCfg = Release|Any CPU
+		{767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1675,7 +1713,7 @@ Global
 		{E05A2B9A-A939-450F-9A44-A8B3201D055A} = {ED258CD0-0A0C-490B-9D8F-B4CEC4467251}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35
 		SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35
 	EndGlobalSection
 EndGlobal