完成，待测试

Areas/Admin/Controllers/MainServer/UserRankWhiteController.cs

@@ -477,6 +477,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("Rank", "等级名称");
             ReturnFields.Add("Status", "有效状态");
             ReturnFields.Add("CreateDate", "创建时间");
+            ReturnFields.Add("UpdateDate", "过期时间");
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "UserRankWhite", "ExportExcel");
             return Json(result);
@@ -499,22 +500,21 @@ namespace MySystem.Areas.Admin.Controllers
         public string QuickExportExcelDo(string MakerCode, string RealName, string StatusSelect, string TopMakerCode, string UpdateDateData)
         {
 
-            string SqlString = " and Status>-1";
-            string condition = " and Status>-1";
+            string condition = " where 1=1 and a.Status>-1";
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
+                condition += " and a.UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
             }
             //创客名称
             if (!string.IsNullOrEmpty(RealName))
             {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
+                condition += " and a.UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
-                condition += " and Status=" + StatusSelect;
+                condition += " and a.Status=" + StatusSelect;
             }
             //顶级创客编号
             if (!string.IsNullOrEmpty(TopMakerCode))
@@ -542,7 +542,7 @@ namespace MySystem.Areas.Admin.Controllers
                     childIds += item.Id + ",";
                 }
                 childIds = childIds.TrimEnd(',');
-                condition += " and UserId in (" + childIds + ")";
+                condition += " and a.UserId in (" + childIds + ")";
             }
             //到期时间
             if (!string.IsNullOrEmpty(UpdateDateData))
@@ -550,9 +550,9 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = UpdateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
                 string end = datelist[1];
-                condition += " and UpdateDate>='" + start + " 00:00:00' and UpdateDate<='" + end + " 23:59:59'";
+                condition += " and a.UpdateDate>='" + start + " 00:00:00' and a.UpdateDate<='" + end + " 23:59:59'";
             }
-            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
+            var Sql = "SELECT b.MakerCode '创客编号',b.RealName '创客姓名',b.UserLevel '创客职级',c.MakerCode '上级创客编号',c.RealName ' 上级创客姓名',d.MakerCode '顶级创客编号',d.RealName '顶级创客姓名',a.CreateDate '创建时间',a.UpdateDate '过期时间',a.Rank '预设职级' FROM UserRankWhite a LEFT JOIN Users b ON a.UserId=b.Id LEFT JOIN Users c ON b.ParentUserId=c.Id LEFT JOIN Users d ON SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1)=d.Id" + condition;
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "创客预设职级记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";

wwwroot/layuiadmin/modules_main/UserRankWhite_Admin.js

@@ -356,15 +356,40 @@ layui.config({
             $(".layuiadmin-card-header-auto select").each(function (i) {
                 userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
             });
-            $.ajax({
-                type: "GET",
-                url: "/Admin/UserRankWhite/ExportExcel?r=" + Math.random(1),
-                data: userdata,
-                dataType: "json",
-                success: function (data) {
-                    data.Obj.unshift(data.Fields);
-                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
-                }
+            // $.ajax({
+            //     type: "GET",
+            //     url: "/Admin/UserRankWhite/ExportExcel?r=" + Math.random(1),
+            //     data: userdata,
+            //     dataType: "json",
+            //     success: function (data) {
+            //         data.Obj.unshift(data.Fields);
+            //         excel.exportExcel(data.Obj, data.Info, 'xlsx');
+            //     }
+            // });
+            var index = layer.confirm('确定导出吗？', function (index) {
+                var indexs = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/UserRankWhite/QuickExportExcelDo?r=" + Math.random(1),
+                    data: userdata,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index); //关闭弹层
+                        if (data == "success") {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg('导出成功，请到我的下载中点击下载文件', {
+                                time: 1000
+                            }, function () {
+                                window.location.reload();
+                            });
+                        } else {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg(data);
+                        }
+                    }
+                });
             });
         }
         , Open: function () {