anhvd commit

pom.xml

@@ -83,11 +83,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.viettel</groupId>-->
-<!--            <artifactId>viettelsercurity</artifactId>-->
-<!--            <version>11.2.0.3</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.viettel</groupId>
+            <artifactId>viettelsercurity</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
         <!--<dependency>-->
             <!--<groupId>org.apache.kafka</groupId>-->
             <!--<artifactId>kafka-streams</artifactId>-->

src/main/java/com/viettel/campaign/config/JobConfig.java

@@ -26,19 +26,19 @@ import java.util.concurrent.ScheduledFuture;
  * @project campaign
  */
 
-//@Slf4j
-//@EnableScheduling
-//@Configuration
-//public class JobConfig implements SchedulingConfigurer {
-//
-//    TaskScheduler taskScheduler;
-//    private ScheduledFuture<?> job1;
-//    private ScheduledFuture<?> job2;
-//
-//    @Bean
-//    public CampaignJob campaignJob(){
-//        return new CampaignJob();
-//    }
+@Slf4j
+@EnableScheduling
+@Configuration
+public class JobConfig implements SchedulingConfigurer {
+
+    TaskScheduler taskScheduler;
+    private ScheduledFuture<?> job1;
+    private ScheduledFuture<?> job2;
+
+    @Bean
+    public CampaignJob campaignJob(){
+        return new CampaignJob();
+    }
 
 //    @Override
 //    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@@ -53,47 +53,47 @@ import java.util.concurrent.ScheduledFuture;
 //        taskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
 //    }
 
-//    private void job1(TaskScheduler scheduler) {
-//        job1 = scheduler.schedule(() -> {
-//            log.info("processing job1 ...");
-//            log.info(Thread.currentThread().getName() + " The Task1 executed at " + new Date());
-//            try {
-//                Thread.sleep(10000);
-//            } catch (InterruptedException e) {
-//                // TODO Auto-generated catch block
-//                e.printStackTrace();
-//            }
-//        }, triggerContext -> {
-//
-//            String cronExp = "0/5 * * * * ?";// Can be pulled from a db .
-//            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
-//        });
-//    }
-//
-//    private void job2(TaskScheduler scheduler) {
-//        job2 = scheduler.schedule(() -> {
-//            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
-//            campaignJob().process();
-//
-//        }, triggerContext -> {
-//            String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
-//            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
-//        });
-//    }
-//
-//
-//
-//    @Override
-//    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
-//        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-//        threadPoolTaskScheduler.setPoolSize(10);
-//        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
-//        threadPoolTaskScheduler.initialize();
-//        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
-////        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
-//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
-//            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
-//            return trigger.nextExecutionTime(triggerContext);
-//        });
-//    }
-//}
+    private void job1(TaskScheduler scheduler) {
+        job1 = scheduler.schedule(() -> {
+            log.info("processing job1 ...");
+            log.info(Thread.currentThread().getName() + " The Task1 executed at " + new Date());
+            try {
+                Thread.sleep(10000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }, triggerContext -> {
+
+            String cronExp = "0/5 * * * * ?";// Can be pulled from a db .
+            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
+        });
+    }
+
+    private void job2(TaskScheduler scheduler) {
+        job2 = scheduler.schedule(() -> {
+            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
+            campaignJob().process();
+
+        }, triggerContext -> {
+            String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
+            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
+        });
+    }
+
+
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+        threadPoolTaskScheduler.setPoolSize(10);
+        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
+        threadPoolTaskScheduler.initialize();
+        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
+//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
+        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
+            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
+            return trigger.nextExecutionTime(triggerContext);
+        });
+    }
+}

src/main/java/com/viettel/campaign/filter/CorsFilter.java

