调整奖励记录导出

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -96,7 +96,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SyncStatus=" + SyncStatusSelect;
             }
-            if(!string.IsNullOrEmpty(BizTimeData))
+            if (!string.IsNullOrEmpty(BizTimeData))
             {
                 string[] datelist = BizTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
@@ -375,13 +375,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect)
+        public JsonResult ExportExcel(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect, string BizTimeData)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("RechargeRecNo", "1"); //奖励单号
             Fields.Add("BizType", "0"); //业务类型
             Fields.Add("BatchCode", "1"); //批次号
-            Fields.Add("BizTime", "3"); //奖励时间
+            // Fields.Add("BizTime", "3"); //奖励时间
 
             string condition = " and Status>-1";
             //创客编号
@@ -404,6 +404,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SyncStatus=" + SyncStatusSelect;
             }
+            if (!string.IsNullOrEmpty(BizTimeData))
+            {
+                string[] datelist = BizTimeData.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'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("SysRechargeRecord", Fields, "Id desc", "0", 1, 20000, condition, "RechargeRecNo,ProductType,UserId,BizType,BizTime,Amount,SyncStatus,BatchCode,Status,SeoDescription,CreateMan", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;