Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -112,12 +112,22 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         /// 启用
         /// </summary>
         /// <param name="keyValue">主键</param>
+        /// <param name="status">启用标识：1启用0禁用</param>
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult DoEnabled(string keyValue)
+        public ActionResult DoEnabled(string keyValue,string status)
         {
-            emailManagementIBLL.DoEnabled(keyValue);
+            if (status == "1")//启用
+            {
+                //判断是否已有启用项
+                var model = emailManagementIBLL.GetEmailManagementEntityEnabled();
+                if (model != null)
+                {
+                    return Fail("已有启用项，请禁用后再操作！");
+                }
+            }
+            emailManagementIBLL.DoEnabled(keyValue,status);
             return Success("操作成功！");
         }
         #endregion

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

@@ -3,33 +3,41 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="EmailManagement" >
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
+        <div class="lr-form-item-title">SMTP服务器<font face="宋体">*</font></div>
+        <div id="F_SMTPServer" isvalid="yes" checkexpession="NotNull"></div>
+    </div> 
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
+        <div class="lr-form-item-title">SMTP服务端口<font face="宋体">*</font></div>
+        <input id="F_SMTPPort" type="text" class="form-control" isvalid="yes" checkexpession="PositiveInteger" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
         <div class="lr-form-item-title">发件邮箱账号<font face="宋体">*</font></div>
         <input id="F_Account" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EmailManagement" >
-        <div class="lr-form-item-title">发件邮箱密码<font face="宋体">*</font></div>
-        <input id="F_Password" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
+        <div class="lr-form-item-title">发件邮箱密码</div>
+        <input id="F_Password" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
+        <div class="lr-form-item-title">客户端授权码<font face="宋体">*</font></div>
+        <input id="F_AuthorizeCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EmailManagement" >
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
         <div class="lr-form-item-title">发件邮箱名称<font face="宋体">*</font></div>
         <input id="F_SenderName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
         <div class="lr-form-item-title">定时发送小时<font face="宋体">*</font></div>
-        <div id="F_Hour" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="F_Hour" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
         <div class="lr-form-item-title">定时发送分钟</div>
-        <div id="F_Minute" ></div>        
+        <div id="F_Minute"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EmailManagement" >
-        <div class="lr-form-item-title">启用</div>
-        <div id="F_EnabledMark"></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EmailManagement" >
+    <div class="col-xs-12 lr-form-item" data-table="EmailManagement">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="F_Description" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="F_Description" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/EmailManagement/Form.js")

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

@@ -15,12 +15,9 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#F_EnabledMark').lrRadioCheckbox({
-                type: 'radio',
-                code: 'YesOrNoInt',
-            });
             $('#F_Hour').lrselect({ data: getArray(24), allowSearch: true });
