|
@@ -37,7 +37,6 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
|
|
|
{
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //创客
|
|
|
- string TradeMonth = data["TradeMonth"].ToString();
|
|
|
int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
|
|
|
int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
|
|
|
int Kind = int.Parse(function.CheckInt(data["Kind"].ToString()));
|
|
@@ -45,9 +44,10 @@ namespace MySystem.Areas.Api.Controllers.v1.pos
|
|
|
string TradeMonthCondi = "";
|
|
|
if(Kind == 2)
|
|
|
{
|
|
|
+ string TradeMonth = data["TradeMonth"].ToString();
|
|
|
string StartTradeMonth = TradeMonth + "-01 00:00:00";
|
|
|
string EndTradeMonth = DateTime.Parse(StartTradeMonth).AddMonths(1).ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
- TradeMonthCondi = " and CreateDate>='" + StartTradeMonth + "' and CreateDate>='" + EndTradeMonth + "'";
|
|
|
+ TradeMonthCondi = " and CreateDate>='" + StartTradeMonth + "' and CreateDate<'" + EndTradeMonth + "'";
|
|
|
}
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
string PageCondition = PageSize.ToString();
|