增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

 zhengcaioa/Services/IntentionCustomerService.cs

@@ -142,8 +142,8 @@

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

              var  intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
                CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
                // var  intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
                //CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);

                resultEntity.ReturnID = intentionCustomer.Id;
            resultEntity.Result = true;
@@ -162,7 +162,7 @@

        var entity = _context.IntentionCustomers.Find(id);

            if (entity.RecStatus != "A")
            if (entity ==null || entity.RecStatus != "A")
            {
                entity = new IntentionCustomer();
            }
@@ -352,12 +352,27 @@
                                 Zuijinzhuizongtime = a.Zuijinzhuizongtime,
                                 ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
                             Visittimes = lll.Visittimes,
                             Kuaidistatus = a.Kuaidistatus,
                             Kuaiditime = a.Kuaiditime,
                         }
                    );

            if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
            {
                query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
            }

            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);
                }
                
            }

            if (!string.IsNullOrWhiteSpace(searchEntity.Ywjl))
@@ -512,32 +527,19 @@
        /// <returns></returns>
        public List<IntentionCustomerDTO> GetList(string huiyuanId = null)
        {
            List<IntentionCustomerDTO> intentionCustomerDTOs = (List<IntentionCustomerDTO>)CacheHelperNetCore.CacheValue("intentionCustomerDTOs");
             

            if (intentionCustomerDTOs != null && intentionCustomerDTOs.Count > 0)
            {
                if (!string.IsNullOrEmpty(huiyuanId))
                {
                    intentionCustomerDTOs = intentionCustomerDTOs.Where(x => x.HuiyuanId == huiyuanId).ToList();
                }

                
                return intentionCustomerDTOs;
            }

            

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

            intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
            CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
           


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

            var intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
            return intentionCustomerDTOs;
        }

@@ -592,5 +594,70 @@
            return list;
        }

        public ResultEntity saveKhlx(CooperatecustomCustomerDTO cooperatecustomCustomerDTO)
        {
            ResultEntity resultEntity = new ResultEntity();
            try
            {






                var updateproject = _context.IntentionCustomers.Find(cooperatecustomCustomerDTO.Id);


                updateproject.Khlx = cooperatecustomCustomerDTO.Khlx;

                updateproject.Modifier = cooperatecustomCustomerDTO.Modifier;
                updateproject.Modifytime = cooperatecustomCustomerDTO.Modifytime;


                _context.SaveChanges();


                resultEntity.ReturnID = cooperatecustomCustomerDTO.Id;
                resultEntity.Result = true;
            }
            catch (Exception ex)
            {
                resultEntity.Result = false;
                resultEntity.Message = "保存失败，请联系管理员";

            }
            return resultEntity;
        }



        public ResultEntity GetZhengfuProjectDTOByTitle(string Name, string Id)
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = true;
            if (!string.IsNullOrWhiteSpace(Name))
            {
               var checkUserSn = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Name == Name).FirstOrDefault();
                if (checkUserSn != null && (string.IsNullOrWhiteSpace(Id) || (!string.IsNullOrWhiteSpace(Id) && checkUserSn.Id != Id)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "该档案客户已经存在";

                }
                var checkUserSncooper = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Name == Name).FirstOrDefault();
                if (checkUserSncooper != null && (string.IsNullOrWhiteSpace(Id) || (!string.IsNullOrWhiteSpace(Id) && checkUserSncooper.Id != Id)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "该合作客户已经存在";

                }

            }



            return resultEntity;
        }

    }
}