Commit a8574718 by jianan

新单跟进111

parent 03493970
...@@ -10,25 +10,20 @@ import com.google.gson.Gson; ...@@ -10,25 +10,20 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.common.utils.RandomStringGenerator; import com.yd.common.utils.RandomStringGenerator;
import com.yd.csf.service.common.ErrorCode; import com.yd.csf.service.common.ErrorCode;
import com.yd.csf.service.dao.CustomerMapper; import com.yd.csf.service.dao.CustomerMapper;
import com.yd.csf.service.dto.CustomerAddRequest; import com.yd.csf.service.dto.CustomerAddRequest;
import com.yd.csf.service.dto.CustomerQueryRequest; import com.yd.csf.service.dto.CustomerQueryRequest;
import com.yd.csf.service.dto.CustomerUpdateRequest; import com.yd.csf.service.dto.CustomerUpdateRequest;
import com.yd.csf.service.dto.FnaQueryRequest;
import com.yd.csf.service.model.Customer; import com.yd.csf.service.model.Customer;
import com.yd.csf.service.model.CustomerExpand; import com.yd.csf.service.model.CustomerExpand;
import com.yd.csf.service.model.Fna;
import com.yd.csf.service.service.CustomerExpandService; import com.yd.csf.service.service.CustomerExpandService;
import com.yd.csf.service.service.CustomerService; import com.yd.csf.service.service.CustomerService;
import com.yd.csf.service.service.FnaService; import com.yd.csf.service.service.FnaService;
import com.yd.csf.service.utils.ValidateUtil; import com.yd.csf.service.utils.ValidateUtil;
import com.yd.csf.service.vo.AddressVO; import com.yd.csf.service.vo.AddressVO;
import com.yd.csf.service.vo.CustomerExpandVO;
import com.yd.csf.service.vo.CustomerVO; import com.yd.csf.service.vo.CustomerVO;
import com.yd.csf.service.vo.FnaVO;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -86,9 +81,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> ...@@ -86,9 +81,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
String name = customerQueryRequest.getName(); String name = customerQueryRequest.getName();
String phone = customerQueryRequest.getPhone(); String phone = customerQueryRequest.getPhone();
String email = customerQueryRequest.getEmail(); String email = customerQueryRequest.getEmail();
queryWrapper.lambda().like(StringUtils.isNotBlank(name), Customer::getName, name)
.like(StringUtils.isNotBlank(phone), Customer::getPhone, phone) queryWrapper.like(StringUtils.isNotBlank(name), "name", name)
.like(StringUtils.isNotBlank(email), Customer::getEmail, email); .or().like(StringUtils.isNotBlank(name), "first_name_pinyin", name);
queryWrapper.like(StringUtils.isNotBlank(phone), "phone", phone);
queryWrapper.like(StringUtils.isNotBlank(email), "email", email);
return queryWrapper; return queryWrapper;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment