暂存

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -51,12 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(SysRechargeRecord data, string MakerCode, string RealName, string RechargeRecNo, string BatchCode, string BizTimeData, string StatusSelect, string SyncStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(SysRechargeRecord data, string MakerCode, string RealName, string RechargeRecNo, string BatchCode, string BizTimeData, string BizTypeSelect, string StatusSelect, string SyncStatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             // Fields.Add("RechargeRecNo", "1"); //奖励单号
-            Fields.Add("BizType", "0"); //业务类型
+            // Fields.Add("BizType", "0"); //业务类型
             // Fields.Add("BatchCode", "1"); //批次号
             // Fields.Add("BizTime", "3"); //奖励时间
 
@@ -82,10 +82,10 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and BatchCode=" + BatchCode;
             }
             //业务类型
-            // if (BizType > 0) 
-            // {
-            //     condition += " and BizType=" + BizType;
-            // }
+            if (!string.IsNullOrEmpty(BizTypeSelect))
+            {
+                condition += " and BizType=" + BizTypeSelect;
+            }
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -366,12 +366,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect, string BizTimeData)
+        public JsonResult ExportExcel(SysRechargeRecord data, string MakerCode, string RealName, string RechargeRecNo, string BatchCode, string BizTimeData, string BizTypeSelect, string StatusSelect, string SyncStatusSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("RechargeRecNo", "1"); //奖励单号
-            Fields.Add("BizType", "0"); //业务类型
-            Fields.Add("BatchCode", "1"); //批次号
+            // Fields.Add("RechargeRecNo", "1"); //奖励单号
+            // Fields.Add("BizType", "0"); //业务类型
+            // Fields.Add("BatchCode", "1"); //批次号
             // Fields.Add("BizTime", "3"); //奖励时间
 
             string condition = " and Status>-1";
@@ -385,6 +385,21 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
+            //奖励单号
+            if (!string.IsNullOrEmpty(RechargeRecNo))
+            {
+                condition += " and RechargeRecNo=" + RechargeRecNo;
+            }
+            //批次号
+            if (!string.IsNullOrEmpty(BatchCode))
+            {
+                condition += " and BatchCode=" + BatchCode;
+            }
+            //业务类型
+            if (!string.IsNullOrEmpty(BizTypeSelect))
+            {
+                condition += " and BizType=" + BizTypeSelect;
+            }
             //状态
             if (!string.IsNullOrEmpty(StatusSelect))
             {
@@ -400,7 +415,7 @@ namespace MySystem.Areas.Admin.Controllers
                 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'";
+                condition += " and BizTime>='" + start + " 00:00:00' and BizTime<='" + 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);
@@ -411,7 +426,7 @@ namespace MySystem.Areas.Admin.Controllers
                 Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["MakerCode"] = user.MakerCode;
                 dic["RealName"] = user.RealName;
-                dic["BizType"] = RelationClassForConst.GetBizTypeInfo(int.Parse(dic["BizType"].ToString()));
+                dic["BizType"] = RelationClassForConst.GetChangeTypeInfo(int.Parse(dic["BizType"].ToString()));
                 dic["ProductType"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["ProductType"].ToString()));
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["Status"] = "初始";