Merge branch 'master' of http://git.myitsol.com/hanv/service-campaign

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -282,7 +282,7 @@ public class CustomerServiceImpl implements CustomerService {
 
             if (!DataUtil.isNullOrEmpty(name)) {
                 query.setParameter("p_name", "%" +
-                        name.replace("\\", "\\\\")
+                        name.trim().replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")
                         + "%");
@@ -290,7 +290,7 @@ public class CustomerServiceImpl implements CustomerService {
 
             if (!DataUtil.isNullOrEmpty(mobileNumber)) {
                 query.setParameter("p_mobile_number", "%" +
-                        mobileNumber.replace("\\", "\\\\")
+                        mobileNumber.trim().replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")
                         + "%");
@@ -298,7 +298,7 @@ public class CustomerServiceImpl implements CustomerService {
 
             if (!DataUtil.isNullOrEmpty(email)) {
                 query.setParameter("p_email", "%" +
-                        email.replace("\\", "\\\\")
+                        email.trim().replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")
                         + "%");
@@ -666,9 +666,9 @@ public class CustomerServiceImpl implements CustomerService {
                 CustomerList customerList = customerListRepository.findByCustomerListIdAndCompanySiteId(customerListDTO.getCustomerListId(), customerListDTO.getCompanySiteId());
 
                 if (customerList != null) {
-                    customerList.setCreateBy(customerListDTO.getCreateBy());
+//                    customerList.setCreateBy(customerListDTO.getCreateBy());
                     customerList.setCompanySiteId(customerListDTO.getCompanySiteId());
-                    customerList.setCreateAt(customerListDTO.getCreateAt());
+//                    customerList.setCreateAt(customerListDTO.getCreateAt());
                     customerList.setCustomerListCode(customerListDTO.getCustomerListCode());
                     customerList.setCustomerListName(customerListDTO.getCustomerListName());
                     customerList.setDeptCreate(customerListDTO.getDeptCreate());
@@ -1595,10 +1595,10 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append(" ), datas as (");
             sb.append(" select c.customer_id customerId,");
             sb.append(" c.name,");
-            sb.append(" cP.phone,");
+            sb.append(" cP.phone mobileNumber,");
             sb.append(" cE.email,");
-            sb.append(" c.customer_type cusType,");
-            sb.append(" c.company_name compName,");
+            sb.append(" c.customer_type customerType,");
+            sb.append(" c.company_name companyName,");
             sb.append(" c.current_address currentAddress,");
             sb.append(" c.description,");
             sb.append(" c.ipcc_status ipccStatus,");