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

# Conflicts:
#	src/main/java/com/viettel/campaign/job/CampaignJob.java
#	src/main/java/com/viettel/campaign/service/CustomerService.java

src/main/java/com/viettel/campaign/job/CampaignJob.java

 package com.viettel.campaign.job;
 
 import com.viettel.campaign.model.ccms_full.Campaign;
+import com.viettel.campaign.model.ccms_full.Customer;
+import com.viettel.campaign.model.ccms_full.CustomerTime;
 import com.viettel.campaign.model.ccms_full.ProcessConfig;
 import com.viettel.campaign.service.CampaignService;
+import com.viettel.campaign.service.CustomerService;
+import com.viettel.campaign.service.CustomerTimeService;
 import com.viettel.campaign.service.ProcessConfigService;
 import com.viettel.campaign.utils.DateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -34,6 +36,12 @@ public class CampaignJob {
     @Autowired
     private CampaignService campaignService;
 
+    @Autowired
+    private CustomerTimeService customerTimeService;
+
+    @Autowired
+    private CustomerService customerService;
+
 //    @Scheduled(fixedRate = 5000)
 //    @Transactional( propagation = Propagation.REQUIRED)
     public void process() {
@@ -42,55 +50,84 @@ public class CampaignJob {
 
         list.parallelStream().forEach(p -> {
             boolean isExecute = DateTimeUtil.isRun(p.getConfigValue(), p.getLastProcess());
-//            switch (p.getConfigCode()){
-//                case CUSTOMER_INACTIVE_DUARATION:
-//                    if(isExecute){
-//
-//                    }
-//                    break;
-//                case CRON_EXPRESSION_CHECK_START:
-//                    // process
-//                    if(isExecute){
-//                        // chuyen trang thai Du thao sang Trien khai
-//                        log.info("thay doi trang thai");
-//                        List<Long> status = new ArrayList<>();
-//                        status.add(1L);
-//                        status.add(1L);
-//                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
-//                        campaigns.parallelStream().forEach(campaign -> {
-//                            campaign.setProcessStatus(1);
-//                            campaign.setStatus(2L);
-//                            campaign.setCampaignStart(new Date());
-//                            campaignService.updateProcess(campaign);
-//                        });
-//
-//                        // update last check
-//                        p.setLastProcess(new Date());
-//                        processConfigService.update(p);
-//                    }
-//                    break;
-//                case CRON_EXPRESSION_CHECK_END:
-//                    // process
-//                    if(isExecute){
-//                        // chuyen trang thai sang ket thuc
-//                        List<Long> status = new ArrayList<>();
-//                        status.add(2L);
-//                        status.add(3L);
-//                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
-//                        campaigns.parallelStream().forEach(campaign -> {
-//                            campaign.setStatus(4L);
-//                            campaign.setCampaignEnd(new Date());
-//                            campaignService.updateProcess(campaign);
-//                        });
-//                    }
-//                    break;
-//                default:
-//
-//            }
+            switch (p.getConfigCode()){
+                case CUSTOMER_INACTIVE_DUARATION:
+                    if(isExecute){
+                        List<Customer> customers = customerService.findAllByCondition(p.getSiteId(), new Date());
+                        updateCustomer(customers);
+                        updateCustomerTime(customers);
+                        log.info("Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}", p.getSiteId());
+                        p.setLastProcess(new Date());
+                        processConfigService.update(p);
+                    }
+                    break;
+                case CRON_EXPRESSION_CHECK_START:
+                    // process
+                    if(isExecute){
+                        List<Long> status = new ArrayList<>();
+                        status.add(1L);
+                        status.add(1L);
+                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+                        campaigns.parallelStream().forEach(campaign -> {
+                            log.info("Chuyen trang thai chien dich ... #{} ... tu Du thao sang Trien khai", campaign.getCampaignId());
+                            campaign.setProcessStatus(1);
+                            campaign.setStatus(2L);
+                            campaign.setCampaignStart(new Date());
+                            campaignService.updateProcess(campaign);
+                        });
+
+                        log.info("Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}", p.getSiteId());
+                        p.setLastProcess(new Date());
+                        processConfigService.update(p);
+                    }
+                    break;
+                case CRON_EXPRESSION_CHECK_END:
+                    // process
+                    if(isExecute){
+                        List<Long> status = new ArrayList<>();
+                        status.add(2L);
+                        status.add(3L);
+                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+                        campaigns.parallelStream().forEach(campaign -> {
+                            log.info("Chuyen trang thai chien dich ... #{} ... sang Ket thuc", campaign.getCampaignId());
+                            campaign.setStatus(4L);
+                            campaign.setCampaignEnd(new Date());
+                            campaignService.updateProcess(campaign);
+                        });
+
+                        log.info("Cap nhat thoi gian thuc hien tien trinh cho siteId ... #{}", p.getSiteId());
+                        p.setLastProcess(new Date());
+                        processConfigService.update(p);
+                    }
+                    break;
+                default:
+                    // update last check time
+            }
         });
 
 
     }
-//
+
+    private void updateCustomer(List<Customer> customers){
+        customers.parallelStream().forEach(c -> {
+            log.info("Cap nhat trang thai khoa cua KH ... #{}", c.getCustomerId());
+            c.setIpccStatus("active");
+            customerService.update(c);
+        });
+    }
+
+    private void updateCustomerTime(List<Customer> customers){
+        customers.parallelStream().forEach(customer -> {
+            // find all customer_time by customerId
+            List<CustomerTime> customerTimes = customerTimeService.findByCustomerId(customer.getCustomerId());
+            customerTimes.parallelStream().forEach(customerTime -> {
+                log.info("Cap nhat Customer time cua KH ... #{}", customerTime.getCustomerId());
+                customerTime.setStatus(2);
+                customerTime.setUpdateTime(new Date());
+                customerTimeService.update(customerTime);
+            });
+        });
+    }
+
 
 }

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

+package com.viettel.campaign.model.ccms_full;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+@Entity
+@Table(name = "CUSTOMER_TIME")
+@Getter
+@Setter
+public class CustomerTime {
+
+    @Id
+    @NotNull
+    @Column(name = "CUSTOMER_TIME_ID")
+    private Long customerTimeId;
+
+    @Column(name = "COMPANY_SITE_ID")
+    private String companySiteId;
+
+    @Column(name = "CUSTOMER_ID")
+    private String customerId;
+
+    @Column(name = "START_TIME")
+    private Date startTime;
+
+    @Column(name = "END_TIME")
+    private Date endTime;
+
+    @Column(name = "STATUS")
+    private Integer status;
+
+    @Column(name = "CREATE_TIME")
+    private Date createTime;
+
+    @Column(name = "UPDATE_TIME")
+    private Date updateTime;
+
+    @Column(name = "CREATE_BY")
+    private String createBy;
+
+    @Column(name = "UPDATE_BY")
+    private String updateBy;
+
+    @Column(name = "CONTACT_CUST_RESULT_ID")
+    private Long contactCustResultId;
+}

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

@@ -20,5 +20,7 @@ public interface CampaignExecuteRepository {
     ResultDTO getInteractiveResult(CampaignRequestDTO dto);
 
     List<ContactCustResultDTO> getExcelInteractiveResult(CampaignRequestDTO dto);
+
+    List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto);
     //</editor-fold: hungtt>
 }

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

@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Repository
@@ -27,4 +28,8 @@ public interface CustomerRepository extends JpaRepository<Customer, Long> {
     @Modifying
     @Query("delete from Customer c where c.customerId in (:ids)")
     int deleteIds(@Param("ids") List<Long> ids);
+
+    @Query("select c from Customer c left join com.viettel.campaign.model.ccms_full.CustomerTime ct on c.customerId = ct.customerId " +
+            "where c.ipccStatus = 'locked' and c.siteId =?1 and ct.endTime <= ?2")
+    List<Customer> findAllByCondition(Long siteId, Date endTime);
 }

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.CustomerTime;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+
+@Repository
+public interface CustomerTimeRepository extends JpaRepository<CustomerTime, Long> {
+
+    List<CustomerTime> findByCustomerId(Long customerId);
+}

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

@@ -34,26 +34,25 @@ import java.util.concurrent.TimeUnit;
 @Repository
 public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
 
-    private static final Logger logger = LoggerFactory.getLogger(CampaignRepositoryImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(CampaignExecuteRepositoryImp.class);
 
     @Autowired
     @Qualifier(DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL)
     NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
     @Autowired
-    @PersistenceContext( unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
+    @PersistenceContext (unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
     EntityManager entityManager;
 
     @Override
     public List<ApParamDTO> getComboBoxStatus(String companySiteId, String completeType) {
         List<ApParamDTO> list = new ArrayList<>();
         Map<String, String> params = new HashMap<>();
-        String sql = SQLBuilder.getSqlQueryById(Constants.SQL_MODULES.MODULE_EXECUTE, "get-combo-connect-status");
+        String sql = SQLBuilder.getSqlQueryById(Constants.SQL_MODULES.MODULE_EXECUTE, "get-combo-status");
         try {
             params.put("p_company_site_id", companySiteId);
             params.put("p_complete_type", completeType);
             list = namedParameterJdbcTemplate.query(sql, params, BeanPropertyRowMapper.newInstance(ApParamDTO.class));
-//            list = namedParameterJdbcTemplate.getJdbcTemplate().query(sql, (PreparedStatementSetter) params, BeanPropertyRowMapper.newInstance(ComboBoxDTO.class));
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
@@ -87,43 +86,78 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             String sql = SQLBuilder.getSqlQueryById(Constants.SQL_MODULES.MODULE_EXECUTE, "get-execute-interactive");
             sqlBuilder.append(sql);
 
+            sqlBuilder.append(" and b.campaign_type in (:p_list_compaign_type)");
+            sqlBuilder.append(" and to_char(a.customer_id) like :p_customer_id");
+            sqlBuilder.append(" and to_char(a.contact_status) in (:p_list_contact_status)");
+            sqlBuilder.append(" and to_char(a.call_status) in (:p_list_survey_status)");
+            sqlBuilder.append(" and to_char(a.status) in (:p_list_record_status)");
+
+            if (!DataUtil.isNullOrEmpty(dto.getPhoneNumber())) {
+                sqlBuilder.append(" and a.phone_number like :p_phone_number");
+            }
+            if (!DataUtil.isNullOrEmpty(dto.getCampaignId())) {
+                sqlBuilder.append(" and b.campaign_code in (:p_list_campaign_id) ");
+            }
             if (!DataUtil.isNullOrEmpty(dto.getCampaignName())) {
-                sqlBuilder.append(" and upper(campaignName) like upper(:p_campaign_name)");
+                sqlBuilder.append(" and upper(b.campaign_name) like :p_campaign_name");
             }
             if (!DataUtil.isNullOrEmpty(dto.getAgentId())) {
-                sqlBuilder.append(" and upper(userName) like upper(:p_user_name)");
+                sqlBuilder.append(" and upper(c.user_name) like :p_user_name");
             }
 
             SQLQuery query = session.createSQLQuery(sqlBuilder.toString());
 
-            query.setParameterList("p_list_campaign_id", dto.getCampaignId().split(","));
-            query.setParameter("p_customer_id", dto.getCustomerId());
+            query.setParameter("p_company_site_id", dto.getCompanySiteId());
+            query.setParameter("p_customer_id", "%" + dto.getCustomerId()
+                    .replace("\\", "\\\\")
+                    .replaceAll("%", "\\%")
+                    .replaceAll("_", "\\_")
+            + "%");
             query.setParameter("p_date_from", dto.getFromDate());
             query.setParameter("p_date_to", dto.getToDate());
+            query.setParameterList("p_list_compaign_type", dto.getCampaignType().split(","));
             query.setParameterList("p_list_contact_status", dto.getContactStatus().split(","));
             query.setParameterList("p_list_survey_status", dto.getSurveyStatus().split(","));
             query.setParameterList("p_list_record_status", dto.getRecordStatus().split(","));
-            query.setParameter("p_phone_number", dto.getPhoneNumber());
             query.setParameter("p_call_time_from", dto.getCallTimeFrom());
             query.setParameter("p_call_time_to", dto.getCallTimeTo());
 
+            if (!DataUtil.isNullOrEmpty(dto.getCampaignId())) {
+                query.setParameterList("p_list_campaign_id", dto.getCampaignId().split(","));
+            }
+            if (!DataUtil.isNullOrEmpty(dto.getPhoneNumber())) {
+                query.setParameter("p_phone_number", "%" + dto.getPhoneNumber()
+                        .replace("\\", "\\\\")
+                        .replaceAll("%", "\\%")
+                        .replaceAll("_", "\\_")
+                        + "%");
+            }
             if (!DataUtil.isNullOrEmpty(dto.getCampaignName())) {
-                query.setParameter("p_campaign_name", dto.getCampaignName().trim());
+                query.setParameter("p_campaign_name", "%" + dto.getCampaignName().toUpperCase()
+                        .replace("\\", "\\\\")
+                        .replaceAll("%", "\\%")
+                        .replaceAll("_", "\\_")
+                        + "%");
             }
             if (!DataUtil.isNullOrEmpty(dto.getAgentId())) {
-                query.setParameter("p_user_name", dto.getAgentId().trim());
+                query.setParameter("p_user_name", "%" + dto.getAgentId().toUpperCase()
+                        .replace("\\", "\\\\")
+                        .replaceAll("%", "\\%")
+                        .replaceAll("_", "\\_")
+                + "%");
             }
 
             query.addScalar("campaignCode", new StringType());
             query.addScalar("campaignName", new StringType());
             query.addScalar("userName", new StringType());
-            query.addScalar("phoneNumber", new LongType());
+            query.addScalar("phoneNumber", new StringType());
             query.addScalar("customerName", new StringType());
             query.addScalar("createTime", new DateType());
             query.addScalar("contactStatus", new StringType());
             query.addScalar("surveyStatus", new StringType());
             query.addScalar("status", new ShortType());
             query.addScalar("recordStatus", new ShortType());
+            query.addScalar("callTime", new LongType());
 
             query.setResultTransformer(Transformers.aliasToBean(ContactCustResultDTO.class));
 
@@ -161,8 +195,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             logger.error(e.getMessage(), e);
         } finally {
             session.close();
+            return resultDTO;
         }
-        return resultDTO;
     }
 
     @Override
@@ -177,43 +211,78 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             String sql = SQLBuilder.getSqlQueryById(Constants.SQL_MODULES.MODULE_EXECUTE, "get-execute-interactive");
             sqlBuilder.append(sql);
 
+            sqlBuilder.append(" and b.campaign_type in (:p_list_compaign_type)");
+            sqlBuilder.append(" and to_char(a.customer_id) like :p_customer_id");
+            sqlBuilder.append(" and to_char(a.contact_status) in (:p_list_contact_status)");
+            sqlBuilder.append(" and to_char(a.call_status) in (:p_list_survey_status)");
+            sqlBuilder.append(" and to_char(a.status) in (:p_list_record_status)");
+
+            if (!DataUtil.isNullOrEmpty(dto.getPhoneNumber())) {
+                sqlBuilder.append(" and a.phone_number like :p_phone_number");
+            }
+            if (!DataUtil.isNullOrEmpty(dto.getCampaignId())) {
+                sqlBuilder.append(" and b.campaign_code in (:p_list_campaign_id) ");
+            }
             if (!DataUtil.isNullOrEmpty(dto.getCampaignName())) {
-                sqlBuilder.append(" and upper(campaignName) like upper(:p_campaign_name)");
+                sqlBuilder.append(" and upper(b.campaign_name) like :p_campaign_name");
             }
             if (!DataUtil.isNullOrEmpty(dto.getAgentId())) {
-                sqlBuilder.append(" and upper(userName) like upper(:p_user_name)");
+                sqlBuilder.append(" and upper(c.user_name) like :p_user_name");
             }
 
             SQLQuery query = session.createSQLQuery(sqlBuilder.toString());
 
-            query.setParameterList("p_list_campaign_id", dto.getCampaignId().split(","));
-            query.setParameter("p_customer_id", dto.getCustomerId());
+            query.setParameter("p_company_site_id", dto.getCompanySiteId());
+            query.setParameter("p_customer_id", "%" + dto.getCustomerId()
+                    .replace("\\", "\\\\")
+                    .replaceAll("%", "\\%")
+                    .replaceAll("_", "\\_")
+                    + "%");
             query.setParameter("p_date_from", dto.getFromDate());
             query.setParameter("p_date_to", dto.getToDate());
+            query.setParameterList("p_list_compaign_type", dto.getCampaignType().split(","));
             query.setParameterList("p_list_contact_status", dto.getContactStatus().split(","));
             query.setParameterList("p_list_survey_status", dto.getSurveyStatus().split(","));
             query.setParameterList("p_list_record_status", dto.getRecordStatus().split(","));
-            query.setParameter("p_phone_number", dto.getPhoneNumber());
             query.setParameter("p_call_time_from", dto.getCallTimeFrom());
             query.setParameter("p_call_time_to", dto.getCallTimeTo());
 
+            if (!DataUtil.isNullOrEmpty(dto.getCampaignId())) {
+                query.setParameterList("p_list_campaign_id", dto.getCampaignId().split(","));
+            }
+            if (!DataUtil.isNullOrEmpty(dto.getPhoneNumber())) {
+                query.setParameter("p_phone_number", "%" + dto.getPhoneNumber()
+                        .replace("\\", "\\\\")
+                        .replaceAll("%", "\\%")
+                        .replaceAll("_", "\\_")
+                        + "%");
+            }
             if (!DataUtil.isNullOrEmpty(dto.getCampaignName())) {
-                query.setParameter("p_campaign_name", dto.getCampaignName().trim());
+                query.setParameter("p_campaign_name", "%" + dto.getCampaignName().toUpperCase()
+                        .replace("\\", "\\\\")
+                        .replaceAll("%", "\\%")
+                        .replaceAll("_", "\\_")
+                        + "%");
             }
             if (!DataUtil.isNullOrEmpty(dto.getAgentId())) {
-                query.setParameter("p_user_name", dto.getAgentId().trim());
+                query.setParameter("p_user_name", "%" + dto.getAgentId().toUpperCase()
+                        .replace("\\", "\\\\")
+                        .replaceAll("%", "\\%")
+                        .replaceAll("_", "\\_")
+                        + "%");
             }
 
             query.addScalar("campaignCode", new StringType());
             query.addScalar("campaignName", new StringType());
             query.addScalar("userName", new StringType());
-            query.addScalar("phoneNumber", new LongType());
+            query.addScalar("phoneNumber", new StringType());
             query.addScalar("customerName", new StringType());
             query.addScalar("createTime", new DateType());
             query.addScalar("contactStatus", new StringType());
             query.addScalar("surveyStatus", new StringType());
             query.addScalar("status", new ShortType());
             query.addScalar("recordStatus", new ShortType());
+            query.addScalar("callTime", new LongType());
 
             query.setResultTransformer(Transformers.aliasToBean(ContactCustResultDTO.class));
 
@@ -226,6 +295,11 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
         }
     }
 
+    @Override
+    public List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto) {
+        return null;
+    }
+
     private boolean isLower24Hour(Date createTime) {
         Date currTime = new Date();
         long diffMilSec = currTime.getTime() - createTime.getTime();

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.web.dto.ContactCustResultDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public interface CampaignExecuteService {
     //<editor-fold: hungtt>
@@ -15,5 +18,7 @@ public interface CampaignExecuteService {
     ResultDTO searchInteractiveResult(CampaignRequestDTO dto);
 
     XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto);
+
+    List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto);
     //</editor-fold>
 }

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

 package com.viettel.campaign.service;
 
