提交

username@email.com

2023-07-12 69e9ce6ae24fce670fb8d7af0e1f132e2e009dbc

 zhengcaioa/Services/CooperatecustomCustomerService.cs

@@ -145,9 +145,7 @@

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

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

                CacheHelperNetCore.CacheNull("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);
                }

            }

@@ -504,37 +517,31 @@
                {
                    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();
            }

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




           

        }

        public List<CooperatecustomCustomerDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)