|
|
@@ -710,21 +710,25 @@ 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.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
|
|
|
- // var checks = db.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
|
|
|
- // if (check)
|
|
|
- // {
|
|
|
- // var sId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
|
|
|
- // condition += " and Id >=" + sId;
|
|
|
- // }
|
|
|
- // if (checks)
|
|
|
- // {
|
|
|
- // var eId = db.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
|
|
|
- // condition += " and Id <=" + eId;
|
|
|
- // }
|
|
|
}
|
|
|
+ // 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.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
|
|
|
+ // var checks = db.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
|
|
|
+ // if (check)
|
|
|
+ // {
|
|
|
+ // var sId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
|
|
|
+ // condition += " and Id >=" + sId;
|
|
|
+ // }
|
|
|
+ // if (checks)
|
|
|
+ // {
|
|
|
+ // var eId = db.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
|
|
|
+ // condition += " and Id <=" + eId;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
// else
|
|
|
// {
|
|
|
// var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
|
|
|
@@ -826,21 +830,25 @@ 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.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
|
|
|
- // var checks = db.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
|
|
|
- // if (check)
|
|
|
- // {
|
|
|
- // var sId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
|
|
|
- // condition += " and Id >=" + sId;
|
|
|
- // }
|
|
|
- // if (checks)
|
|
|
- // {
|
|
|
- // var eId = db.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
|
|
|
- // condition += " and Id <=" + eId;
|
|
|
- // }
|
|
|
}
|
|
|
+ // 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.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
|
|
|
+ // var checks = db.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
|
|
|
+ // if (check)
|
|
|
+ // {
|
|
|
+ // var sId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
|
|
|
+ // condition += " and Id >=" + sId;
|
|
|
+ // }
|
|
|
+ // if (checks)
|
|
|
+ // {
|
|
|
+ // var eId = db.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
|
|
|
+ // condition += " and Id <=" + eId;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
// else
|
|
|
// {
|
|
|
// var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
|
DuGuYang