-
+import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomerList;
-import com.viettel.campaign.web.dto.CustomerContactDTO;
-import com.viettel.campaign.web.dto.CustomerDTO;
-import com.viettel.campaign.web.dto.CustomerListDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 
+import java.util.Date;
+import java.util.List;
+
+import java.util.List;
+
 public interface CustomerService {
 
     ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
@@ -43,15 +45,20 @@ public interface CustomerService {
 
     ResultDTO getCustomerContact(CustomerContactDTO customer);
 
-
     // danh sach khach hang cua chien dich //
 
-    ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);
+    List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO);
 
 
     // ------------ customer  ------------ //
 
     ResultDTO getCustomerRecall(Long campaignId, Long customerId);
 
+    List<Customer> findAllByCondition(Long siteId, Date endTime);
+
+    Customer update(Customer c);
+
 
 }

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

+package com.viettel.campaign.service;
+
+import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.model.ccms_full.CustomerTime;
+import com.viettel.campaign.repository.ccms_full.CustomerTimeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+
+@Service
+@Transactional
+public class CustomerTimeService {
+
+    @Autowired
+    private CustomerTimeRepository customerTimeRepository;
+
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public CustomerTime update(CustomerTime customerTime){
+        return customerTimeRepository.save(customerTime);
+    }
+
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public List<CustomerTime> findByCustomerId(Long customerId){
+        return customerTimeRepository.findByCustomerId(customerId);
+    }
+}

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

