调整默认显示数据

Areas/Admin/Controllers/MainServer/UserCashRecordForBusinessController.cs

@@ -89,49 +89,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var start = datelist[0];
                 var end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
-                // var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
-                // var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
-                // var check = db.UserCashRecordForBusiness.Any(m => m.CreateDate >= start);
-                // var checks = db.UserCashRecordForBusiness.Any(m => m.CreateDate <= end);
-                // if (check)
-                // {
-                //     var sId = db.UserCashRecordForBusiness.Where(m => m.CreateDate >= start).Min(m => m.Id);
-                //     condition += "  and Id >=" + sId;
-                // }
-                // if (checks)
-                // {
-                //     var eId = db.UserCashRecordForBusiness.Where(m => m.CreateDate <= end).Max(m => m.Id);
-                //     condition += " and Id <=" + eId;
-                // }
             }
-            // else
-            // {
-            //     var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
-            //     var check = db.UserCashRecordForBusiness.Any(m => m.CreateDate >= start);
-            //     if (check)
-            //     {
-            //         var minId = db.UserCashRecordForBusiness.Where(m => m.CreateDate >= start).Min(m => m.Id);
-            //         var Info = function.ReadInstance("/WritePage/UserCashRecord/UserCashRecordForBusiness.txt");
-            //         if (string.IsNullOrEmpty(Info.ToString()))
-            //         {
-            //             function.WritePage("/WritePage/UserCashRecord/", "UserCashRecordForBusiness.txt", minId.ToString());
-            //             condition += " and Id >=" + minId;
-            //         }
-            //         else if (minId != int.Parse(Info))
-            //         {
-            //             function.WritePage("/WritePage/UserCashRecord/", "UserCashRecordForBusiness.txt", minId.ToString());
-            //             condition += " and Id >=" + minId;
-            //         }
-            //         else
-            //         {
-            //             condition += " and Id >=" + Convert.ToInt32(Info);
-            //         }
-            //     }
-            //     else
-            //     {
-            //         condition += " and Id =0";
-            //     }
-            // }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecordForBusiness", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -271,48 +229,9 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
-                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
-                var check = db.UserCashRecordForBusiness.Any(m => m.CreateDate >= start);
-                var checks = db.UserCashRecordForBusiness.Any(m => m.CreateDate <= end);
-                if (check)
-                {
-                    var sId = db.UserCashRecordForBusiness.Where(m => m.CreateDate >= start).Min(m => m.Id);
-                    condition += "  and a.Id >=" + sId;
-                }
-                if (checks)
-                {
-                    var eId = db.UserCashRecordForBusiness.Where(m => m.CreateDate <= end).Max(m => m.Id);
-                    condition += " and a.Id <=" + eId;
-                }
-            }
-            else
-            {
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
-                var check = db.UserCashRecordForBusiness.Any(m => m.CreateDate >= start);
-                if (check)
-                {
-                    var minId = db.UserCashRecordForBusiness.Where(m => m.CreateDate >= start).Min(m => m.Id);
-                    var Info = function.ReadInstance("/WritePage/UserCashRecord/UserCashRecordForBusiness.txt");
-                    if (string.IsNullOrEmpty(Info.ToString()))
-                    {
-                        function.WritePage("/WritePage/UserCashRecord/", "UserCashRecordForBusiness.txt", minId.ToString());
-                        condition += " and a.Id >=" + minId;
-                    }
-                    else if (minId != int.Parse(Info))
-                    {
-                        function.WritePage("/WritePage/UserCashRecord/", "UserCashRecordForBusiness.txt", minId.ToString());
-                        condition += " and a.Id >=" + minId;
-                    }
-                    else
-                    {
-                        condition += " and a.Id >=" + Convert.ToInt32(Info);
-                    }
-                }
-                else
-                {
-                    condition += " and a.Id =0";
-                }
+                var start = datelist[0];
+                var end = datelist[1];
+                condition += " and a.CreateDate>='" + start + " 00:00:00' and a.CreateDate<='" + end + " 23:59:59'";
             }
             var Sql = "SELECT b.MakerCode '创客编号',b.RealName '创客姓名',a.CashOrderNo '提现单号',a.TradeAmount '提现金额',DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%s') '提现时间',a.SeoKeyword '备注',a.CreateMan '操作人' FROM UserCashRecordForBusiness a LEFT JOIN Users b ON a.UserId=b.Id" + condition;
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);