|
|
@@ -658,7 +658,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
|
|
|
|
|
|
- Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", 1, 20000, condition, "BindingState,ActivationState,UserId,StoreId,PosSn,BrandId,ActivityList,BindMerchantId,PosSnType,DeviceType,BindingTime,ActivationTime,TransferTime,OpId", false);
|
|
|
+ Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", 1, 20000, condition, "BindingState,ActivationState,UserId,StoreId,PosSn,BrandId,ActivityList,BindMerchantId,PosSnType,DeviceType,BindingTime,ActivationTime,TransferTime,OpId,OutBatchNo", false);
|
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
|
{
|
|
|
@@ -742,6 +742,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
ReturnFields.Add("ActivationTime", "激活时间");
|
|
|
ReturnFields.Add("TransferTime", "划拨时间");
|
|
|
ReturnFields.Add("OpCode", "所属运营中心");
|
|
|
+ ReturnFields.Add("OutBatchNo", "广电卡地区");
|
|
|
|
|
|
result.Add("Fields", ReturnFields);
|
|
|
AddSysLog("0", "PosMachinesTwo", "ExportExcel");
|