@@ -178,6 +178,12 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         return workbook;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto) {
+        return campaignExecuteRepository.getContactCustById(dto);
+    }
+
     private void writeCellContent(Row row, CellStyle rowStyle, int colNo, Object content) {
         Cell cell = row.createCell(colNo);
         if (content == null) {

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.config.CCMSFullDatasourceConfig;
 import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.mapper.CustomerListMapper;
 import com.viettel.campaign.mapper.CustomerMapper;
@@ -24,15 +25,20 @@ import org.hibernate.type.LongType;
 import org.hibernate.type.ShortType;
 import org.hibernate.type.StringType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.*;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import java.util.Date;
-import java.util.List;
+import javax.sql.DataSource;
+import java.util.*;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -59,6 +65,10 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     CustomerListMappingRepository customerListMappingRepository;
 
+    @Autowired
+    @Qualifier(DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL)
+    NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId) {
@@ -670,20 +680,46 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId) {
-        ResultDTO resultDTO = new ResultDTO();
+    public List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO) {
+        List<CustomerListDTO> customerList;
         try {
             String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-customer-list-info-from-customer-list");
-            Query query = entityManager.createNativeQuery(sql);
-            query.setParameter("p_campaign_id", campaignId);
-            query.setParameter("p_company_site_id", companySiteId);
-            resultDTO.setListData(query.getResultList());
-            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            Map<String, Object> param = new HashMap<>();
+            param.put("p_campaign_id", campaignCustomerDTO.getCampaignId());
+            param.put("p_company_site_id", campaignCustomerDTO.getCompanySiteId());
+            param.put("p_page_number", campaignCustomerDTO.getPage());
+            param.put("p_page_size", campaignCustomerDTO.getPageSize());
+            customerList = namedParameterJdbcTemplate.query(sql, param, new BeanPropertyRowMapper<>(CustomerListDTO.class));
         } catch (Exception e) {
-            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-            resultDTO.setDescription(e.getMessage());
+            return null;
         }
-        return resultDTO;
+        return customerList;
+    }
+
+    @Override
+    public List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO) {
+        List<CustomerDTO> customerList;
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-individual-customer");
+            Map<String, Object> param = new HashMap<>();
+            param.put("p_page_number", campaignCustomerDTO.getPage());
+            param.put("p_page_size", campaignCustomerDTO.getPageSize());
+            customerList = namedParameterJdbcTemplate.query(sql, param, new BeanPropertyRowMapper<>(CustomerDTO.class));
+        } catch (Exception e) {
+            return null;
+        }
+        return customerList;
+    }
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public List<Customer> findAllByCondition(Long siteId, Date endTime) {
+        return customerRepository.findAllByCondition(siteId, endTime);
+    }
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public Customer update(Customer c) {
+        return customerRepository.save(c);
     }
 }

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