@@ -13,7 +13,7 @@ import java.io.IOException;
 @Component
 public class CorsFilter implements Filter {
 
-    private Logger logger = Logger.getLogger(CorsFilter.class);
+//    private Logger logger = Logger.getLogger(CorsFilter.class);
 
     @Override
     public void init(FilterConfig filterConfig){
@@ -37,7 +37,6 @@ public class CorsFilter implements Filter {
 //            chain.doFilter(req, resp);
 //            return;
 //        }
-//        logger.info("uri: "+ request.getRequestURI());
 //        if ("/".equals(request.getRequestURI())) {
 //            chain.doFilter(req, resp);
 //            return;

src/main/java/com/viettel/campaign/mapper/ReceiveCustLogMapper.java

+package com.viettel.campaign.mapper;
+
+import com.viettel.campaign.model.ccms_full.ReceiveCustLog;
+import com.viettel.campaign.web.dto.ReceiveCustLogDTO;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ReceiveCustLogMapper extends BaseMapper<ReceiveCustLog, ReceiveCustLogDTO> {
+
+    @Autowired
+    ModelMapper modelMapper;
+
+    @Override
+    public ReceiveCustLogDTO toDtoBean(ReceiveCustLog receiveCustLog) {
+        return modelMapper.map(receiveCustLog, ReceiveCustLogDTO.class);
+    }
+
+    @Override
+    public ReceiveCustLog toPersistenceBean(ReceiveCustLogDTO dtoBean) {
+        return modelMapper.map(dtoBean, ReceiveCustLog.class);
+    }
+}

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

+package com.viettel.campaign.model.ccms_full;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "RECEIVE_CUST_LOG")
+@Getter
+@Setter
+public class ReceiveCustLog implements Serializable {
+    @Id
+    @GeneratedValue(generator = "RECEIVE_CUST_LOG_SEQ")
+    @SequenceGenerator(name = "RECEIVE_CUST_LOG_SEQ", sequenceName = "RECEIVE_CUST_LOG_SEQ", allocationSize = 1)
+    @Basic(optional = false)
+    @Column(name = "RECEIVE_CUST_LOG_ID")
+    private Long receiveCustLogId;
+    @Column(name = "COMPANY_SITE_ID")
+    private Long companySiteId;
+    @Column(name = "CUSTOMER_ID")
+    private Long customerId;
+    @Column(name = "AGENT_ID")
+    private Long agentId;
+    @Column(name = "CAMPAIGN_ID")
+    private Long campaignId;
+    @Column(name = "START_TIME")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date startTime;
+    @Column(name = "END_TIME")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date endTime;
+}

src/main/java/com/viettel/campaign/repository/acd_full/AgentsRepository.java

@@ -3,6 +3,9 @@ package com.viettel.campaign.repository.acd_full;
 import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.acd_full.Agents;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,4 +14,8 @@ import org.springframework.transaction.annotation.Transactional;
 public interface AgentsRepository extends JpaRepository<Agents, String> {
 
     Agents findByAgentId(String agentId);
+
+    @Modifying
+    @Query(value = "UPDATE Agents SET campaignSystemStatus = :campaignSystemStatus WHERE agentId = :agentId")
+    void updateAgentLogoutFromCampaign(@Param("agentId") Long agentId, @Param("campaignSystemStatus") String campaignSystemStatus);
 }

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

 package com.viettel.campaign.repository.ccms_full;
 
+import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.ApParam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -7,10 +8,12 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Repository
+@Transactional(DataSourceQualify.CCMS_FULL)
 public interface ApParamRepository extends JpaRepository<ApParam, Long>, ApParamRepositoryCustom {
 
     Page<ApParam> findAll(Pageable pageable);

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

@@ -5,32 +5,31 @@ import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
+@Repository
 @Transactional(DataSourceQualify.CCMS_FULL)
-public interface CampaignCustomerRepository extends JpaRepository<CampaignCustomer, Long> {
+public interface CampaignCustomerRepository extends JpaRepository<CampaignCustomer, Long>, CampaignCustomerRepositoryCustom {
+
+    @Query(value = "SELECT COUNT(*) " +
+            " FROM CAMPAIGN_CUSTOMER CC " +
+            " JOIN CAMPAIGN C ON CC.CAMPAIGN_ID = C.CAMPAIGN_ID " +
+            " LEFT JOIN CAMPAIGN_COMPLETE_CODE CCC ON CC.STATUS = CCC.COMPLETE_VALUE" +
+            " WHERE CC.COMPANY_SITE_ID = :companySiteId " +
+            " AND CC.AGENT_ID = :agentId" +
+            " AND C.STATUS = 2 " +
+            " AND CC.RECALL_TIME <= SYSDATE " +
+            " AND CCC.IS_RECALL = 1", nativeQuery = true)
+    Long countRecallCustomer(@Param("companySiteId") Long pCompanySiteId, @Param("agentId") Long agentId);
+
     @Query(value = "SELECT COUNT(*) " +
             "FROM CAMPAIGN_CUSTOMER CC JOIN CAMPAIGN_COMPLETE_CODE CCC ON CC.CAMPAIGN_ID = CCC.CAMPAIGN_ID " +
-            "WHERE CC.STATUS = 3 AND CC.CAMPAIGN_ID = :campaignId AND CC.CUSTOMER_ID = :customerId AND CCC.IS_RECALL = 1 AND CCC.STATUS = 1 ",
-            nativeQuery = true)
+            "WHERE CC.CAMPAIGN_ID = :campaignId " +
+            "AND CC.CUSTOMER_ID = :customerId " +
+            "AND CC.STATUS = 3 " +
+            "AND CCC.IS_RECALL = 1 " +
+            "AND CCC.STATUS = 1 ", nativeQuery = true)
     Long getCustomerRecall(@Param("campaignId") Long campaignId, @Param("customerId") Long customerId);
 
-    @Query(value = "SELECT cc.customer_id \n" +
-            "FROM campaign_customer cc LEFT JOIN receive_cust_log cl ON cc.customer_id = cl.customer_id\n" +
-            "WHERE cc.campaign_id = :campaignId \n" +
-            "  AND cc.agent_id = :agentId \n" +
-            "  AND cc.in_campaign_status = 1 \n" +
-            "  AND cl.customer_id IS NULL \n" +
-            "  AND EXISTS(SELECT 1 \n" +
-            "        FROM campaign_complete_code ccc \n" +
-            "        WHERE cc.status = ccc.complete_value \n" +
-            "          AND ccc.status = 1 \n" +
-            "          AND ccc.is_recall = 1 \n" +
-            "          AND ccc.complete_type = 2 \n" +
-            "          AND ccc.company_site_id = :companySiteId) \n" +
-            "  AND cc.recall_time <= SYSDATE\n" +
-            "  AND cc.recall_time + interval :apParam MINUTE >= SYSDATE", nativeQuery = true)
-    List<CampaignCustomer> getCustomerRecallDate(@Param("campaignId") Long campaignId, @Param("agentId") Long agentId, @Param("companySiteId") Long companySiteId, @Param("apParam") String apParam);
 }

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.web.dto.CampaignCustomerDTO;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CampaignCustomerRepositoryCustom {
+
+    List<CampaignCustomerDTO> getDataCampaignCustomer(CampaignCustomerDTO dto, String expression);
+}

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

@@ -18,16 +18,6 @@ public interface CampaignRepository extends JpaRepository<Campaign, Long> {
 
     List<Campaign> findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(Long siteId, Date endTime, List<Long> status);
 
-
-
-    @Query("SELECT COUNT(c.campaignId) " +
-            " FROM Campaign c JOIN CampaignCustomer cc ON c.campaignId = cc.campaignId " +
-            " WHERE cc.companySiteId = :pCompanySiteId " +
-            " AND cc.status = 1 " +
-            " AND cc.recallTime <= sysdate " +
-            " AND cc.agentId = :pAgentId")
-    Long countRecallCustomer(@Param("pCompanySiteId") Long pCompanySiteId, @Param("pAgentId") Long pAgentId);
-
     Campaign findByCampaignId(Long campaignId);
 
     Campaign findCampaignByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);

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

@@ -17,4 +17,9 @@ public interface CampaignRepositoryCustom {
     String getMaxCampaignIndex();
 
     ResultDTO checkAllowStatusToPrepare(Long campaignId);
+
+    //hungtt
+    ResultDTO findCustomerListReallocation(CampaignRequestDTO dto);
+    //hungtt
+    ResultDTO reallocationCustomer(CampaignRequestDTO dto);
 }

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.ReceiveCustLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ReceiveCustLogRepository extends JpaRepository<ReceiveCustLog, Long> {
+
+}

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

+package com.viettel.campaign.repository.ccms_full.impl;
+
+import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.model.ccms_full.ApParam;
+import com.viettel.campaign.repository.ccms_full.ApParamRepository;
+import com.viettel.campaign.repository.ccms_full.CampaignCustomerRepositoryCustom;
+import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.utils.DataUtil;
+import com.viettel.campaign.utils.HibernateUtil;
+import com.viettel.campaign.utils.SQLBuilder;
+import com.viettel.campaign.web.dto.CampaignCustomerDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.transform.Transformers;
+import org.hibernate.type.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Transactional(DataSourceQualify.CCMS_FULL)
+public class CampaignCustomerRepositoryImpl implements CampaignCustomerRepositoryCustom {
+
+    @Autowired
+    ApParamRepository apParamRepository;
+
+    @Autowired
+    @PersistenceContext(unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
+    EntityManager entityManager;
+
+    @Override
+    public List<CampaignCustomerDTO> getDataCampaignCustomer(CampaignCustomerDTO customerDTO, String expression) {
+        List<CampaignCustomerDTO> result = new ArrayList<>();
+
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        try {
+            SQLQuery query = session.createSQLQuery(expression);
+            query.setParameter("campaignId", customerDTO.getCampaignId());
+            query.setParameter("companySiteId", customerDTO.getCompanySiteId());
+            if (expression.contains(":agentId")) {
+                query.setParameter("agentId", customerDTO.getAgentId());
+            }
+            if (expression.contains(":dungSai")) {
+                List<ApParam> apParam = apParamRepository.findAllParam("DUNG_SAI");
+                query.setParameter("dungSai", apParam.get(0).getParValue());
+            }
+
+            query.addScalar("customerId", new LongType());
+
+            query.setResultTransformer(Transformers.aliasToBean(CampaignCustomerDTO.class));
+
+            result = query.list();
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            session.close();
+        }
+
+        return result;
+    }
+}

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

 package com.viettel.campaign.repository.ccms_full.impl;
 
 import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import com.viettel.campaign.repository.ccms_full.CampaignRepositoryCustom;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
 import com.viettel.campaign.web.dto.CampaignDTO;
+import com.viettel.campaign.web.dto.CustomerCustomDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
@@ -17,16 +19,18 @@ import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
 import org.hibernate.type.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.*;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
@@ -37,6 +41,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
     @PersistenceContext( unitName= DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
     EntityManager entityManager;
 
+    @Autowired
+    @Qualifier(DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL)
+    NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
     @Override
     public ResultDTO search(CampaignRequestDTO requestDto) {
         logger.info("Start search campaign::");
@@ -322,4 +330,51 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         return result;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO findCustomerListReallocation(CampaignRequestDTO dto) {
+        ResultDTO resultDTO = new ResultDTO();
+        List<CustomerCustomDTO> list = new ArrayList<>();
+        Map<String, String> params = new HashMap<>();
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-list-customer-reallocation");
+            params.put("p_company_site_id", dto.getCompanySiteId());
+            params.put("p_campaign_id", dto.getCampaignId());
+            params.put("p_list_connect_status", dto.getConnectStatus());
+            params.put("p_page_size", dto.getPageSize().toString());
+            params.put("p_page_number", dto.getPage().toString());
+            list = namedParameterJdbcTemplate.query(sql, params, BeanPropertyRowMapper.newInstance(CustomerCustomDTO.class));
+            resultDTO.setListData(list);
+            resultDTO.setTotalRow(list.size());
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
+
+    @Override
+    public ResultDTO reallocationCustomer(CampaignRequestDTO dto) {
+        ResultDTO resultDTO = new ResultDTO();
+        try {
+            List<CustomerCustomDTO> list = dto.getCustomerCustomDTOList();
+            for (CustomerCustomDTO customerCustomDTO: list) {
+                CampaignCustomer campaignCustomer = entityManager.find(CampaignCustomer.class, customerCustomDTO.getCampaignCustomerId());
+                campaignCustomer.setStatus((short) 0);
+                campaignCustomer.setCallStatus(null);
+                campaignCustomer.setRedistribute((short) 1);
+            }
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } 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/service/CampaignExecuteService.java

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.web.dto.CampaignCustomerDTO;
 import com.viettel.campaign.web.dto.ContactCustResultDTO;
+import com.viettel.campaign.web.dto.ReceiveCustLogDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -26,5 +28,9 @@ public interface CampaignExecuteService {
 
     ResultDTO getExecuteCampaign(CampaignRequestDTO requestDto);
 
-    ResultDTO getCall(CampaignRequestDTO dto);
+    ResultDTO getCall(CampaignCustomerDTO dto);
+
+    ResultDTO getCallLog(ReceiveCustLogDTO dto);
+
+    ResultDTO getAgentLogout(CampaignRequestDTO dto);
 }

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

@@ -30,7 +30,9 @@ public interface CampaignService {
 
     ResultDTO addNewCampaign(CampaignDTO campaignDTO);
 
-    Map countRecallCustomer(Long companySiteId, Long agentId);
+    ResultDTO countRecallCustomer(Long companySiteId, Long agentId);
+
+    ResultDTO getCustomerRecall(Long campaignId, Long customerId);
 
     ResultDTO findCampaignById(Long campaignId);
 
@@ -47,4 +49,10 @@ public interface CampaignService {
     ResultDTO renewCampaign(CampaignDTO campaignDTO);
 
     ResultDTO updateCampaign(CampaignDTO dto);
+
+    //<editor-fold: hungtt>
+    ResultDTO findCustomerListReallocation(CampaignRequestDTO dto);
+
+    ResultDTO reallocationCustomer(CampaignRequestDTO dto);
+    //</editor-fold>
 }

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.mapper.ReceiveCustLogMapper;
 import com.viettel.campaign.model.acd_full.Agents;
-import com.viettel.campaign.model.ccms_full.CampaignCustomer;
-import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
-import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
+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.SQLBuilder;
-import com.viettel.campaign.web.dto.ApParamDTO;
-import com.viettel.campaign.web.dto.ContactCustResultDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -33,6 +30,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     private static final Logger logger = LoggerFactory.getLogger(CampaignExecuteServiceImp.class);
     private SimpleDateFormat formatter = new SimpleDateFormat(Constants.DATE_FORMAT.FOMART_DATE_TYPE_1);
 
+    @Autowired
+    ReceiveCustLogRepository custLogRepository;
+
     @Autowired
     CampaignRepositoryCustom campaignRepositoryCustom;
 
@@ -278,22 +278,45 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public ResultDTO getCall(CampaignRequestDTO dto) {
+    public ResultDTO getCall(CampaignCustomerDTO dto) {
         ResultDTO result = new ResultDTO();
 
         //Agents agents = agentsRepository.findByAgentId(dto.getAgentId());
         //TimeZoneDialMode zoneDialMode = zoneDialModeRepository.findDialModeAtCurrent(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getCompanySiteId()));
         //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getCompanySiteId()));
-
-
-
-        List<CampaignCustomer> lst = null;//campaignCustomerRepository.getCustomerRecallDate(dto.getCampaignId(), dto.getAgentId(), dto.getCompanySiteId(), );
+        List<CampaignCustomerDTO> lst = new ArrayList<>();
+        // Khách hàng đến thời điểm hẹn gọi lại và là khách hàng mà chính NSD hẹn gọi lại
+        List<CampaignCustomerDTO> lst1 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer1"));
+        if (lst1.size() > 0) {
+            lst = lst1;
+        } else {
+            // Khách hàng đến thời điểm hẹn gọi lại và không là khách hàng mà NSD dùng hẹn gọi lại nhưng TVV hẹn gọi lại không đăng nhập hoặc không thực hiện chiến dịch hiện tại
+            List<CampaignCustomerDTO> lst2 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer2"));
+            if (lst2.size() > 0) {
+                lst = lst2;
+            } else {
+                // Khách hàng là khách hàng hẹn gọi lại nhưng thời gian hẹn gọi lại đã quá thời gian hẹn gọi lại + dung sai
+                List<CampaignCustomerDTO> lst3 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer3"));
+                if (lst3.size() > 0) {
+                    lst = lst3;
+                } else {
+                    // Khách hàng mới
+                    List<CampaignCustomerDTO> lst4 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer4"));
+                    if (lst4.size() > 0) {
+                        lst = lst4;
+                    } else {
+                        // Khách hàng không liên lạc được nhưng chưa phải là cuộc gọi kết thúc và có số lần đã gọi < Số lần gọi tối đa được cấu hình và khoảng cách giữa 2 lần gọi < thời gian tương tác giữa 2 lần gọi được cấu hình
+                        List<CampaignCustomerDTO> lst5 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer5"));
+                        lst = lst5;
+                    }
+                }
+            }
+        }
 
         if (lst != null) {
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            //result.setTotalRow(count);
-            //result.setListData(campaignExecuteRepository.searchCampaignExecute(requestDto, SQLBuilder.buildPageable(requestDto)));
+            result.setListData(lst);
             //result.setData(data);
         } else {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -302,4 +325,44 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
 
         return result;
     }
+
+    @Override
+    public ResultDTO getCallLog(ReceiveCustLogDTO dto) {
+        ResultDTO result = new ResultDTO();
+
+        ReceiveCustLog receiveCustLog = (new ReceiveCustLogMapper()).toPersistenceBean(dto);
+
+        try {
+            custLogRepository.save(receiveCustLog);
+            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId(), "NOT AVAILABLE");
+
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return result;
+    }
+
+    @Override
+    public ResultDTO getAgentLogout(CampaignRequestDTO dto) {
+        ResultDTO result = new ResultDTO();
+
+        try {
+            agentsRepository.updateAgentLogoutFromCampaign(Long.parseLong(dto.getAgentId()), "LOGOUT");
+            campaignAgentRepository.updateCampaignAgentSetStatus(Long.parseLong(dto.getAgentId()), Long.parseLong(dto.getCampaignId()), 0);
+
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return result;
+    }
 }

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

@@ -42,6 +42,9 @@ public class CampaignServiceImpl implements CampaignService {
     @Autowired
     CampaignRepository campaignRepository;
 
+    @Autowired
+    CampaignCustomerRepository campaignCustomerRepository;
+
     @Autowired
     CampaignRepositoryCustom campaignRepositoryCustom;
 
@@ -162,23 +165,37 @@ public class CampaignServiceImpl implements CampaignService {
     }
 
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public Map countRecallCustomer(Long companySiteId, Long agentId) {
-        Map result = new HashMap();
-        Long count = campaignRepository.countRecallCustomer(companySiteId, agentId);
+    public ResultDTO countRecallCustomer(Long companySiteId, Long agentId) {
+        Long count = campaignCustomerRepository.countRecallCustomer(companySiteId, agentId);
         ResultDTO resultDTO = new ResultDTO();
         if (count != null) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            result.put("info", resultDTO);
-            result.put("result", count);
+            resultDTO.setData(count);
         } else {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
-            result.put("info", resultDTO);
-            result.put("result", 0);
+            resultDTO.setData(0);
         }
 
-        return result;
+        return resultDTO;
+    }
+
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO getCustomerRecall(Long campaignId, Long customerId) {
+        Long count = campaignCustomerRepository.getCustomerRecall(campaignId, customerId);
+        ResultDTO resultDTO = new ResultDTO();
+        if (count != null) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setData(count);
+        } else {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            resultDTO.setData(0);
+        }
+
+        return resultDTO;
     }
 
     @Override
@@ -435,6 +452,20 @@ public class CampaignServiceImpl implements CampaignService {
         return resultDTO;
     }
 
+    // hungtt
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO findCustomerListReallocation(CampaignRequestDTO dto) {
+        return campaignRepositoryCustom.findCustomerListReallocation(dto);
+    }
+
+    // hungtt
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO reallocationCustomer(CampaignRequestDTO dto) {
+        return campaignRepositoryCustom.reallocationCustomer(dto);
+    }
+
     private String generateCampaignCode(String campaignType, Short chanel) {
         int year = Calendar.getInstance().get(Calendar.YEAR);
         String maxIndexStr = campaignRepositoryCustom.getMaxCampaignIndex();

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

 package com.viettel.campaign.utils;
 
-//import com.viettel.security.PassTranformer;
+import com.viettel.security.PassTranformer;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -60,7 +60,7 @@ public class Config {
         } catch (IOException ex) {
             Logger.getLogger(Config.class.getName()).error(ex.getMessage(), ex);
         }
-//        PassTranformer.setInputKey("Ipcc#987654321#@!");
+        PassTranformer.setInputKey("Ipcc#987654321#@!");
 
 //        rabbitConnection = properties.getProperty("rabbit_connection_string");
 //        fbGatewayUser = PassTranformer.decrypt(properties.getProperty("rabbit_user", "").trim());

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

@@ -105,7 +105,7 @@ public class RedisUtil {
             JedisCluster jedis = getRedis();
             byte[] value = jedis.get(key.getBytes());
             if (value != null && value.length > 0) {
-                object = SerializationUtils.deserialize(value);
+                object = (Object) SerializationUtils.deserialize(value);
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);

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

@@ -23,4 +23,8 @@ public class CustomerCustomDTO {
     String ipccStatus;
     String mobileNumber;
     String email;
+    String connectStatus;
+    String connectTime;
+    String customerName;
+    Long campaignCustomerId;
 }

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class ReceiveCustLogDTO extends BaseDTO {
+    private Long receiveCustLogId;
+    private Long companySiteId;
+    private Long customerId;
+    private Long agentId;
+    private Long campaignId;
+    private Date startTime;
+    private Date endTime;
+}

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

 package com.viettel.campaign.web.dto.request_dto;
 
 import com.viettel.campaign.web.dto.BaseDTO;
+import com.viettel.campaign.web.dto.CustomerCustomDTO;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @author anhvd_itsol
  */
@@ -42,4 +45,5 @@ public class CampaignRequestDTO extends BaseDTO {
     String surveyStatus;
     String roleUser;
     String contactCustId;
+    List<CustomerCustomDTO> customerCustomDTOList;
 }

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

@@ -21,6 +21,8 @@ public class ApParamController {
 
     private static final String CONNECT_STATUS = "CONNECT_STATUS";
     private static final String CONNECT_STATUS_TYPE = "1";
+    private static final String CONNECT_STATUS_RE = "CONNECT_STATUS_RE";
+    private static final String CONNECT_STATUS_TYPE_RE = "3";
     private static final String SURVEY_STATUS = "SURVEY_STATUS";
     private static final String SURVEY_STATUS_TYPE = "2";
     private static final String CAMPAIGN_TYPE = "CAMPAIGN_TYPE";
@@ -74,6 +76,8 @@ public class ApParamController {
             return new ResponseEntity<>(campaignExecuteService.getComboBoxStatus(companySiteId, CONNECT_STATUS_TYPE), HttpStatus.OK);
         } else if (SURVEY_STATUS.equals(parType)){
             return new ResponseEntity<>(campaignExecuteService.getComboBoxStatus(companySiteId, SURVEY_STATUS_TYPE), HttpStatus.OK);
+        } else if (CONNECT_STATUS_RE.equals(parType)) {
+            return new ResponseEntity<>(campaignExecuteService.getComboBoxStatus(companySiteId, CONNECT_STATUS_TYPE_RE), HttpStatus.OK);
         } else {
             return new ResponseEntity<>(campaignExecuteService.getComboCampaignType(companySiteId), HttpStatus.OK);
         }

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

@@ -4,7 +4,9 @@ import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
 import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
+import com.viettel.campaign.web.dto.CampaignCustomerDTO;
 import com.viettel.campaign.web.dto.CampaignDTO;
+import com.viettel.campaign.web.dto.ReceiveCustLogDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -55,11 +57,25 @@ public class CampaignController {
 
     @PostMapping("/getCall")
     @ResponseBody
-    public ResponseEntity<ResultDTO> getCall(@RequestBody CampaignRequestDTO requestDto) {
+    public ResponseEntity<ResultDTO> getCall(@RequestBody CampaignCustomerDTO requestDto) {
         ResultDTO result = campaignExecuteService.getCall(requestDto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @PostMapping("/getCallLog")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getCallLog(@RequestBody ReceiveCustLogDTO requestDto) {
+        ResultDTO result = campaignExecuteService.getCallLog(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/getAgentLogout")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getAgentLogout(@RequestBody CampaignRequestDTO requestDto) {
+        ResultDTO result = campaignExecuteService.getAgentLogout(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @RequestMapping(value = "/search", method = RequestMethod.POST)
     public ResponseEntity<ResultDTO> search(@RequestBody CampaignRequestDTO requestDto) {
         ResultDTO result = campaignService.search(requestDto);
@@ -79,7 +95,14 @@ public class CampaignController {
     @GetMapping("/countRecallCustomer")
     @ResponseBody
     public ResponseEntity countRecallCustomer(@RequestParam("companySiteId") Long companySiteId, @RequestParam("agentId") Long agentId) {
-        Map result = campaignService.countRecallCustomer(companySiteId, agentId);
+        ResultDTO result = campaignService.countRecallCustomer(companySiteId, agentId);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @GetMapping("/getCustomerRecall")
+    @ResponseBody
+    public ResponseEntity getCustomerRecall(@RequestParam("campaignId") Long campaignId, @RequestParam("customerId") Long customerId) {
+        ResultDTO result = campaignService.getCustomerRecall(campaignId, customerId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -192,4 +215,18 @@ public class CampaignController {
         ResultDTO resultDTO = campaignService.updateCampaign(dto);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
+    @PostMapping("/findCustomerListReallocation")
+    @ResponseBody
+    public ResponseEntity<?> findCustomerListReallocation(@RequestBody CampaignRequestDTO dto) {
+        ResultDTO result = campaignService.findCustomerListReallocation(dto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/reallocationCustomer")
+    @ResponseBody
+    public ResponseEntity<?> reallocationCustomer(@RequestBody CampaignRequestDTO dto) {
+        ResultDTO result = campaignService.reallocationCustomer(dto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }

src/main/java/com/viettel/econtact/filter/UserSession.java

 package com.viettel.econtact.filter;
 
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
 
 import java.io.Serializable;
 
 /**
- * @author hanv_itsol
- * @project service-campaign
+ *
+ * @author ThaoNT19
  */
-
 public class UserSession implements Serializable{
-
     String authToken;
     String ownserId;
     String accountId;
@@ -20,28 +24,20 @@ public class UserSession implements Serializable{
     Long companySiteId;
     long expTime;
 
-    public String getAuthToken() {
-        return authToken;
-    }
-
-    public void setAuthToken(String authToken) {
-        this.authToken = authToken;
-    }
-
-    public String getOwnserId() {
-        return ownserId;
+    public long getExpTime() {
+        return expTime;
     }
 
-    public void setOwnserId(String ownserId) {
-        this.ownserId = ownserId;
+    public void setExpTime(long expTime) {
+        this.expTime = expTime;
     }
 
-    public String getAccountId() {
-        return accountId;
+    public String getAuthToken() {
+        return authToken;
     }
 
-    public void setAccountId(String accountId) {
-        this.accountId = accountId;
+    public void setAuthToken(String authToken) {
+        this.authToken = authToken;
     }
 
     public Long getUserId() {
@@ -60,6 +56,22 @@ public class UserSession implements Serializable{
         this.userName = userName;
     }
 
+    public String getOwnserId() {
+        return ownserId;
+    }
+
+    public void setOwnserId(String ownserId) {
+        this.ownserId = ownserId;
+    }
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
     public String getRole() {
         return role;
     }
@@ -83,12 +95,5 @@ public class UserSession implements Serializable{
     public void setCompanySiteId(Long companySiteId) {
         this.companySiteId = companySiteId;
     }
-
-    public long getExpTime() {
-        return expTime;
-    }
-
-    public void setExpTime(long expTime) {
-        this.expTime = expTime;
-    }
+    
 }

src/main/resources/application.yml

 server:
-  port: 9999
+  port: 1111
 spring:
   application:
     name: campaign

src/main/resources/sql/campaign-execute/get-execute-customer1.sql

+SELECT CC.CUSTOMER_ID AS customerId
+FROM CAMPAIGN_CUSTOMER CC
+    LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID
+WHERE CC.CAMPAIGN_ID = :campaignId
+  AND CC.COMPANY_SITE_ID = :companySiteId
+  AND CC.IN_CAMPAIGN_STATUS = 1
+  AND CL.CUSTOMER_ID IS NULL
+  AND CL.END_TIME IS NULL
+  AND EXISTS(SELECT 1
+        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC
+        WHERE CC.STATUS = CCC.COMPLETE_VALUE
+          AND STATUS = 1
+          AND IS_RECALL = 1
+          AND COMPLETE_TYPE = 2
+          AND COMPANY_SITE_ID = :companySiteId)
+  AND CC.RECALL_TIME <= SYSDATE
+  AND CC.RECALL_TIME + NUMTODSINTERVAL(:dungSai, 'MINUTE') >= SYSDATE
+  AND CC.AGENT_ID = :agentId

src/main/resources/sql/campaign-execute/get-execute-customer2.sql

+SELECT CC.CUSTOMER_ID AS customerId
+FROM CCMS_FULL.CAMPAIGN_CUSTOMER CC
+    LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID
+    LEFT JOIN ACD_FULL.AGENTS AG ON CC.AGENT_ID = AG.AGENT_ID AND CC.CAMPAIGN_ID = AG.CURRENT_CAMPAIGN_ID
+WHERE CC.CAMPAIGN_ID = :campaignId
+  AND CC.COMPANY_SITE_ID = :companySiteId
+  AND CC.IN_CAMPAIGN_STATUS = 1
+  AND CL.CUSTOMER_ID IS NULL
+  AND CL.END_TIME IS NULL
+  AND EXISTS(SELECT 1
+        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC
+        WHERE CC.STATUS = CCC.COMPLETE_VALUE
+          AND STATUS = 1
+          AND IS_RECALL = 1
+          AND COMPLETE_TYPE = 2
+          AND COMPANY_SITE_ID = :companySiteId)
+  AND CC.RECALL_TIME <= SYSDATE
+  AND CC.RECALL_TIME + NUMTODSINTERVAL(:dungSai, 'MINUTE') >= SYSDATE
+  AND (AG.CAMPAIGN_SYSTEM_STATUS IS NULL OR AG.CAMPAIGN_SYSTEM_STATUS <> 'AVAILABLE')

src/main/resources/sql/campaign-execute/get-execute-customer3.sql

+SELECT CC.CUSTOMER_ID AS customerId
+FROM CAMPAIGN_CUSTOMER CC
+    LEFT JOIN RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID
+WHERE CC.CAMPAIGN_ID = :campaignId
+  AND CC.COMPANY_SITE_ID = :companySiteId
+  AND CC.IN_CAMPAIGN_STATUS = 1
+  AND CL.CUSTOMER_ID IS NULL
+  AND CL.END_TIME IS NULL
+  AND EXISTS(SELECT 1
+        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC
+        WHERE CC.STATUS = CCC.COMPLETE_VALUE
+          AND STATUS = 1
+          AND IS_RECALL = 1
+          AND COMPLETE_TYPE = 2
+          AND COMPANY_SITE_ID = :companySiteId)
+  AND CC.RECALL_TIME + NUMTODSINTERVAL(:dungSai, 'MINUTE') <= SYSDATE

src/main/resources/sql/campaign-execute/get-execute-customer4.sql

+SELECT CC.CUSTOMER_ID AS customerId
+FROM CAMPAIGN_CUSTOMER CC
+    INNER JOIN CUSTOMER C ON CC.CUSTOMER_ID = C.CUSTOMER_ID
+    LEFT JOIN RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID
+WHERE CC.CAMPAIGN_ID = :campaignId
+  AND CC.COMPANY_SITE_ID = :companySiteId
+  AND CC.IN_CAMPAIGN_STATUS = 1
+  AND CL.CUSTOMER_ID IS NULL
+  AND CL.END_TIME IS NULL
+  AND CC.STATUS = 0
+  AND C.STATUS = 1
+  AND C.CALL_ALLOWED = 1
+  AND C.IPCC_STATUS = 'active'

src/main/resources/sql/campaign-execute/get-execute-customer5.sql

+SELECT CC.CUSTOMER_ID AS customerId
+FROM CAMPAIGN_CUSTOMER CC
+    LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID
+WHERE CC.CAMPAIGN_ID = :campaignId
+  AND CC.COMPANY_SITE_ID = :companySiteId
+  AND CC.IN_CAMPAIGN_STATUS = 1
+  AND CL.CUSTOMER_ID IS NULL
+  AND CL.END_TIME IS NULL
+  AND EXISTS(SELECT 1
+        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC
+        WHERE CC.STATUS = CCC.COMPLETE_VALUE
+          AND STATUS = 1
+          AND IS_FINISH = 0
+          AND COMPLETE_TYPE = 1
+          AND COMPANY_SITE_ID = :companySiteId)
+  AND CC.RECALL_COUNT < C.MAX_RECALL
+  AND SYSDATE – MAX(CC.CALL_TIME) >= C.RECALL_DURATION
+  AND C.STATUS = 1
+  AND C.CALL_ALLOWED = 1
+  AND C.IPCC_STATUS = 'active'

src/main/resources/sql/campaign-execute/get-execute-interactive.sql

-select  b.campaign_code campaignCode,
-        b.campaign_name campaignName,
-        c.user_name userName,
-        a.phone_number phoneNumber,
-        d.name customerName,
-        to_date(a.start_call, 'DD/MM/YYYY') startCall,
-        e.complete_name contactStatus,
-        f.complete_name surveyStatus,
-        g.status status,
-        a.status recordStatus,
-        (a.end_time - a.start_call)*24*60 callTime
-from contact_cust_result a
-    left join campaign b on a.campaign_id = b.campaign_id
-    left join vsa_users c on a.agent_id = c.user_id
-    left join customer d on a.customer_id = d.customer_id
-    left join campaign_complete_code e on a.contact_status = e.complete_value
-    left join campaign_complete_code f on a.call_status = e.complete_value
-    left join campaign g on a.campaign_id = g.campaign_id
-where a.status <> 0
-    and a.company_site_id = :p_company_site_id
-    and a.create_time >= to_date(:p_date_from, 'DD/MM/YYYY')
-    and a.create_time <= to_date(:p_date_to, 'DD/MM/YYYY')
-    and a.duration_call >= :p_call_time_from
-    and a.duration_call <= :p_call_time_to
+with campaign_type_list as (
+    select trim (regexp_substr(:p_list_compaign_type, '[^,]+', 1, level)) campaign_type
+    from dual
+    connect by level <= regexp_count(:p_list_compaign_type, ',') +1
+),
+contact_status_list as (
+    select trim (regexp_substr(:p_list_contact_status, '[^,]+', 1, level)) contact_status
+    from dual
+    connect by level <= regexp_count(:p_list_contact_status, ',') +1
+),
+survey_status_list as (
+    select trim (regexp_substr(:p_list_survey_status, '[^,]+', 1, level)) survey_status
+    from dual
+    connect by level <= regexp_count(:p_list_survey_status, ',') +1
+),
+record_status_list as (
+    select trim (regexp_substr(:p_list_record_status, '[^,]+', 1, level)) record_status
+    from dual
+    connect by level <= regexp_count(:p_list_record_status, ',') +1
+),
+campaign_id_list as (
+    select trim (regexp_substr(:p_list_campaign_id, '[^,]+', 1, level)) campaign_id
+    from dual
+    connect by level <= regexp_count(:p_list_campaign_id, ',') +1
+),
+data_temp as (
+    select  b.campaign_code campaignCode,
+            b.campaign_name campaignName,
+            c.user_name userName,
+            a.phone_number phoneNumber,
+            d.name customerName,
+            to_date(a.start_call, 'DD/MM/YYYY') startCall,
+            e.complete_name contactStatus,
+            f.complete_name surveyStatus,
+            g.status status,
+            a.status recordStatus,
+            (a.end_time - a.start_call)*24*60 callTime
+    from contact_cust_result a
+        left join campaign b on a.campaign_id = b.campaign_id
+        left join vsa_users c on a.agent_id = c.user_id
+        left join customer d on a.customer_id = d.customer_id
+        left join campaign_complete_code e on a.contact_status = e.complete_value
+        left join campaign_complete_code f on a.call_status = e.complete_value
+        left join campaign g on a.campaign_id = g.campaign_id
+    where a.status <> 0
+        and a.company_site_id = :p_company_site_id
+        and a.create_time >= to_date(:p_date_from, 'DD/MM/YYYY')
+        and a.create_time <= to_date(:p_date_to, 'DD/MM/YYYY')
+        and a.duration_call >= :p_call_time_from
+        and a.duration_call <= :p_call_time_to
+        and to_char(a.customer_id) like '%'||:p_customer_id||'%'
+        and b.campaign_type in (select campaign_type from campaign_type_list)
+        and to_char(a.contact_status) in (select contact_status from contact_status_list)
+        and to_char(a.call_status) in (select survey_status from survey_status_list)
+        and to_char(a.status) in (select record_status from record_status_list)
+        and (:p_phone_number is null or to_char(a.phone_number) like '%'||:p_phone_number||'%')
+        and (:p_list_campaign_id is null or b.campaign_code in (select campaign_id from campaign_id_list))
+        and (:p_campaign_name is null or upper(b.campaign_name) like '%'||:p_campaign_name||'%')
+        and (:p_user_name is null or upper(c.user_name) like '%'||:p_user_name||'%')
+),
+data as (
+    select a.*, rownum row_ from data_temp a
+)
+select * from data
+where :p_page_size = 0 or (row_ >= ((:p_page_number - 1) * :p_page_size + 1) and row_ < (:p_page_number * :p_page_size + 1))

src/main/resources/sql/campaign-mng/get-list-customer-reallocation.sql

+with contact as (
+    select customer_id, contact
+    from (
+        select * from customer_contact
+        where status = 1
+            and contact_type = 5
+            and is_direct_line = 1
+        order by create_date desc
+    )
+    where rownum = 1
+),
+connect_status as (
+    select complete_value, complete_name
+    from campaign_complete_code
+    where company_site_id = :p_company_site_id
+        and complete_type = 1
+        and complete_value <> 1
+),
+connect_status_list as (
+    select trim (regexp_substr(:p_list_connect_status, '[^,]+', 1, level)) connect_status
+    from dual
+    connect by level <= regexp_count(:p_list_connect_status, ',') +1
+),
+data as (
+    select  a.campaign_customer_id campaignCustomerId,
+            b.name customerName,
+            c.contact mobileNumber,
+            to_char(a.call_time, 'DD/MM/YYYY HH24:MI:SS') connectTime,
+            d.complete_name connectStatus
+    from campaign_customer a
+    left join customer b on a.customer_id = b.customer_id
+    left join contact c on a.customer_id = c.customer_id
+    left join connect_status d on d.complete_value = a.status
+    where a.campaign_id = :p_campaign_id
+        and a.in_campaign_status = 1
+        and a.status in (select connect_status from connect_status_list)
+    order by connectTime desc, customerName
+),
+final_data as (
+    select a.*, rownum row_ from data a
+)
+select * from final_data
+where row_ >= ((:p_page_number - 1) * :p_page_size + 1)
+    and row_ < (:p_page_number * :p_page_size + 1)