调整时间筛选

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -51,12 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 弹窗消息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MsgAlert data, string MsgTypeSelect, string PushTypeSelect, string PushFlagSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(MsgAlert data, string MsgTypeSelect, string PushTypeSelect, string PushFlagSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Title", "1"); //标题
 
 
@@ -76,6 +76,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PushFlag=" + PushFlagSelect;
             }
+            //创建时间
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MsgAlert", Fields, "Id desc", "0", page, limit, condition);

wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

@@ -32,7 +32,7 @@ layui.config({
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
-        type: 'datetime',
+        type: 'date',
         range: true,
         trigger: 'click',
         change: function (value, date, endDate) {