Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -125,10 +125,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["PosUserIdRealName"] = posuserid_Users.RealName;
                 dic.Remove("PosUserId");
                 //状态
-                int Status = int.Parse(function.CheckInt(dic["Status"].ToString()));
-                if (Status == 0) dic["Status"] = "处理中";
-                if (Status == 1) dic["Status"] = "成功";
-                if (Status == -1) dic["Status"] = "失败";
+                string Status = dic["Status"].ToString();
+                if (Status == "0") dic["Status"] = "处理中";
+                if (Status == "1") dic["Status"] = "成功";
+                if (Status == "-1") dic["Status"] = "失败";
                 //产品类型
                 dic["Sort"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["Sort"].ToString()));
 
@@ -403,7 +403,7 @@ namespace MySystem.Areas.Admin.Controllers
                         snhtml += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
                         snhtml += "<div class='f16'>SN：" + items.PosSn + "</div>";
                         snhtml += "<div class='f16'>当前费率：0.6%</div>";
-                        snhtml += "<div class='f16'>费率调整时间：" + items.DownFeeDate + "</div></div>";
+                        snhtml += "<div class='f16'>费率调整时间：" + items.DownFeeDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "</div></div>";
                     }
                     snhtml += "</div>";
                     RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
@@ -455,7 +455,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, string SortSelect)
+        public JsonResult ExportExcel(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, string StatusSelect, string SortSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
@@ -464,7 +464,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Sort", "0"); //品牌
 
 
-            string condition = " and Status>-1";
+            string condition = "";
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -490,11 +490,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Sort = " + Convert.ToInt32(SortSelect);
             }
-            if (data.Status > 0)
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
-                if (data.Status == 2) data.Status = 0;
-                if (data.Status == 3) data.Status = -1;
-                condition += " and Status = " + data.Status;
+                if (Convert.ToInt32(StatusSelect) > 0)
+                {
+                    if (Convert.ToInt32(StatusSelect) == 1) condition += " and Status = 1";
+                    if (Convert.ToInt32(StatusSelect) == 2) condition += " and Status = 0";
+                    if (Convert.ToInt32(StatusSelect) == 3) condition += " and Status = -1";
+                }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesFeeChangeRecord", Fields, "Id desc", "0", 1, 20000, condition, "PosSn,ChangeFee", false);