فهرست منبع

盟主和运营中心提现导出增加是否对公字段

lcl 1 سال پیش
والد
کامیت
a21c07305d

+ 6 - 1
Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -989,7 +989,7 @@ namespace MySystem.Areas.Admin.Controllers
             //     }
             // }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate,BusinessFlag", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -1011,6 +1011,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (QueryCount == 0) dic["LockName"] = "待提交";
                 if (QueryCount == 1) dic["LockName"] = "已提交";
                 dic.Remove("QueryCount");
+
+                Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId) ?? new Leaders();
+                //对公标记
+                dic.Add("BusinessFlag", leader.BusinessFlag == 1 ? "是" : "否");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -1030,6 +1034,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("StatusName", "状态");
             ReturnFields.Add("Remark", "备注");
             ReturnFields.Add("CreateDate", "创建时间");
+            ReturnFields.Add("BusinessFlag", "是否对公");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "UserCashRecord", "ExportExcel");

+ 6 - 1
Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -447,7 +447,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and QueryCount=" + QueryCount;
             }
 
-            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate", false);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate,BusinessFlag", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -472,6 +472,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (QueryCount == 0) dic["LockName"] = "待提交";
                 if (QueryCount == 1) dic["LockName"] = "已提交";
                 dic.Remove("QueryCount");
+
+                Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId) ?? new Leaders();
+                //对公标记
+                dic.Add("BusinessFlag", leader.BusinessFlag == 1 ? "是" : "否");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -492,6 +496,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("StatusName", "状态");
             ReturnFields.Add("Remark", "备注");
             ReturnFields.Add("CreateDate", "创建时间");
+            ReturnFields.Add("BusinessFlag", "是否对公");
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "OpUserCashRecord", "ExportExcel");
             return Json(result);