From d2197a6d2f0704cb8310969440237fe65ba90ddb Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 16 Mar 2022 23:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=9D=E5=AE=A4=E6=99=9A=E5=BD=92=E8=A7=84?= =?UTF-8?q?=E5=88=99=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Acc_DormitoryRuleController.cs | 5 +++++ .../Views/Acc_DormitoryRule/Form.cshtml | 12 ++++++++---- .../Views/Acc_DormitoryRule/Index.js | 3 ++- .../Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs | 5 +++++ .../Acc_DormitoryRule/Acc_DormitoryRuleService.cs | 6 +----- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs index fdb4f9134..043d4af3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_DormitoryRuleController.cs +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml index 6a6c120e0..100ee31f8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Form.cshtml @@ -7,15 +7,19 @@
晚归时间*
-
+
推送人*
-
+
-
+
推送班主任*
-
+
+
推送时间点*
+ +
+
启用*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js index cd1b97a40..4b81ce7c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DormitoryRule/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs index 61fab88f7..351f0e912 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleEntity.cs +++ b/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; } /// + /// 推送时间点 + /// + [Column("PUSHHOUR")] + public int? PushHour { get; set; } + /// /// 是否启用 /// [Column("ISENABLE")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs index 01ff3c3f7..751c2f837 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_DormitoryRule/Acc_DormitoryRuleService.cs +++ b/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 ");