Merge branch 'feature-dgy-运营中心过期' into DuGuYang

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -1,3 +1,5 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 /*
  * 运营中心
  */
@@ -61,7 +63,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 运营中心列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(SysAdmin data, string OpCode, string MakerCode, string MakerName, string UserType, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(SysAdmin data, string OpCode, string MakerCode, string MakerName, string UserType, string ExpiredStatus, string CreateDateData, string ExpiredDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -113,6 +115,22 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
+            //是否过期
+            if (!string.IsNullOrEmpty(ExpiredStatus))
+            {
+                var status = int.Parse(ExpiredStatus);
+                var time = DateTime.Now.ToString("yyyy-MM-dd Hh:mm:ss");
+                if (status == 0) condition += " and ExpiredDate>'" + time + "'";
+                if (status == 1) condition += " and ExpiredDate<='" + time + "'";
+            }
+            //过期时间
+            if (!string.IsNullOrEmpty(ExpiredDateData))
+            {
+                string[] datelist = ExpiredDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and ExpiredDate>='" + start + " 00:00:00' and ExpiredDate<='" + end + " 23:59:59'";
+            }
 
             Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SysAdmin", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -121,6 +139,11 @@ namespace MySystem.Areas.Admin.Controllers
                 //所属人信息
                 int Id = int.Parse(dic["Id"].ToString());
                 SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
+                dic["ExpiredStatus"] = "未过期"; // 是否过期(0 未过期 1 已过期)
+                if (sysAdmin.ExpireDate < DateTime.Now)
+                {
+                    dic["ExpiredStatus"] = "已过期";
+                }
                 var userInfo = db.Users.FirstOrDefault(m => m.Id == sysAdmin.UserId) ?? new Models.Users();
                 if (userInfo.UserType == 0) dic["Kind"] = "";
                 if (userInfo.UserType == 1) dic["Kind"] = "运营中心";
@@ -682,7 +705,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
-                
+
                 if (Kind == 2 && ReturnFlag == 1)
                 {
                     RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());

Areas/Admin/Views/OperateServer/SysAdminOperate/Index.cshtml

@@ -78,6 +78,16 @@
                             </select>
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">是否过期</label>
+                        <div class="layui-input-inline">
+                            <select id="ExpiredStatus" name="ExpiredStatus">
+                                <option value="">请选择</option>
+                                <option value="0">未过期</option>
+                                <option value="1">已过期</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
@@ -85,6 +95,13 @@
                                 placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">过期时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="ExpiredDateData" id="ExpiredDateData"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -63,6 +63,34 @@ layui.config({
         }
     });
 
+    var layExpiredDateData = laydate.render({
+        elem: '#ExpiredDateData',
+        trigger: 'click',
+        type: 'date',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layExpiredDateData.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layExpiredDateData.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#ExpiredDateData').val(value);
+            }
+        }
+    });
+
 
     //excel导入
     excel = layui.excel;
@@ -107,6 +135,14 @@ layui.config({
                 width: 80,
                 sort: true,
                 unresize: true
+            }, {
+                field: 'ExpiredStatus',
+                title: '是否过期',
+                sort: true
+            }, {
+                field: 'ExpireDate',
+                title: '过期时间',
+                sort: true
             }, {
                 field: 'OpCode',
                 title: '运营中心编号',
@@ -368,8 +404,8 @@ layui.config({
                                 if (data == "success") {
                                     table.reload('LAY-list-manage'); //数据刷新
                                 } else {
-                                        layer.close(loadindex); //关闭弹层
-                                        layer.msg(data);
+                                    layer.close(loadindex); //关闭弹层
+                                    layer.msg(data);
                                 }
                             }
                         });
@@ -479,8 +515,8 @@ layui.config({
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
                                 } else {
-                                        layer.close(loadindex); //关闭弹层
-                                        layer.msg(data);
+                                    layer.close(loadindex); //关闭弹层
+                                    layer.msg(data);
                                 }
                             }
                         });