From 49de3197aa154674dbbd14c5196273dc82397d5f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 14 十月 2024 09:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/cylsg
---
cylsg/cylsg.Application/Transfer/UserTransfer.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/cylsg/cylsg.Application/Transfer/UserTransfer.cs b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
index b9c320e..cf480f6 100644
--- a/cylsg/cylsg.Application/Transfer/UserTransfer.cs
+++ b/cylsg/cylsg.Application/Transfer/UserTransfer.cs
@@ -256,7 +256,7 @@
/// </summary>
[AllowAnonymous]
[HttpPost]
- [ApiExplorerSettings(IgnoreApi = true)]
+ //[ApiExplorerSettings(IgnoreApi = true)]
public async Task<TransferOderOut> GetTransferOder(SearchTransferOder param)
{
@@ -281,10 +281,15 @@
}
}
if (param.HasSendOk == false)
- SearchList= SearchList.And(x => x.BatchId == null);
+ SearchList= SearchList.And(x => x.FailNum >0||x.BatchStatus!= "FINISHED");
else
- SearchList= SearchList.And(x => x.BatchId != null);
- var data = await WeChatTransferOrderwork.GetPageListAsync(SearchList, pageModel);
+ //鏈変竴绗斿ぇ浣�0 鐨勮涓哄け璐�
+ SearchList= SearchList.And(x => x.FailNum ==0&&x.BatchStatus== "FINISHED");
+ var data=await WeChatTransferOrderwork.AsQueryable().Where(SearchList).Select(x=>new WeChatTransferOrder
+ {
+ BatchRemark= SqlFunc.Subqueryable<UserWorker>().Where(uw=>uw.UserId==x.UserID).Select(uw => uw.name+ uw.IdCode)
+ }).ToPageListAsync(pageModel.PageIndex, pageModel.PageSize,pageModel.TotalCount);
+ //var data = await WeChatTransferOrderwork.GetPageListAsync(SearchList, pageModel);
return new TransferOderOut
{
--
Gitblit v1.9.1