|
|
@@ -51,15 +51,22 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// 待扣款明细列表
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
|
|
|
+ public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string CreateDateData, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
|
|
|
{
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
|
|
|
- Fields.Add("CreateDate", "3"); //时间
|
|
|
+ // Fields.Add("CreateDate", "3"); //时间
|
|
|
|
|
|
|
|
|
string condition = " and Status>-1";
|
|
|
+ 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'";
|
|
|
+ }
|
|
|
//创客编号
|
|
|
if (!string.IsNullOrEmpty(UserIdMakerCode))
|
|
|
{
|