Merge branch '娄底高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 娄底高职分支

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

@@ -136,7 +136,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         }
 
         /// <summary>
-        /// 开启/关闭
+        /// 微信推送开启/关闭
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
@@ -157,6 +157,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             sys_InformationPushIBLL.SaveEntity(keyValue, entity);
             return Success("操作成功！");
         }
+        /// <summary>
+        /// 短信推送开启/关闭
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoOpenSMS(string keyValue, bool status)
+        {
+            var userInfo = LoginUserInfo.Get();
+            var entity = sys_InformationPushIBLL.GetSys_InformationPushEntity(keyValue);
+            if (entity == null)
+            {
+                return Fail("当前推送项目不存在！");
+            }
+            entity.StatusSMS = status;
+            entity.ModifyUserId = userInfo.userId;
+            entity.ModifyUserName = userInfo.realName;
+            entity.ModifyTime = DateTime.Now;
+            sys_InformationPushIBLL.SaveEntity(keyValue, entity);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

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

@@ -3,13 +3,17 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_InformationPush" >
+    <div class="col-xs-12 lr-form-item" data-table="Sys_InformationPush">
         <div class="lr-form-item-title">推送项目<font face="宋体">*</font></div>
-        <div id="PushItem" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="PushItem" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Sys_InformationPush" >
-        <div class="lr-form-item-title">是否开启<font face="宋体">*</font></div>
-        <div id="Status" isvalid="yes" checkexpession="NotNull" ></div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_InformationPush">
+        <div class="lr-form-item-title">微信推送开启<font face="宋体">*</font></div>
+        <div id="Status" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_InformationPush">
+        <div class="lr-form-item-title">短信推送开启<font face="宋体">*</font></div>
+        <div id="StatusSMS" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_InformationPush/Form.js")

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

@@ -18,6 +18,8 @@ var bootstrap = function ($, learun) {
             $('#PushItem').lrDataItemSelect({ code: 'InformationPushItem' });
             $('#Status').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#Status').lrselectSet("false");
+            $('#StatusSMS').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#StatusSMS').lrselectSet("false");
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -20,8 +20,12 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_open" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;开启</a>
-                        <a id="lr_close" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;关闭</a>
+                        <a id="lr_open" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;微信推送开启</a>
+                        <a id="lr_close" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;微信推送关闭</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_openSMS" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;短信推送开启</a>
+                        <a id="lr_closeSMS" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;短信推送关闭</a>
                     </div>
                 </div>
             </div>

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

@@ -59,13 +59,13 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //  开启
+            //  微信推送开启
             $('#lr_open').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var status = $('#gridtable').jfGridValue('Status');
                     if (status == true) {
-                        learun.alert.warning("该推送项目已开启！");
+                        learun.alert.warning("该推送项目已开启微信推送！");
                         return false;
                     }
                     learun.layerConfirm('是否确认开启该项！', function (res) {
@@ -77,13 +77,13 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            //  关闭
+            //  微信推送关闭
             $('#lr_close').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     var status = $('#gridtable').jfGridValue('Status');
                     if (status != true) {
-                        learun.alert.warning("该推送项目暂未开启！");
+                        learun.alert.warning("该推送项目暂未开启微信推送！");
                         return false;
                     }
                     learun.layerConfirm('是否确认关闭该项！', function (res) {
@@ -95,6 +95,42 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //  短信推送开启
+            $('#lr_openSMS').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('StatusSMS');
+                    if (status == true) {
+                        learun.alert.warning("该推送项目已开启短信推送！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认开启该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_InformationPush/DoOpenSMS', { keyValue: keyValue, status: true }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  短信推送关闭
+            $('#lr_closeSMS').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('StatusSMS');
+                    if (status != true) {
+                        learun.alert.warning("该推送项目暂未开启短信推送！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认关闭该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_InformationPush/DoOpenSMS', { keyValue: keyValue, status: false }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -114,7 +150,13 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "是否开启", name: "Status", width: 100, align: "left",
+                        label: "微信推送开启", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                    {
+                        label: "短信推送开启", name: "StatusSMS", width: 100, align: "left",
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_InformationPush/Sys_InformationPushEntity.cs

@@ -25,7 +25,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("PUSHITEM")]
         public string PushItem { get; set; }
         /// <summary>
-        /// 开关状态
+        /// 微信推送开关状态
         /// </summary>
         [Column("STATUS")]
         public bool? Status { get; set; }
@@ -59,6 +59,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("MODIFYTIME")]
         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 短信推送开启状态
+        /// </summary>
+        [Column("STATUSSMS")]
+        public bool? StatusSMS { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_InformationPush/Sys_InformationPushService.cs

@@ -30,12 +30,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.PushItem,
-                t.Status
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM Sys_InformationPush t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();