DuGuYang 3 лет назад
Родитель
Сommit
492bbf3859

+ 1 - 8
Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -95,14 +95,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd"));
                 var sId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
                 var eId = db.UserAccountRecord.Where(m => m.CreateDate <= end).Max(m => m.Id);
-                var Info = function.ReadInstance("/WritePage/UsersAccountRecord/UsersAccountRecords.txt");
-                if (string.IsNullOrEmpty(Info.ToString()))
-                {
-                    function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecords.txt", sId + "," + eId);
-                    condition += "  and Id >=" + sId + " and Id <=" + eId;
-                }
-                string[] datas =  Info.Split(",");
-                condition += " and Id >=" + Convert.ToInt32(datas[0]) + " and Id <=" + Convert.ToInt32(datas[1]);
+                condition += "  and Id >=" + sId + " and Id <=" + eId;
             }
             else
             {

+ 35 - 16
Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1533,16 +1533,8 @@ namespace MySystem.Areas.Admin.Controllers
                 //cons
                 var conssId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(start)).Min(m => m.Id);
                 var conseId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) <= Convert.ToInt32(end)).Max(m => m.Id);
-                var Info = function.ReadInstance("/WritePage/UsersChildrenTrade/UsersChildrenTrades.txt");
-                if (string.IsNullOrEmpty(Info.ToString()))
-                {
-                    function.WritePage("/WritePage/UsersChildrenTrade/", "UsersChildrenTrades.txt", consId + "," + coneId + "," + conssId + "," + conseId);
-                    con += "  and Id >=" + consId + " and Id <=" + coneId;
-                    cons += "  and Id >=" + conssId + " and Id <=" + conseId;
-                }
-                string[] datas = Info.Split(",");
-                con += "  and Id >=" + Convert.ToInt32(datas[0]) + " and Id <=" + Convert.ToInt32(datas[1]);
-                cons += "  and Id >=" + Convert.ToInt32(datas[2]) + " and Id <=" + Convert.ToInt32(datas[3]);
+                con += "  and Id >=" + consId + " and Id <=" + coneId;
+                cons += "  and Id >=" + conssId + " and Id <=" + conseId;
             }
             //时间为空
             else
@@ -1849,16 +1841,43 @@ namespace MySystem.Areas.Admin.Controllers
             //开始时间
             if (!string.IsNullOrEmpty(sTradeDate) && !string.IsNullOrEmpty(eTradeDate))
             {
-                condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
-                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate) + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
-                con += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                // condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                // cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate) + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
+                // con += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+
+                WebCMSEntities dbs = new WebCMSEntities();
+                //con
+                var consId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(sTradeDate)).Min(m => m.Id);
+                var coneId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(eTradeDate)).Max(m => m.Id);
+                //cons
+                var conssId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(sTradeDate)).Min(m => m.Id);
+                var conseId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) <= Convert.ToInt32(eTradeDate)).Max(m => m.Id);
+                condition += "  and Id >=" + consId + " and Id <=" + coneId;
+                con += "  and Id >=" + conssId + " and Id <=" + conseId;
             }
             //结束时间
             else
             {
-                condition += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
-                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
-                con += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                // condition += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                // cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
+                // con += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+
+                WebCMSEntities dbs = new WebCMSEntities();
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd");
+                //condition
+                var conId = dbs.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //con
+                var consId = dbs.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(start)).Min(m => m.Id);
+                var Info = function.ReadInstance("/WritePage/UsersChildrenTrade/UsersChildrenTrade.txt");
+                if (string.IsNullOrEmpty(Info.ToString()))
+                {
+                    function.WritePage("/WritePage/UsersChildrenTrade/", "UsersChildrenTrade.txt", conId + "," + consId);
+                    condition += " and Id >=" + conId;
+                    con += " and Id >=" + consId;
+                }
+                string[] datas = Info.Split(",");
+                condition += " and Id >=" + Convert.ToInt32(datas[0]);
+                con += " and Id >=" + Convert.ToInt32(datas[1]);
             }
 
             //扶持期