Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

username@email.com

2021-06-28 ed3015095f1b0e88bc579877c678a3fac191381f

 zhengcaioa/Services/IntentionCustomerService.cs

@@ -26,15 +26,24 @@
        ResultEntity resultEntity = new ResultEntity();
        try
        {
            var checkUserSn = _context.IntentionCustomers.Where(x => x.Name == intentionCustomerDTO.Name && x.RecStatus == "A" && x.Id != intentionCustomerDTO.Id).FirstOrDefault();
            if (checkUserSn != null && (string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) || (!string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) && checkUserSn.Id != intentionCustomerDTO.Id)))
            {
                resultEntity.Result = false;
                resultEntity.Message = "客户单位重复";
                return resultEntity;
            }
                var checkUserSn = _context.IntentionCustomers.Where(x => x.Name == intentionCustomerDTO.Name && x.RecStatus == "A" && x.Id != intentionCustomerDTO.Id).FirstOrDefault();
                if (checkUserSn != null && (string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) || (!string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) && checkUserSn.Id != intentionCustomerDTO.Id)))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "客户单位重复";
                    return resultEntity;
                }

            var intentionCustomer = _mapper.Map<IntentionCustomer>(intentionCustomerDTO);
                var checkcooper = _context.CooperatecustomCustomers.Where(x => x.Name == intentionCustomerDTO.Name && x.RecStatus == "A" ).FirstOrDefault();
                if (checkcooper != null )
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "已存在合作客户";
                    return resultEntity;
                }


                var intentionCustomer = _mapper.Map<IntentionCustomer>(intentionCustomerDTO);


            if (String.IsNullOrEmpty(intentionCustomer.Id))
@@ -112,6 +121,23 @@
        return intentionCustomerDTO;
    }

        public IntentionCustomerDTO GetByName(string name)
        {
            
            var entity = _context.IntentionCustomers.Where(x=>x.Name == name).FirstOrDefault();

            if (entity==null || entity.RecStatus != "A")
            {
                entity = new IntentionCustomer();
            }

            var intentionCustomerDTO = _mapper.Map<IntentionCustomerDTO>(entity);


            return intentionCustomerDTO;
        }

        
    public ResultDataEntity<IntentionCustomerDTO> SearchByPaging(IntentionCustomerDTOSearch searchEntity)
    {

@@ -296,5 +322,15 @@

            return result;
        }

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


            var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();

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