Merge remote-tracking branch 'origin/master'

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

@@ -1720,7 +1720,7 @@ public class CustomerServiceImpl implements CustomerService {
         Long campaignId = campaignCustomerDTO.getCampaignId();
         String[] lstCusId = campaignCustomerDTO.getLstCustomerId().split(",");
         try {
-            for (String cusId: lstCusId) {
+            for (String cusId : lstCusId) {
                 CampaignCustomer entity = new CampaignCustomer();
                 entity.setCompanySiteId(companySiteId);
                 entity.setStatus((short) 0);
@@ -1900,11 +1900,11 @@ public class CustomerServiceImpl implements CustomerService {
         Session session = sessionFactory.openSession();
         session.beginTransaction();
 
-        if (DataUtil.isNullOrZero(SiteId)) {
-            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
-            return resultDTO;
-        }
+//        if (DataUtil.isNullOrZero(SiteId)) {
+//            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+//            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+//            return resultDTO;
+//        }
 
         try {
 
@@ -1936,14 +1936,31 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append("   and active = 1 ");
             sb.append("  and  CF.FUNCTION_CODE = 'CUSTOMER' ");
 
-            for (int i = 0; i < campaignCustomerDTO.getListQuery().size(); i++) {
-
-                sb.append( campaignCustomerDTO.getListQuery().get(i).getJoin() + " "
-                        +  campaignCustomerDTO.getListQuery().get(i).getField() + " "
-                        +  campaignCustomerDTO.getListQuery().get(i).getOperator() + " "
-                        +  campaignCustomerDTO.getListQuery().get(i).getCondition());
+            List<CustomerQueryDTO> customerDTOList = campaignCustomerDTO.getListQuery();
+//            sb.append(
+//                    customerDTOList.get(0).getField() + " "
+//                            + customerDTOList.get(0).getOperator() + " "
+//                            + customerDTOList.get(0).getCondition() + " ");
+//            for (int i = 1; i < campaignCustomerDTO.getListQuery().size(); i++) {
+//                sb.append(campaignCustomerDTO.getListQuery().get(i).getJoin() + "  "
+//                        + campaignCustomerDTO.getListQuery().get(i).getField() + "  "
+//                        + campaignCustomerDTO.getListQuery().get(i).getOperator() + "  "
+//                        + campaignCustomerDTO.getListQuery().get(i).getCondition() + "  ");
+            for (CustomerQueryDTO query : customerDTOList) {
+                if (query.getJoin() == null) {
+                    sb.append("AND ");
+                } else {
+                    sb.append(query.getJoin() + " ");
+                }
+                sb.append(query.getField() + " ");
+                sb.append(query.getOperator() + " ");
+                if ("like".equals(query.getOperator()) || "not like".equals(query.getOperator())) {
+                    sb.append("%"+ query.getCondition() + "% ");
+                } else {
+                    sb.append(query.getCondition());
                 }
 
+            }
             SQLQuery query = session.createSQLQuery(sb.toString());
             query.addScalar("customerId", new LongType());
             query.addScalar("name", new StringType());
@@ -1953,21 +1970,21 @@ public class CustomerServiceImpl implements CustomerService {
             query.addScalar("currentAddress", new StringType());
             query.addScalar("mobileNumber", new StringType());
             query.addScalar("email", new StringType());
-            query.addScalar("placeOfBirth",new StringType());
+            query.addScalar("placeOfBirth", new StringType());
             query.addScalar("dateOfBirth", new DateType());
             query.addScalar("status", new ShortType());
-            query.addScalar("siteId",new LongType());
-            query.addScalar("active",new StringType());
-
+            query.addScalar("siteId", new LongType());
+            query.addScalar("active", new StringType());
 
             query.setResultTransformer(Transformers.aliasToBean(CampaignCustomerDTO.class));
+
             int count = 0;
             List<CampaignCustomerDTO> dtoList = query.list();
             if (dtoList.size() > 0) {
                 count = query.list().size();
             }
 
-            Pageable pageable = PageRequest.of( campaignCustomerDTO.getPage(),  campaignCustomerDTO.getPageSize());
+            Pageable pageable = PageRequest.of(campaignCustomerDTO.getPage(), campaignCustomerDTO.getPageSize());
             if (pageable != null) {
                 query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
                 query.setMaxResults(pageable.getPageSize());