This commit is contained in:
liqionghai
2025-11-21 10:19:46 +08:00
parent ebffeefc98
commit ff810cd931
16 changed files with 174 additions and 229 deletions

View File

@@ -66,41 +66,41 @@ namespace Gatedge.ScanCode.Controllers
FieldKeys = @"FID,FBillNO,FStatus,FOrgId,FCreatorId,FCreateDate,FErrorInfo,FIsPrinted,FBarCount,FBarSum,FMOInfo",
Limit = param.PageSize,
StartRow = param.PageSize * (param.PageIndex - 1),
FilterString = new List<FilterItem>(),
FilterString = "",
OrderString = "FCreateDate DESC"
};
FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0");
queryParam.FilterString.Add(userItem);
if (param.IsSubmit == null)
{
if (param.Status != null)
{
queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
}
}
if (param.IsSubmit == false)
{
//FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0");
//queryParam.FilterString.Add(userItem);
//if (param.IsSubmit == null)
//{
// if (param.Status != null)
// {
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
// }
//}
//if (param.IsSubmit == false)
//{
queryParam.FilterString.Add(new FilterItem("FStatus", "29", "1", "0"));
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", "1", "0"));
}
if (param.IsSubmit == true)
{
queryParam.FilterString.Add(new FilterItem("FStatus", "29", "2", "1")
{
Left = "((",
Right = ")"
});
queryParam.FilterString.Add(new FilterItem("FStatus", "29", "3", "0")
{
Left = "(",
Right = "))"
});
}
//}
//if (param.IsSubmit == true)
//{
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", "2", "1")
// {
// Left = "((",
// Right = ")"
// });
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", "3", "0")
// {
// Left = "(",
// Right = "))"
// });
//}
queryParam.FilterString.Add(userItem);
//queryParam.FilterString.Add(userItem);
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
_utils.InitCloudApi(loginInfo);
IBarRecordService service = new BarRecordService(_utils);