username@email.com
2021-12-21 65e60c2c3c2eb2c175cf7d2a08295d08c585f626
zhengcaioa/Services/CooperOrderService.cs
@@ -962,6 +962,26 @@
        }
        public List<TChallengeletterDTO> GetListChallengeletterChosen()
        {
            var query = (from a in _context.TChallengeletters
                         join b in _context.CooperOrders.Where(x => x.RecStatus == "A")
                         on a.OrderId equals b.Id
                         select new TChallengeletterDTO
                         {
                             Id = b.Id,
                             OrderId  = b.OrderNo
                         }
                         ).ToList();
            return query;
        }
        public ResultEntity saveChallengeletter(TChallengeletterDTO dto)
        {
            ResultEntity resultEntity = new ResultEntity();
@@ -1826,6 +1846,7 @@
                              WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
                              OrderType1 = a.OrderType1,
                              Status = b.Status.ToString(),
                              Modifytime = b.Modifytime.Value,
                              //StatusName = ddd.Comments
                          }
                ).ToList();
@@ -1880,11 +1901,12 @@
                           WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
                           OrderType1 = a.OrderType1,
                           Status = b.Status.ToString(),
                           Modifytime = b.Modifytime.Value,
                       }
                ).ToList();
            query2.AddRange(query1);
            var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Createtime).ToList();
            var query = query2.Where(x => x.WeishouMoney <= 0).OrderByDescending(x => x.Modifytime).ToList();