提交

username@email.com

2021-07-13 10ec50f8e9ded45e8b439114a17ed89297c948c7

 zhengcaioa/Services/LiaotianService.cs

@@ -120,14 +120,23 @@
                DateTime.TryParse(Createtimes[1], out Createtimeend);
                Createtimeend = Createtimeend.AddDays(1);
            }



            //var query1 = _context.Liaotians.Where(a => a.RecStatus == "A");





            //筛选
            var query = (from a in _context.Liaotians


                         join h in _context.LiaotianShoucangs.Where(x => x.RecStatus == "A" && x.Creater == searchEntity.ShouCangCreater)
                      on a.Id equals h.LiaotianId
                     into hsss
                         from hhh in hsss.DefaultIfEmpty()
                     //    join h in _context.LiaotianShoucangs.Where(x => x.RecStatus == "A" && x.Creater == searchEntity.ShouCangCreater)
                     // on a.Id equals h.LiaotianId
                     //into hsss
                     //    from hhh in hsss.DefaultIfEmpty()


                         where a.RecStatus == "A"
@@ -139,7 +148,7 @@
   && (string.IsNullOrWhiteSpace(searchEntity.Shifoushenhe) || (a.Clientid == searchEntity.Shifoushenhe.Trim()))
    && (string.IsNullOrWhiteSpace(searchEntity.ChushuStatus) || (a.ChushuStatus == searchEntity.ChushuStatus.Trim()))
     && (string.IsNullOrWhiteSpace(searchEntity.Creater) || (a.Creater == searchEntity.Creater.Trim()))
      && (string.IsNullOrWhiteSpace(searchEntity.ShouCangStatus) || (searchEntity.ShouCangStatus == "A" && hhh.Id !=null) || (searchEntity.ShouCangStatus != "A" && hhh.Id == null))
      //&& (string.IsNullOrWhiteSpace(searchEntity.ShouCangStatus) || (searchEntity.ShouCangStatus == "A" && hhh.Id !=null) || (searchEntity.ShouCangStatus != "A" && hhh.Id == null))
                         select new LiaotianDTO
                         {
                             Id = a.Id,
@@ -174,7 +183,7 @@
                searchEntity.totalrows = query.Count();
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            //list = _mapper.Map<List<LiaotianDTO>>(lianlist);
            data.LoadData(searchEntity, query);
            data.LoadData(searchEntity, lianlist);
            return data;
        }