小飞侠
2025-12-01 7eca0ab1b6d5142d623efd471985b2a20b559616
cylsg/cylsg.Application/Transfer/UserTransfer.cs
@@ -258,7 +258,7 @@
        /// </summary>
        [AllowAnonymous]
        [HttpPost]
        [ApiExplorerSettings(IgnoreApi = true)]
        [ApiExplorerSettings(IgnoreApi = true)]
        public async Task<TransferOderOut> GetTransferOder(SearchTransferOder param)
        {
@@ -291,9 +291,14 @@
            else
                //有一笔大余0 的视为失败
                SearchList= SearchList.And(x => x.FailNum ==0&&x.BatchStatus=="FINISHED");
             var data=await WeChatTransferOrderwork.AsQueryable().Where(SearchList).Select(x=>new WeChatTransferOrder
             var data=await WeChatTransferOrderwork.AsQueryable().Includes(x => x.user, u => u.Worek).Where(SearchList).Select(x=>new WeChatTransferOrder
             {
               BatchRemark= SqlFunc.Subqueryable<UserWorker>().Where(uw=>uw.UserId==x.UserID).Select(uw => uw.name+ uw.IdCode)
                 UserName=x.user.Worek.name,
                 UserIDCode = x.user.Worek.IdCode,
                 ItCode = x.user.ItCode,
                 YiTiXianGz = x.user.Worek.YiTiXianJine,
                 ZhongGz = x.user.Worek.TiXianZonge,
                 BatchRemark = SqlFunc.Subqueryable<UserWorker>().Where(uw=>uw.UserId==x.UserID).Select(uw => uw.name+ uw.IdCode)
             },true).ToPageListAsync(pageModel.PageIndex, pageModel.PageSize,pageModel.TotalCount);
            //var data = await WeChatTransferOrderwork.GetPageListAsync(SearchList, pageModel);
              
@@ -913,32 +918,34 @@
            }
            RefAsync<int> title = 0;
            var BR = new BaseRepository<WeChatTransferOrder>();
          var data=  await BR.AsQueryable().Includes(x=>x.user,u=>u.Worek).Select(x=>new WeChatTransferOrder
          {
               UserIDCode= x.user.Worek.IdCode,
                UserName=x.user.Worek.name,
                 TotalAmount=x.TotalAmount,
               TotalNum=x.TotalNum,
              BatchId=x.BatchId,
               SuccessNum=x.SuccessNum,
              OutBatchNumber=x.OutBatchNumber,
              BatchName = x.BatchName,
              BatchStatus=x.BatchStatus,
              UserID= x.UserID,
              UpDataTime=x.UpDataTime,
              YiTiXianGz=x.user.Worek.YiTiXianJine,
               ZhongGz=x.user.Worek.TiXianZonge,
              ItCode=x.user.ItCode,
              SuccessAmount= x.SuccessAmount,
              FailAmount=x.FailAmount
            var data = await BR.AsQueryable().Includes(x => x.user, u => u.Worek).Select(x => new WeChatTransferOrder
            {
                Id = 0,
                 UserIDCode = x.user.Worek.IdCode,
                UserName = x.user.Worek.name,
                TotalAmount = x.TotalAmount,
                TotalNum = x.TotalNum,
                BatchId = x.BatchId,
                SuccessNum = x.SuccessNum,
                OutBatchNumber = x.OutBatchNumber,
                BatchName = x.BatchName,
                BatchStatus = x.BatchStatus,
                UserID = x.UserID,
                UpDataTime = x.UpDataTime,
                YiTiXianGz = x.user.Worek.YiTiXianJine,
                ZhongGz = x.user.Worek.TiXianZonge,
                ItCode = x.user.ItCode,
                SuccessAmount = x.SuccessAmount,
                FailAmount = x.FailAmount,
                CreateTime = x.CreateTime
          }).MergeTable().WhereIF(where != null, where).OrderByIF(order!=null,order,Param.Order?.Des?? OrderByType.Asc).ToPageListAsync(Param.Page.PageIndex,Param.Page.PageSize, title);
            },true).MergeTable().WhereIF(where != null, where).OrderByIF(order!=null,order,Param.Order?.Des?? OrderByType.Asc).ToPageListAsync(Param.Page.PageIndex,Param.Page.PageSize, title);