username@email.com
2024-10-14 49de3197aa154674dbbd14c5196273dc82397d5f
Merge branch 'master' of http://47.108.235.38:8080/r/cylsg
1个文件已修改
13 ■■■■■ 已修改文件
cylsg/cylsg.Application/Transfer/UserTransfer.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
            {