@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Getter
 @Setter
-public class CampaignCustomerDTO {
+public class CampaignCustomerDTO extends BaseDTO{
     private Long campaignCustomerListId;
     private Long campaignId;
     private Long customerId;

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

@@ -19,7 +19,7 @@ public class ContactCustResultDTO extends BaseDTO{
     private Short recordStatus;
     private String description;
     private Date createTime;
-    private String callTime;
+    private Long callTime;
     private Long agentId;
     private Long campaignId;
     private String campaignName;

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

@@ -21,4 +21,7 @@ public class CustomerListDTO extends BaseDTO {
     private Date updateAt;
     private String source;
     private String deptCreate;
+    private Long totalCusInList;
+    private Long totalCusInteract;
+    private Long totalCusNotInteract;
 }

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

@@ -41,4 +41,5 @@ public class CampaignRequestDTO extends BaseDTO {
     String campaignId;
     String surveyStatus;
     String roleUser;
+    String contactCustId;
 }

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

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
-import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
-import com.viettel.campaign.repository.ccms_full.TimeRangeDialModeRepository;
-import com.viettel.campaign.repository.ccms_full.TimeZoneDialModeRepository;
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.web.dto.CampaignDTO;
@@ -13,6 +9,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -24,7 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -40,12 +36,6 @@ public class CampaignController {
     @Autowired
     CampaignExecuteService campaignExecuteService;
 
-    @Autowired
-    TimeRangeDialModeRepository timeRangeDialModeRepository;
-
-    @Autowired
-    TimeZoneDialModeRepository timeZoneDialModeRepository;
-
     @PostMapping("/searchCampaignExecute")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
@@ -164,15 +154,4 @@ public class CampaignController {
         headers.setContentType(MediaType.parseMediaType("application/vnd.ms-excel"));
         return new ResponseEntity<byte[]>(contentReturn, headers, HttpStatus.OK);
     }
-
-    @RequestMapping(value = "/findCampaignTimeRangeMode", method = RequestMethod.GET)
-    public List<TimeRangeDialMode> findCampaignTimeRangeMode(@RequestParam Long campaignId, @RequestParam Long companySiteId) {
-        return timeRangeDialModeRepository.findTimeRangeDialModeByCampaignIdAndCompanySiteId(campaignId, companySiteId);
-    }
-
-    @RequestMapping(value = "/findCampaignTimeZoneMode", method = RequestMethod.GET)
-    public List<TimeZoneDialMode> findCampaignTimeZoneMode(@RequestParam Long campaignId, @RequestParam Long companySiteId) {
-        return timeZoneDialModeRepository.findTimeZoneDialModeByCampaignIdAndCompanySiteId(campaignId, companySiteId);
-    }
-
 }

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

@@ -179,7 +179,7 @@ public class CustomerController {
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
-    @GetMapping("/getCustomerRecall")
+    @PostMapping("/getCustomerRecall")
     @ResponseBody
     public ResponseEntity<ResultDTO> getCustomerRecall(@RequestParam("campaignId") Long campaignId, @RequestParam("customerId") Long customerId) {
         ResultDTO result = customerService.getCustomerRecall(campaignId, customerId);

src/main/resources/sql/campaign-execute/get-combo-campaign-type.sql

 select  PAR_VALUE apParamId,
         PAR_NAME parName
 from AP_PARAM
-where PAR_TYPE = 'CAMPAIGN_TYPE' and COMPANY_SITE_ID = :p_company_site_id
+where PAR_TYPE = 'CAMPAIGN_TYPE'
+    and COMPANY_SITE_ID = :p_company_site_id
+    and IS_DELETE = 0

src/main/resources/sql/campaign-execute/get-combo-status.sql

-select  COMPLETE_VALUE apParamId,
+select distinct COMPLETE_VALUE apParamId,
         COMPLETE_NAME parName
 from CAMPAIGN_COMPLETE_CODE
 where to_char(COMPLETE_TYPE) = :p_complete_type and STATUS = 1 and COMPANY_SITE_ID = :p_company_site_id

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

@@ -3,11 +3,12 @@ select  b.campaign_code campaignCode,
         c.user_name userName,
         a.phone_number phoneNumber,
         d.name customerName,
-        a.create_time createTime,
+        to_date(a.start_call, 'DD/MM/YYYY') startCall,
         e.complete_name contactStatus,
         f.complete_name surveyStatus,
         g.status status,
-        a.status recordStatus
+        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

src/main/resources/sql/campaign-mng/search-customer-list-info-from-customer-list.sql

@@ -19,16 +19,26 @@ count(customer_id) ktt
 from campaign_customer where campaign_id = :p_campaign_id and status = 0
 and in_campaign_status = 1
 group by customer_list_id, company_site_id
-)
-select customer_list_code ma,
-customer_list_name ten,
-cl.company_site_id,
-nvl(total, 0) tong,
-nvl(tt, 0) tongtt,
-nvl(ktt, 0) tongktt
+), datas as (
+select customer_list_code customerListCode,
+customer_list_name customerListName,
+nvl(total, 0) totalCusInList,
+nvl(tt, 0) totalCusInteract,
+nvl(ktt, 0) totalCusNotInteract
 from customer_list cl
 left join totalCustomer tc on (cl.customer_list_id = tc.customer_list_id and cl.company_site_id = tc.company_site_id)
 left join customerInteractive ci on (cl.customer_list_id = ci.customer_list_id and cl.company_site_id = ci.company_site_id)
 left join customerNotInteractive cni on (cl.customer_list_id = cni.customer_list_id and cl.company_site_id = cni.company_site_id)
 where cl.company_site_id = :p_company_site_id
-order by customer_list_code
+)
\ No newline at end of file
+select * from
+(
+    select a.*, rownum r__
+    from
+    (
+        select * from datas
+        order by customerListCode
+    ) a
+    where rownum < ((:p_page_number * :p_page_size) + 1 )
+)
+where r__ >= (((:p_page_number-1) * :p_page_size) + 1)
\ No newline at end of file

src/main/resources/sql/campaign-mng/search-individual-customer.sql

+with cusPhone as (
+select customer_id cusId,
+contact phone
+from customer_contact cc
+where cc.contact_type = 5
+and status = 1
+), cusEmail as (
+select customer_id cusId,
+contact email
+from customer_contact cc
+where cc.contact_type = 2
+and status = 1
+), datas as (
+select c.name,
+cP.phone,
+cE.email,
+c.customer_type cusType,
+c.company_name compName,
+c.current_address currentAddress,
+c.description
+from customer c
+left join cusPhone cP on c.customer_id = cP.cusId
+left join cusEmail cE on c.customer_id = cE.cusId
+)
+select * from
+(
+    select a.*, rownum r__
+    from
+    (
+        select * from datas
+        order by datas.name
+    ) a
+    where rownum < ((:p_page_number * :p_page_size) + 1 )
+)
+where r__ >= (((:p_page_number-1) * :p_page_size) + 1)
\ No newline at end of file