Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/viettel/campaign/repository/ccms_full/CustomerRepository.java
#	src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java

pom.xml

@@ -151,6 +151,16 @@
             <version>3.4</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>com.github.tennaito</groupId>
+            <artifactId>rsql-jpa</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>cz.jirutka.rsql</groupId>
+            <artifactId>rsql-parser</artifactId>
+            <version>2.1.0</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/viettel/campaign/ServiceCampaignApplication.java

@@ -15,7 +15,6 @@ public class ServiceCampaignApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ServiceCampaignApplication.class, args);
-
         RedisUtil redis = new RedisUtil(Config.redisAddress,Config.redisTimeout);
         redis.setup();
     }

src/main/java/com/viettel/campaign/model/ccms_full/CustomerContact.java

@@ -5,15 +5,18 @@ import lombok.Setter;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 @Entity
 @Table(name = "CUSTOMER_CONTACT")
 @Getter
 @Setter
-public class CustomerContact {
+public class CustomerContact implements Serializable {
     @Id
     @Basic(optional = false)
+    @GeneratedValue(generator = "customer_contact_seq", strategy = GenerationType.IDENTITY)
+    @SequenceGenerator(name = "customer_contact_seq", sequenceName = "customer_contact_seq", allocationSize = 1)
     @NotNull
     @Column(name = "CONTACT_ID")
     private Long contactId;

src/main/java/com/viettel/campaign/model/ccms_full/CustomizeField.java

-package com.viettel.campaign.model.ccms_full;
-
-public class CustomizeField {
-}

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCfgRepository.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Repository
 public interface CampaignCfgRepository extends JpaRepository<CampaignCfg, Long>{
 
-    @Query(" select u FROM CampaignCfg u WHERE u.status = 1")
+    @Query("FROM CampaignCfg u WHERE u.status = 1 AND u.completeValue NOT IN (1,2,3,4)")
     Page<CampaignCfg> findAll(Pageable pageable);
 
 

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListColumnRepository.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Repository
 @Transactional(DataSourceQualify.CCMS_FULL)
-public interface CampaignCustomerListColumnRepository extends JpaRepository<CampaignCustomerListColumn, Long> {
+public interface CampaignCustomerListColumnRepository extends JpaRepository<CampaignCustomerListColumn, Long>, CampaignCustomerListColumnRepositoryCustom {
 
     List<CampaignCustomerListColumn> findByCampaignIdAndCompanySiteId(Long campaignId, Long companaySiteId);
 

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListColumnRepositoryCustom.java

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.web.dto.request_dto.CampaignCustomerListColumnRequestDTO;
+
+import java.util.List;
+
+public interface CampaignCustomerListColumnRepositoryCustom {
+    List<CampaignCustomerListColumnRequestDTO> getCustomerInfor(Long companySiteId, Long customerId, Long campaignId);
+}

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java

@@ -36,6 +36,31 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
 
     CampaignCustomer findCampaignCustomerByCampaignCustomerId(Long id);
 
+
+
+    @Query(value = "select C.NAME, " +
+            "C.EMAIL, " +
+            "C.PLACE_OF_BIRTH, " +
+            "C.AREA_CODE, " +
+            "C.COMPANY_NAME, " +
+            "C.CURRENT_ADDRESS, " +
+            "C.CUSTOMER_TYPE, " +
+            "C.DATE_OF_BIRTH, " +
+            "C.CUSTOMER_ID,"+
+            "C.USERNAME,"+
+            "C.GENDER, CF.TITLE " +
+//            " from CAMPAIGN_COMPLETE_CODE cm " +
+            "from CUSTOMER C " +
+            "left join CUSTOMIZE_FIELDS CF " +
+            "on C.CUSTOMER_ID = CF.CUSTOMIZE_FIELD_ID "+
+            "where CF.FUNCTION_CODE = 'CUSTORMER' and c.STATUS =1 and CF.ACTIVE =1 and CF.SITE_ID =?"
+            , nativeQuery = true)
+    Long searchCustomer(@Param("site_id") Long pSiteId);
+
+
+
+
+
     @Query(value = "SELECT * FROM CAMPAIGN_CUSTOMER CC " +
             "WHERE CC.STATUS = 0 " +
             "AND CC.CAMPAIGN_ID = :campaignId " +

src/main/java/com/viettel/campaign/repository/ccms_full/CustomerContactRepository.java

@@ -12,5 +12,5 @@ public interface CustomerContactRepository extends JpaRepository<CustomerContact
     @Query("FROM CustomerContact WHERE status = 1 AND customerId = :customerId AND contactType = :contactType AND (contact IS NULL OR UPPER(contact) LIKE UPPER(concat('%', :contact, '%')))")
     List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(@Param("customerId") Long customerId, @Param("contactType") Short contactType, @Param("contact") String contact, Pageable pageable);
 
-    CustomerContact findCustomerContactByContactTypeAndContactAndIsDirectLine(Short contactType, String contact, Short isDirectLine);
+    CustomerContact findCustomerContactByContactEquals(String contact);
 }

src/main/java/com/viettel/campaign/repository/ccms_full/CustomerRepository.java

 package com.viettel.campaign.repository.ccms_full;
 
 import com.viettel.campaign.model.ccms_full.Customer;
+import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -33,6 +35,7 @@ public interface CustomerRepository extends JpaRepository<Customer, Long> {
             "where c.ipccStatus = 'locked' and c.siteId =?1 and ct.endTime <= ?2")
     List<Customer> findAllByCondition(Long siteId, Date endTime);
 
+
     @Query(value = "select * from customer a\n" +
             "left join customer_list_mapping b on a.customer_id = b.customer_id\n" +
             "where b.customer_list_id = :p_customer_list_id\n" +

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignCustomerListColumnRepositoryImpl.java

+package com.viettel.campaign.repository.ccms_full.impl;
+
+import com.viettel.campaign.repository.ccms_full.CampaignCustomerListColumnRepositoryCustom;
+import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.utils.HibernateUtil;
+import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.request_dto.CampaignCustomerListColumnRequestDTO;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.transform.Transformers;
+import org.hibernate.type.DateType;
+import org.hibernate.type.LongType;
+import org.hibernate.type.ShortType;
+import org.hibernate.type.StringType;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Repository
+public class CampaignCustomerListColumnRepositoryImpl implements CampaignCustomerListColumnRepositoryCustom {
+    @Override
+    public List<CampaignCustomerListColumnRequestDTO> getCustomerInfor(Long companySiteId, Long customerId, Long campaignId) {
+        ResultDTO result = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+        List<CampaignCustomerListColumnRequestDTO> data = new ArrayList<>();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        try {
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT");
+            sb.append("    a.CUSTOMIZE_FIELD_TITLE customizeFieldTitle,");
+            sb.append("    b.VALUE_TEXT valueText,");
+            sb.append("    b.VALUE_NUMBER valueNumber,");
+            sb.append("    b.VALUE_DATE valueDate,");
+            sb.append("    b.VALUE_CHECKBOX valueCheckbox,");
+            sb.append("    c.TYPE type,");
+            sb.append("    d.NAME valueCombobox");
+            sb.append(" FROM CAMPAIGN_CUSTOMERLIST_COLUMN a");
+            sb.append("    JOIN CUSTOMIZE_FIELD_OBJECT b ON a.CUSTOMIZE_FIELD_ID = b.CUSTOMIZE_FIELDS_ID");
+            sb.append("    JOIN CUSTOMIZE_FIELDS c ON a.CUSTOMIZE_FIELD_ID = c.CUSTOMIZE_FIELD_ID");
+            sb.append("    LEFT JOIN CUSTOMIZE_FIELD_OPTION_VALUE d ON b.FIELD_OPTION_VALUE_ID = d.FIELD_OPTION_VALUE_ID");
+            sb.append(" WHERE 1 = 1");
+            sb.append("    AND b.FUNCTION_CODE = 'CUSTOMER'");
+            sb.append("    AND a.COMPANY_SITE_ID = :p_company_site_id");
+            sb.append("    AND b.OBJECT_ID = :p_customer_id");
+            sb.append("    AND a.CAMPAIGN_ID = :p_campaign_id");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
+
+            query.setParameter("p_company_site_id", companySiteId);
+            query.setParameter("p_customer_id", customerId);
+            query.setParameter("p_campaign_id", campaignId);
+
+            query.addScalar("customizeFieldTitle", new StringType());
+            query.addScalar("valueText", new StringType());
+            query.addScalar("valueNumber", new LongType());
+            query.addScalar("valueDate", new DateType());
+            query.addScalar("valueCheckbox", new ShortType());
+            query.addScalar("type", new StringType());
+            query.addScalar("valueCombobox", new StringType());
+
+            query.setResultTransformer(Transformers.aliasToBean(CampaignCustomerListColumnRequestDTO.class));
+
+            data = query.list();
+        } catch (Exception e) {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        } finally {
+            session.close();
+        }
+
+        return data;
+    }
+}

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java

@@ -864,6 +864,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         return resultDTO;
     }
 
+
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getCampaignCustomerInformation(CampaignRequestDTO dto) {

src/main/java/com/viettel/campaign/service/CampaignExecuteService.java

@@ -30,6 +30,8 @@ public interface CampaignExecuteService {
 
     ResultDTO getCustomer(CampaignCustomerDTO dto);
 
+    ResultDTO updateCustomerResult(ContactCustResultDTO dto);
+
     ResultDTO getCustomerComplete(ReceiveCustLogDTO dto);
 
     ResultDTO getCallLog(ReceiveCustLogDTO dto);
@@ -41,4 +43,6 @@ public interface CampaignExecuteService {
     ResultDTO countRecallCustomer(Long companySiteId, Long agentId);
 
     ResultDTO getCustomerRecall(Long campaignId, Long customerId);
+
+    ResultDTO getCustomerInfor(Long companySiteId, Long customerId, Long campaignId);
 }

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -6,6 +6,7 @@ import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 
@@ -70,4 +71,9 @@ public interface CustomerService {
     Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> headerDTOS, UserSession userSession, Long customerListId);
 
     List<CustomizeFieldObject> getCustomizeField(Long customerId);
+    List<Customer> searchByQuery(String queryString);
+    Long countByQuery(String queryString);
+//    Map<String, CustomizeRequestDTo>  searchCustomer();
+////    List<CustomizeFields> searchCustomize();
+    ResultDTO searchCustomizeFields(CustomizeRequestDTo customizeFields);
 }

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

@@ -221,7 +221,13 @@ public class AgentsServiceImpl implements AgentsService {
         try {
             if (campaignAgentDTO != null) {
                 // insert
-                campaignAgent = campaignAgentMapper.toPersistenceBean(campaignAgentDTO);
+                campaignAgent.setAgentId(campaignAgentDTO.getAgentId());
+                campaignAgent.setStatus(0);
+                campaignAgent.setReSchedule(0L);
+                campaignAgent.setFilterType((short) 0);
+                campaignAgent.setCompanySiteId(campaignAgentDTO.getCompanySiteId());
+                campaignAgent.setCampaignId(campaignAgentDTO.getCampaignId());
+
                 campaignAgentRepository.save(campaignAgent);
 
                 resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);

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

@@ -81,6 +81,9 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             sb.append(" where 1 = 1");
             sb.append("  AND STATUS = 1");
             sb.append("  and COMPANY_SITE_ID = :p_company_site_id");
+            sb.append(" and COMPLETE_VALUE not in (1,2,3,4)");
+            sb.append("ORDER BY to_number(COMPLETE_VALUE) ");
+
 
 
             SQLQuery query = session.createSQLQuery(sb.toString());
@@ -290,7 +293,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
 
             sb.append("SELECT max(to_number(COMPLETE_VALUE)) completeValue, COMPANY_SITE_ID ");
             sb.append(" companySiteId from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = :p_site_id ");
-            sb.append(" GROUP BY COMPANY_SITE_ID");
+            sb.append(" GROUP BY COMPANY_SITE_ID ");
 
 
             SQLQuery query = session.createSQLQuery(sb.toString());

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

@@ -8,11 +8,9 @@ import com.viettel.campaign.model.ccms_full.ReceiveCustLog;
 import com.viettel.campaign.repository.acd_full.AgentsRepository;
 import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CampaignExecuteService;
-import com.viettel.campaign.utils.BundleUtils;
-import com.viettel.campaign.utils.Constants;
-import com.viettel.campaign.utils.RedisUtil;
-import com.viettel.campaign.utils.SQLBuilder;
+import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
+import com.viettel.campaign.web.dto.request_dto.CampaignCustomerListColumnRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import org.apache.poi.ss.usermodel.*;
@@ -64,6 +62,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Autowired
     TimeRangeDialModeRepository rangeDialModeRepository;
 
+    @Autowired
+    CampaignCustomerListColumnRepository campaignCustomerListColumnRepository;
+
     //<editor-fold: hungtt>
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
@@ -276,6 +277,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                 a.setAgentId(requestDto.getAgentId());
                 a.setCampaignSystemStatus("AVAILABLE");
                 a.setCurrentCampaignId(Long.parseLong(requestDto.getCampaignId()));
+                a.setUpdateDate(new Date());
                 agentsRepository.save(a);
                 // update ccms_full.campaign_agent table
                 campaignAgentRepository.updateCampaignAgentSetStatus(Long.parseLong(requestDto.getAgentId()), Long.parseLong(requestDto.getCampaignId()), 1);
@@ -517,6 +519,32 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         return result;
     }
 
+    @Override
+    public ResultDTO updateCustomerResult(ContactCustResultDTO dto) {
+        ResultDTO result = new ResultDTO();
+
+        try {
+            ContactCustResult ccr = ccResultRepository.getOne(dto.getContactCustResultId());
+            ccr.setDurationCall(0L);
+            ccr.setStartCall(new Date());
+            ccr.setReceiveTime(new Date());
+            ccr.setPreEndTime(new Date());
+            ccr.setEndTime(new Date());
+            ccr.setWaitTime(0L);
+            ContactCustResult resultUpdate = ccResultRepository.save(ccr);
+
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            result.setData(resultUpdate);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return result;
+    }
+
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO countRecallCustomer(Long companySiteId, Long agentId) {
         Long count = campaignCustomerRepository.countRecallCustomer(companySiteId, agentId);
@@ -550,4 +578,26 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
 
         return resultDTO;
     }
+
+    @Override
+    public ResultDTO getCustomerInfor(Long companySiteId, Long customerId, Long campaignId) {
+        ResultDTO resultDTO = new ResultDTO();
+
+        if (DataUtil.isNullOrZero(companySiteId)) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
+        }
+
+        try {
+            List<CampaignCustomerListColumnRequestDTO> data = campaignCustomerListColumnRepository.getCustomerInfor(companySiteId, customerId, campaignId);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setData(data);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
 }

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

@@ -12,7 +12,6 @@ import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.WorkBookBuilder;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
-import oracle.jdbc.driver.Const;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.ss.usermodel.*;

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

 package com.viettel.campaign.service.impl;
 
+import com.github.tennaito.rsql.jpa.JpaCriteriaCountQueryVisitor;
+import com.github.tennaito.rsql.jpa.JpaCriteriaQueryVisitor;
 import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.mapper.CustomerListMapper;
 import com.viettel.campaign.mapper.CustomerMapper;
@@ -10,8 +12,12 @@ import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
+import cz.jirutka.rsql.parser.RSQLParser;
+import cz.jirutka.rsql.parser.ast.Node;
+import cz.jirutka.rsql.parser.ast.RSQLVisitor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -37,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaQuery;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -50,7 +57,7 @@ public class CustomerServiceImpl implements CustomerService {
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomerServiceImpl.class);
 
     @Autowired
-    @PersistenceContext( unitName= DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
+    @PersistenceContext(unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
     EntityManager entityManager;
 
     @Autowired
@@ -527,27 +534,23 @@ public class CustomerServiceImpl implements CustomerService {
             StringBuilder sb = new StringBuilder();
 
             sb.append("SELECT");
-            sb.append("    a.CUSTOMER_LIST_ID customerListId,");
-            sb.append("    a.COMPANY_SITE_ID companySiteId,");
-            sb.append("    a.CUSTOMER_LIST_CODE customerListCode,");
-            sb.append("    a.CUSTOMER_LIST_NAME customerListName,");
-            sb.append("    a.STATUS status,");
-            sb.append("    a.CREATE_BY createBy,");
-            sb.append("    a.CREATE_AT createAt,");
-            sb.append("    a.UPDATE_BY updateBy,");
-            sb.append("    a.UPDATE_AT updateAt,");
-            sb.append("    a.SOURCE source,");
-            sb.append("    a.DEPT_CREATE deptCreate,");
-            sb.append("    b.count count");
-            sb.append(" FROM CUSTOMER_LIST a");
-            sb.append(" LEFT JOIN (SELECT COUNT(CAMPAIGN_ID) as count, CUSTOMER_LIST_ID");
-            sb.append(" FROM CAMPAIGN_CUSTOMERLIST");
-            sb.append(" GROUP BY CUSTOMER_LIST_ID) b");
-            sb.append(" ON a.CUSTOMER_LIST_ID = b.CUSTOMER_LIST_ID");
+            sb.append("    CUSTOMER_LIST_ID customerListId,");
+            sb.append("    COMPANY_SITE_ID companySiteId,");
+            sb.append("    CUSTOMER_LIST_CODE customerListCode,");
+            sb.append("    CUSTOMER_LIST_NAME customerListName,");
+            sb.append("    STATUS status,");
+            sb.append("    CREATE_BY createBy,");
+            sb.append("    CREATE_AT createAt,");
+            sb.append("    UPDATE_BY updateBy,");
+            sb.append("    UPDATE_AT updateAt,");
+            sb.append("    SOURCE source,");
+            sb.append("    DEPT_CREATE deptCreate");
+            sb.append(" FROM CUSTOMER_LIST");
             sb.append(" WHERE 1 = 1");
-            sb.append("  AND a.STATUS = 1");
-            sb.append("  AND a.COMPANY_SITE_ID = :p_company_site_id");
-            sb.append(" ORDER BY a.CREATE_AT DESC");
+            sb.append("  AND STATUS = 1");
+            sb.append("  AND COMPANY_SITE_ID = :p_company_site_id");
+
+            sb.append(" ORDER BY CREATE_AT DESC");
 
             SQLQuery query = session.createSQLQuery(sb.toString());
 
@@ -564,7 +567,6 @@ public class CustomerServiceImpl implements CustomerService {
             query.addScalar("updateAt", new DateType());
             query.addScalar("source", new StringType());
             query.addScalar("deptCreate", new StringType());
-            query.addScalar("count", new StringType());
 
             query.setResultTransformer(Transformers.aliasToBean(CustomerListDTO.class));
             int count = 0;
@@ -1158,7 +1160,7 @@ public class CustomerServiceImpl implements CustomerService {
                                 case "combobox":
                                     CustomizeFieldOptionValue cfov =
                                             customizeFieldOptionValueRepository.findCustomizeFieldOptionValueByNameEqualsAndStatus(rawDataList.get(i)[12 + j].toString(), 1L);
-                                cfo.setFieldOptionValueId(cfov.getFieldOptionValueId());
+                                    cfo.setFieldOptionValueId(cfov.getFieldOptionValueId());
                                     break;
                                 case "checkbox":
                                     if (rawDataList.get(i)[12 + j].toString().equals(BundleUtils.getLangString("customer.yes", locale))) {
@@ -1220,7 +1222,7 @@ public class CustomerServiceImpl implements CustomerService {
             result = BundleUtils.getLangString("customer.phoneMax50", locale);
         }
         for (int i = 0; i < str.length(); i++) {
-            CustomerContact cc = customerContactRepository.findCustomerContactByContactTypeAndContactAndIsDirectLine((short)5, arr[i], (short)1);
+            CustomerContact cc = customerContactRepository.findCustomerContactByContactEquals(arr[i]);
             if (cc != null) {
                 return result.concat(BundleUtils.getLangString("customer.phoneExists", locale));
             }
@@ -1315,14 +1317,14 @@ public class CustomerServiceImpl implements CustomerService {
                         constraint[j] = list.get(j).getName();
                     }
                     DataValidationConstraint comboboxConstraint = dataValidationHelper.createExplicitListConstraint(constraint);
-                    CellRangeAddressList comboboxCellRange = new CellRangeAddressList(4,9999,12 + i, 12 + i);
-                    DataValidation comboboxValidation = dataValidationHelper.createValidation(comboboxConstraint,comboboxCellRange);
+                    CellRangeAddressList comboboxCellRange = new CellRangeAddressList(4, 9999, 12 + i, 12 + i);
+                    DataValidation comboboxValidation = dataValidationHelper.createValidation(comboboxConstraint, comboboxCellRange);
                     comboboxValidation.setSuppressDropDownArrow(true);
                     comboboxValidation.setShowErrorBox(true);
                     sheet.addValidationData(comboboxValidation);
                 } else if (dynamicHeader.get(i).getType().equals("checkbox")) {
                     DataValidationConstraint yesNoConstraint = dataValidationHelper.createExplicitListConstraint(new String[]{BundleUtils.getLangString("customer.yes", locale), BundleUtils.getLangString("customer.not", locale)});
-                    CellRangeAddressList checkboxCellRange = new CellRangeAddressList(4,9999,12 + i,12 + i);
+                    CellRangeAddressList checkboxCellRange = new CellRangeAddressList(4, 9999, 12 + i, 12 + i);
                     DataValidation yesNoValidation = dataValidationHelper.createValidation(yesNoConstraint, checkboxCellRange);
                     yesNoValidation.setShowErrorBox(true);
                     yesNoValidation.setSuppressDropDownArrow(true);
@@ -1558,4 +1560,120 @@ public class CustomerServiceImpl implements CustomerService {
     public Customer update(Customer c) {
         return customerRepository.save(c);
     }
+
+    @Override
+    public List<Customer> searchByQuery(String queryString) {
+        RSQLVisitor<CriteriaQuery<Customer>, EntityManager> visitor = new JpaCriteriaQueryVisitor<>();
+        CriteriaQuery<Customer> query;
+        query = getCriteriaQuery(queryString, visitor);
+        List<Customer> resultList = entityManager.createQuery(query).getResultList();
+        if (resultList == null || resultList.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return resultList;
+    }
+
+    @Override
+    public Long countByQuery(String queryString) {
+        RSQLVisitor<CriteriaQuery<Long>, EntityManager> visitor = new JpaCriteriaCountQueryVisitor<Customer>();
+        CriteriaQuery<Long> query;
+        query = getCriteriaQuery(queryString, visitor);
+
+        return entityManager.createQuery(query).getSingleResult();
+    }
+
+
+    private <T> CriteriaQuery<T> getCriteriaQuery(String queryString, RSQLVisitor<CriteriaQuery<T>, EntityManager> visitor) {
+        Node rootNode;
+        CriteriaQuery<T> query;
+        try {
+            rootNode = new RSQLParser().parse(queryString);
+            query = rootNode.accept(visitor, entityManager);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new IllegalArgumentException(e.getMessage());
+        }
+        return query;
+    }
+
+//        params.put('1', ["AND","AGE",">=","30"] )
+//        lst.push(params);
+//        StringBuilder sql = "Select ..... WHERE 1 = 1 "
+//        for(lst){
+//            String[] data = lst[i].value
+//            sql.append(data[0] + data[1] + data[2] + data[3]);
+//        }
+
+
+//    Map<String, String> params = new HashMap<>();
+
+
+    //    public ResultDTO searchCustomize(List<CustomizeFields> customizeFields) {
+//        Map<String, CustomizeRequestDTo> hashCustomer = new HashMap<>();
+//        CustomizeRequestDTo customizeRequestDTo = new CustomizeRequestDTo();
+//        hashCustomer.put("1", customizeRequestDTo);
+//        hashCustomer.put("2", customizeRequestDTo);
+//        hashCustomer.put("3", customizeRequestDTo);
+//        StringBuilder sb = new StringBuilder();
+//        sb.append("");
+//        sb.append("");
+//        sb.append("");
+//        sb.append("");
+    @Override
+    public ResultDTO searchCustomizeFields(CustomizeRequestDTo customizeFields) {
+        ResultDTO resultDTO = new ResultDTO();
+        Map<String, String> params = new HashMap<>();
+        List<FieldsToShowDTO> list = new ArrayList<>();
+        StringBuilder stringBuilder = new StringBuilder();
+        try {
+            stringBuilder.append(" with column_name_temp as (");
+            stringBuilder.append("    select 'CUSTOMER_ID'  ,1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("    select 'CUSTOMER_NAME' ,1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'CUSTOMER_TYPE'  ,1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'NAME'   ,1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'CURRENT_ADDRESS', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'PLACE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'DATE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'MOBILE_NUMBER', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'EMAIL', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'USERNAME', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append(" union all");
+            stringBuilder.append("     select 'CUSTOMER_TYPE', 1 isFix from user_tab_columns, dual");
+            stringBuilder.append("     where table_name = 'CUSTOMER'");
+            stringBuilder.append(" )");
+
+            stringBuilder.append(" select * from column_name_temp");
+            stringBuilder.append(" union all");
+            stringBuilder.append(" select title columnName, 0 isFix ");
+            stringBuilder.append(" from customize_fields, dual");
+            stringBuilder.append(" where function_code = 'CUSTOMER'");
+            stringBuilder.append("     and site_id = :p_company_site_id");
+            stringBuilder.append("     and STATUS = 1");
+            stringBuilder.append("   and active = 1 ");
+            params.put("p_company_site_id", customizeFields.getCompanySiteId());
+            params.put("p_customer_id", customizeFields.getCustomerId());
+            list = namedParameterJdbcTemplate.query(stringBuilder.toString(), params, BeanPropertyRowMapper.newInstance(FieldsToShowDTO.class));
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setListData(list);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+
+    }
+
+
+
 }

src/main/java/com/viettel/campaign/utils/SearchOperation.java

+package com.viettel.campaign.utils;
+
+public enum SearchOperation {
+    EQUALITY, NEGATION, GREATER_THAN, LESS_THAN, LIKE, STARTS_WITH, ENDS_WITH, CONTAINS;
+    public static final String[] SIMPLE_OPERATION_SET = { ":", "!", ">", "<", "~" };
+
+    public static final String OR_PREDICATE_FLAG = "'";
+
+    public static final String ZERO_OR_MORE_REGEX = "*";
+
+    public static final String OR_OPERATOR = "OR";
+
+    public static final String AND_OPERATOR = "AND";
+
+    public static final String LEFT_PARANTHESIS = "(";
+
+    public static final String RIGHT_PARANTHESIS = ")";
+
+    public static SearchOperation getSimpleOperation(final char input) {
+        switch (input) {
+            case ':':
+                return EQUALITY;
+            case '!':
+                return NEGATION;
+            case '>':
+                return GREATER_THAN;
+            case '<':
+                return LESS_THAN;
+            case '~':
+                return LIKE;
+            default:
+                return null;
+        }
+    }
+}

src/main/java/com/viettel/campaign/web/dto/CustomizeFielObjectDTO.java

+package com.viettel.campaign.web.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomizeFielObjectDTO {
+    private Long customerId;
+    private String name;
+    private String companyName;
+    private String customerImg;
+    private String status;
+    private Long siteId;
+    private Short gender;
+    private String currentAddress;
+    private String placeOfBirth;
+    private Date dateOfBirth;
+    private String mobileNumber;
+    private String email;
+    private String userName;
+    private Long customerType;
+    private Long customizeFieldObjectId;
+    private Long objectId;
+    private Long customizeFieldId;
+    private String valueText;
+    private Long valueNumber;
+    private Date valueDate;
+    private Long valueCheckbox;
+    private Date createBy;
+    private Date createDate;
+    private String updateBy;
+    private Date updateDate;
+    private Long fieldOptionValueId;
+    private String title;
+    private String functionCode;
+}

src/main/java/com/viettel/campaign/web/dto/request_dto/CampaignCustomerListColumnRequestDTO.java

+package com.viettel.campaign.web.dto.request_dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class CampaignCustomerListColumnRequestDTO {
+    private String customizeFieldTitle;
+    private String valueText;
+    private Long valueNumber;
+    private Date valueDate;
+    private Short valueCheckbox;
+    private String type;
+    private String valueCombobox;
+}

src/main/java/com/viettel/campaign/web/dto/request_dto/CustomizeRequestDTo.java

+package com.viettel.campaign.web.dto.request_dto;
+
+
+import com.viettel.campaign.web.dto.BaseDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CustomizeRequestDTo  extends BaseDTO {
+    String operatorLogic;
+    String filterCustomer;
+    String compare;
+    String valueCustomer;
+    String companySiteId;
+    String customerId;
+}

src/main/java/com/viettel/campaign/web/rest/CampaignCfg.java → src/main/java/com/viettel/campaign/web/rest/CampaignCfgController.java

@@ -16,7 +16,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/ipcc/completeCode")
 @CrossOrigin(origins = "*")
-public class CampaignCfg {
+public class CampaignCfgController {
     private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
 
     @Autowired
@@ -127,4 +127,5 @@ public class CampaignCfg {
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
+
 }

src/main/java/com/viettel/campaign/web/rest/CampaignController.java

@@ -333,6 +333,13 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @GetMapping("/getCustomerInfor")
+    @ResponseBody
+    public ResponseEntity getCustomerInfor(@RequestParam("companySiteId") Long companySiteId, @RequestParam("customerId") Long customerId, @RequestParam("campaignId") Long campaignId) {
+        ResultDTO result = campaignExecuteService.getCustomerInfor(companySiteId, customerId, campaignId);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @RequestMapping(value = "/import-file", method = RequestMethod.POST)
     public ResponseEntity<?> importFile(@RequestParam("file") MultipartFile file,
                                         @RequestHeader("X-Auth-Token") String authToken) {

src/main/java/com/viettel/campaign/web/rest/CustomerController.java

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.service.CustomerService;
@@ -8,6 +9,7 @@ import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import org.apache.commons.io.FilenameUtils;
@@ -16,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -248,4 +251,22 @@ public class CustomerController {
         }
         return null;
     }
+    @GetMapping(path = "", produces = { MediaType.APPLICATION_JSON_VALUE })
+    public ResponseEntity<List<Customer>> query(@RequestParam(value = "search") String query) {
+        List<Customer> result = null;
+        try {
+            result= customerService.searchByQuery(query);
+        }catch (IllegalArgumentException iae){
+            return  ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(result);
+        }
+        return  ResponseEntity.status(HttpStatus.OK)
+                .body(result);
+    }
+    @PostMapping("/getCustomizeFields")
+    @ResponseBody
+    public ResponseEntity<?> getListFieldsToShow(@RequestBody CustomizeRequestDTo customizeRequestDTo) {
+        ResultDTO resultDTO = customerService.searchCustomizeFields(customizeRequestDTo);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
 }

src/main/resources/i18n/language_en.properties

@@ -103,6 +103,8 @@ customer.notLessThan = not less than
 customer.importCustomer = IMPORT CUSTOMER
 customer.notice = Attention: A record is valid when Full Name is not null and one of three fields Main phone, secondary phone or email is not null
 customer.fileNotSelected=Please select a file
+customer.emailInvalid=Invalid email;
+customer.emailExists=Email exists;
 
 common.fileNotSelected=Please select a file
 common.fileInvalidFormat=File invalid

src/main/resources/i18n/language_vi.properties

@@ -105,6 +105,8 @@ customer.notLessThan = không được nhỏ hơn
 customer.importCustomer = IMPORT KHÁCH HÀNG
 customer.notice = Chú ý: 1 bản ghi được coi là hợp lệ bắt buộc phải có thông tin Họ và Tên và 1 trong 3 thông tin liên lạc (số điện thoại chính, số điện thoại phụ hoặc email)
 customer.fileNotSelected=Bạn chưa chọn file
+customer.emailInvalid=Email không đúng định dạng;
+customer.emailExists=Email đã tồn tại;
 
 common.fileNotSelected=Bạn chưa chọn file
 common.fileInvalidFormat=File không hợp lệ