-            $('#F_Minute').lrselect({ data: getArray(60), allowSearch: true  });
+            $('#F_Minute').lrselect({ data: getArray(60), allowSearch: true });
+            $('#F_SMTPServer').lrDataItemSelect({ code: 'SMTPServer' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -17,6 +17,7 @@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_enabled" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;启用</a>
+                        <a id="lr_unenabled" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;禁用</a>
                     </div>
                 </div>
             </div>

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

@@ -81,9 +81,28 @@ var bootstrap = function ($, learun) {
                         return false;
                     }
 
-                    learun.layerConfirm('启用操作将会对已启用的项目进行禁用，是否确认启用该项！', function (res) {
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/EmailManagement/DoEnabled', { keyValue: keyValue }, function () {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/EmailManagement/DoEnabled', { keyValue: keyValue,status:1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 禁用
+            $('#lr_unenabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('F_Id');
+                if (learun.checkrow(keyValue)) {
+                    var F_EnabledMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                    if (F_EnabledMark != "1") {
+                        learun.alert.warning("当前项未启用！");
+                        return false;
+                    }
+
+                    learun.layerConfirm('是否确认禁用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/EmailManagement/DoEnabled', { keyValue: keyValue,status:0 }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -93,11 +112,14 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/EmailManagement/GetPageList',
                 headData: [
+                    { label: "SMTP服务器", name: "F_SMTPServer", width: 100, align: "left"},
+                    { label: "SMTP服务器端口", name: "F_SMTPPort", width: 100, align: "left"},
                     { label: "发件邮箱账号", name: "F_Account", width: 200, align: "left"},
                     { label: "发件邮箱密码", name: "F_Password", width: 200, align: "left"},
+                    { label: "客户端授权码", name: "F_AuthorizeCode", width: 200, align: "left"},
                     { label: "发件邮箱名称", name: "F_SenderName", width: 200, align: "left"},
                     { label: "定时发送小时", name: "F_Hour", width: 150, align: "left"},
                     { label: "定时发送分钟", name: "F_Minute", width: 150, align: "left"},
@@ -109,7 +131,8 @@ var bootstrap = function ($, learun) {
                     },
                 ],
                 mainId:'F_Id',
-                isPage: true
+                isPage: true,
+                sidx:'F_CreatorTime desc'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EmailManagement/EmailManagementBLL.cs

@@ -67,6 +67,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取EmailManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public EmailManagementEntity GetEmailManagementEntityEnabled()
+        {
+            try
+            {
+                return emailManagementService.GetEmailManagementEntityEnabled();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据
@@ -123,11 +147,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// 启用
         /// </summary>
         /// <param name="keyValue">主键</param>
-        public void DoEnabled(string keyValue)
+        public void DoEnabled(string keyValue, string status)
         {
             try
             {
-                emailManagementService.DoEnabled(keyValue);
+                emailManagementService.DoEnabled(keyValue,status);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EmailManagement/EmailManagementEntity.cs

@@ -84,6 +84,21 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("F_DAYOFWEEK")]
         public int? F_DayOfWeek { get; set; }
+        /// <summary>
+        /// 客户端授权码
+        /// </summary>
+        [Column("F_AUTHORIZECODE")]
+        public string F_AuthorizeCode { get; set; }
+        /// <summary>
+        /// SMTP服务器
+        /// </summary>
+        [Column("F_SMTPSERVER")]
+        public string F_SMTPServer { get; set; }
+        /// <summary>
+        /// SMTP服务器端口
+        /// </summary>
+        [Column("F_SMTPPORT")]
+        public int? F_SMTPPort { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EmailManagement/EmailManagementIBLL.cs

@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         EmailManagementEntity GetEmailManagementEntity(string keyValue);
+        /// <summary>
+        /// 获取EmailManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        EmailManagementEntity GetEmailManagementEntityEnabled();
         #endregion
 
         #region 提交数据
@@ -46,7 +52,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// 启用
         /// </summary>
         /// <param name="keyValue">主键</param>
-        void DoEnabled(string keyValue);
+        void DoEnabled(string keyValue, string status);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EmailManagement/EmailManagementService.cs

@@ -30,16 +30,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.F_Id,
-                t.F_Account,
-                t.F_Password,
-                t.F_SenderName,
-                t.F_Hour,
-                t.F_Minute,
-                t.F_EnabledMark
-                ");
+                strSql.Append("SELECT t.*");
                 strSql.Append("  FROM EmailManagement t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -84,6 +75,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取EmailManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public EmailManagementEntity GetEmailManagementEntityEnabled()
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<EmailManagementEntity>(x=>x.F_EnabledMark == 1);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据
@@ -148,21 +163,23 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// 启用
         /// </summary>
         /// <param name="keyValue">主键</param>
-        public void DoEnabled(string keyValue)
+        public void DoEnabled(string keyValue, string status)
         {
-            var db = this.BaseRepository().BeginTrans();
             try
             {
-                //禁用，已启用项目
-                db.ExecuteBySql("update EmailManagement set F_EnabledMark=0 where F_EnabledMark=1 ");
-                //启用
-                db.ExecuteBySql($"update EmailManagement set F_EnabledMark=1 where F_Id='{keyValue}' ");
-
-                db.Commit();
+                if (status == "1")
+                {
+                    //启用
+                    this.BaseRepository().ExecuteBySql($"update EmailManagement set F_EnabledMark=1 where F_Id='{keyValue}' ");
+                }
+                else
+                {
+                    //禁用
+                    this.BaseRepository().ExecuteBySql($"update EmailManagement set F_EnabledMark=0 where F_Id='{keyValue}' ");
+                }
             }
             catch (Exception ex)
             {
-                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;