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

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

@@ -39,7 +39,7 @@
     "~/Areas/LR_Desktop/Views/MessageRind/Index.js"
     )
 
-<script type='text/javascript'>
+    <script type='text/javascript'>
     var name = '@(ViewBag.Name)';
     $(document).ready(function () {
         getdata();
@@ -83,7 +83,6 @@
         $('#uldata .lr-item').on('click', function () {
             var $obj = $(this);
             var params = ($obj.attr('id')).split('、');
-
             //更改状态为已读
             var MessageId = params[2];
             if (top.learun.checkrow(MessageId)) {
@@ -93,28 +92,31 @@
                     data: { keyValue: MessageId },
                     dataType: "json",
                     async: false,
-                    success: function (data) {
+                    success: function(data) {
                         //弹窗查看详情
                         var keyValue = params[1];
                         var ConnectionUrl = params[3];
                         var title = params[0];
-                        if (top.learun.checkrow(keyValue)) {
+                        if (!!ConnectionUrl) {
+                            var url = top.$.rootUrl + ConnectionUrl;
+                            if (!!keyValue && keyValue != 'null' && keyValue != 'undefined') {
+                                url += keyValue;
+                            }
                             top.learun.layerForm({
                                 id: 'formview',
                                 title: title,
-                                url: top.$.rootUrl + ConnectionUrl + keyValue,
+                                url: url,
                                 width: 1000,
                                 height: 650,
                                 maxmin: true,
                                 btn: null,
                             });
 
-                        }
+                        } 
+
                     }
                 })
-            }
-
-
+            } 
         });
     });
 
@@ -136,6 +138,6 @@
 
     //}
 
-</script>
+    </script>
 </body>
 </html>

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

@@ -114,6 +114,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
                 return Fail("晚归时间格式不正确！");
             }
 
+            if (!(entity.PushHour >= 0 && entity.PushHour <= 23))
+            {
+                return Fail("推送时间点填写不正确！");
+            }
+
             var model = acc_DormitoryRuleIBLL.GetEnableEntity();
             if (entity.IsEnable == 1)
             {

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

@@ -7,15 +7,19 @@
         <div class="lr-form-item-title">晚归时间<font face="宋体">*</font></div>
         <input id="LateReturnTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写时分，例如：22:00" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_DormitoryRule" >
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">推送人<font face="宋体">*</font></div>
-        <div id="PushUser" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="PushUser" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_DormitoryRule" >
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">推送班主任<font face="宋体">*</font></div>
         <div id="ClassDiredctor"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Acc_DormitoryRule" >
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
+        <div class="lr-form-item-title">推送时间点<font face="宋体">*</font></div>
+        <input id="PushHour" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="请填写0-23数字" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Acc_DormitoryRule">
         <div class="lr-form-item-title">启用<font face="宋体">*</font></div>
         <div id="IsEnable"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js

@@ -66,7 +66,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LogisticsManagement/Acc_DormitoryRule/GetPageList',
                 headData: [
                     { label: "晚归时间", name: "LateReturnTime", width: 100, align: "left" },
@@ -113,6 +113,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "推送时间点", name: "PushHour", width: 100, align: "left" },
                     {
                         label: "启用", name: "IsEnable", width: 100, align: "left",
                         formatter: function (cellvalue, rowObject) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs

@@ -35,6 +35,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         [Column("CLASSDIREDCTOR")]
         public int? ClassDiredctor { get; set; }
         /// <summary>
+        /// 推送时间点
+        /// </summary>
+        [Column("PUSHHOUR")]
+        public int? PushHour { get; set; }
+        /// <summary>
         /// 是否启用
         /// </summary>
         [Column("ISENABLE")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs

@@ -32,11 +32,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.Id,
-                t.LateReturnTime,
-                t.PushUser,
-                t.ClassDiredctor,
-                t.IsEnable
+                t.*
                 ");
                 strSql.Append("  FROM Acc_DormitoryRule t ");
                 strSql.Append("  WHERE 1=1 ");