增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

 zhengcaioa/Services/CooperatecustomCustomerService.cs

@@ -145,8 +145,6 @@

                var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();

               var  CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
                CacheHelperNetCore.CacheInsert("CooperatecustomCustomerDTOs", CooperatecustomCustomerDTOs);

                resultEntity.ReturnID = cooperatecustomCustomer.Id;
                resultEntity.Result = true;
@@ -375,6 +373,8 @@
                             ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
                             Taocanjianshu = a.Taocanjianshu ?? 0,
                             Customertype = "合作客户",
                             Kuaidistatus = a.Kuaidistatus,
                             Kuaiditime = a.Kuaiditime,
                         }
                        );

@@ -389,6 +389,19 @@
                    query = query.Where(a => a.Ywjl == null);
                }


            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Kuaidistatus))
            {
                if (searchEntity.Kuaidistatus == "A")
                {
                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim());
                }
                else
                {
                    query = query.Where(a => a.Kuaidistatus == searchEntity.Kuaidistatus.Trim() || a.Kuaidistatus == null);
                }

            }

@@ -497,38 +510,21 @@
        /// <returns></returns>
        public List<CooperatecustomCustomerDTO> GetList(string HuiyuanId = "", string Name = "")
        {
            List<CooperatecustomCustomerDTO> CooperatecustomCustomerDTOs = (List<CooperatecustomCustomerDTO>)CacheHelperNetCore.CacheValue("CooperatecustomCustomerDTOs");
            if (CooperatecustomCustomerDTOs != null && CooperatecustomCustomerDTOs.Count > 0)
            {
                if (!string.IsNullOrEmpty(HuiyuanId))
                {
                    CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.HuiyuanId == HuiyuanId).ToList();
                }

                if (!string.IsNullOrEmpty(Name))
                {
                    CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.Name == Name).ToList();
                }

                return CooperatecustomCustomerDTOs;
            }

            var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();

            CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            CacheHelperNetCore.CacheInsert("CooperatecustomCustomerDTOs", CooperatecustomCustomerDTOs);
          


            if (!string.IsNullOrEmpty(HuiyuanId))
            {
                CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.HuiyuanId == HuiyuanId).ToList();
                listPosition = listPosition.Where(x => x.HuiyuanId == HuiyuanId).ToList();
            }

            if (!string.IsNullOrEmpty(Name))
            {
                CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.Name == Name).ToList();
                listPosition = listPosition.Where(x => x.Name == Name).ToList();
            }

            var CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return CooperatecustomCustomerDTOs;


@@ -1158,10 +1154,10 @@



                         where a.IsValid == true
                         where a.IsValid == true && a.Itcode.Length<=20 && a.Itcode.Length > 8
                          && (string.IsNullOrWhiteSpace(searchEntity.Createtime) || (a.CreateTime >= Createtimestart && a.CreateTime <= Createtimeend))
                         && (string.IsNullOrWhiteSpace(searchEntity.Name) || a.Name.Contains(searchEntity.Name.Trim()))
                           && (string.IsNullOrWhiteSpace(searchEntity.Itcode) || a.Name.Contains(searchEntity.Itcode.Trim()))
                           && (string.IsNullOrWhiteSpace(searchEntity.Itcode) || a.Itcode.Contains(searchEntity.Itcode.Trim()))

                         select new FrameworkUserDTO
                         {