|
|
@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// 机具费率调整申请列表
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public JsonResult IndexData(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, int page = 1, int limit = 30)
|
|
|
+ public JsonResult IndexData(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string StatusSelect, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, int page = 1, int limit = 30)
|
|
|
{
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
@@ -59,10 +59,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
Fields.Add("CreateDate", "3"); //时间
|
|
|
Fields.Add("PosSn", "1"); //机具SN
|
|
|
Fields.Add("MerNo", "1"); //商户号
|
|
|
- Fields.Add("Sort", "0"); //商户号
|
|
|
+ Fields.Add("Sort", "0"); //
|
|
|
|
|
|
|
|
|
- string condition = " and Status>-1";
|
|
|
+ string condition = " and Status>=-1";
|
|
|
+ if (!string.IsNullOrEmpty(StatusSelect))
|
|
|
+ {
|
|
|
+ condition += " and Status=" + StatusSelect;
|
|
|
+ }
|
|
|
//创客创客编号
|
|
|
if (!string.IsNullOrEmpty(UserIdMakerCode))
|
|
|
{
|
DuGuYang