Merge remote-tracking branch 'origin/master'

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

src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java

@@ -23,12 +23,12 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     List<CampaignCompleteCode>findByCompleteNameContains(String name, Pageable pageable);
 
     @Modifying
-    @Query("delete from CampaignCompleteCode c where c.campaignCompleteCodeId in (:ids)")
+    @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:ids)")
     int deleteds(@Param("ids") List<Long> ids);
 
-//    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
-//    Short findByMaxCompanySiteId(Long companySiteId);
-    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
+    @Query(value="SELECT max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
+    Short findByMaxCompanySiteId(Long companySiteId);
+//    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
 
 //    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
 }

src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepositoryCustom.java

@@ -7,4 +7,5 @@ public interface CampaignCompleteCodeRepositoryCustom {
     ResultDTO updateStatusById(Long id);
     ResultDTO findMaxValueCampaignType(Long companySiteId);
 
+
 }

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.CampaignCustomer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface CampaignCustomerRepository extends JpaRepository<CampaignCustomer, Long> {
+    @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)
+    Long getCustomerRecall(@Param("campaignId") Long campaignId, @Param("customerId") Long customerId);
+}

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

@@ -19,5 +19,8 @@ public interface CampaignRepository extends JpaRepository<Campaign, Long>, Campa
             " 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/CustomerContactRepository.java

 package com.viettel.campaign.repository;
 
 import com.viettel.campaign.model.CustomerContact;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface CustomerContactRepository extends JpaRepository<CustomerContact, Long> {
-    List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(Long customerId, Short contactType, String contact);
+    @Query("FROM CustomerContact WHERE status = 1 AND customerId = :customerId AND contactType = :contactType AND (contact IS NULL OR UPPER(contact) LIKE UPPER(concat('%', :contact, '%')))")
+    List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(@Param("customerId") Long customerId, @Param("contactType") Short contactType, @Param("contact") String contact, Pageable pageable);
 }

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

@@ -43,12 +43,11 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
     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);
         }
@@ -82,37 +81,69 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             String sql = SQLBuilder.getSqlQueryById(Constants.SQL_MODULES.MODULE_EXECUTE, "get-execute-interactive");
             sqlBuilder.append(sql);
 
+            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_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());
@@ -156,8 +187,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             logger.error(e.getMessage(), e);
         } finally {
             session.close();
+            return resultDTO;
         }
-        return resultDTO;
     }
 
     @Override
@@ -172,37 +203,69 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             String sql = SQLBuilder.getSqlQueryById(Constants.SQL_MODULES.MODULE_EXECUTE, "get-execute-interactive");
             sqlBuilder.append(sql);
 
+            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_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());

src/main/java/com/viettel/campaign/repository/impl/TicketRepositoryImpl.java

@@ -41,7 +41,7 @@ public class TicketRepositoryImpl implements TicketRepositoryCustom {
 
             for (Object[] obj : data) {
                 TicketDTO item = new TicketDTO();
-                item.setTicketId(((Long)obj[0]));
+                item.setTicketId(((BigDecimal) obj[0]).longValueExact());
                 item.setCreateDate((Date) obj[1]);
                 item.setSubject((String) obj[2]);
                 item.setStatusName((String) obj[3]);

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

@@ -13,6 +13,8 @@ public interface CampaignService {
 
     ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO);
 
+    ResultDTO findByCampaignId(Long campaignId);
+
     ResultDTO addNewCampaign(CampaignDTO campaignDTO);
 
     Map countRecallCustomer(Long companySiteId, Long agentId);

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

 package com.viettel.campaign.service;
 
+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;
@@ -41,4 +42,11 @@ public interface CustomerService {
     // danh sach khach hang cua chien dich //
 
     ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);
+    ResultDTO getCustomerContact(CustomerContactDTO customer);
+
+    // ------------ customer  ------------ //
+
+    ResultDTO getCustomerRecall(Long campaignId, Long customerId);
+
+
 }

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

@@ -2,20 +2,28 @@ package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.service.CampaignCompleteCodeService;
 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.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
 import com.viettel.campaign.model.CampaignCompleteCode;
 import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.transform.Transformers;
+import org.hibernate.type.LongType;
+import org.hibernate.type.ShortType;
+import org.hibernate.type.StringType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -166,51 +174,83 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         return result;
     }
 
+//    @Override
+//    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
+//        ResultDTO resultDTO = new ResultDTO();
+//        CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
+//        try {
+//            short maxValue = 0;
+////            List<CampaignCompleteCode> list = completeCodeRepository.findCampaignCompleteCodesByCompanySiteId(completeCodeDTO.getCompanySiteId());
+////            for (int i = 0; i<list.size();i++) {
+////                if (list.get(i).getCompleteValue() != null && !list.get(i).getCompleteValue().equals("")) {
+////                    if (maxValue < Short.parseShort(list.get(i).getCompleteValue())) {
+////                        maxValue = Short.parseShort(list.get(i).getCompleteValue());
+////                    }
+////                }
+////            }
+//            maxValue = completeCodeRepository.findByMaxCompanySiteId(completeCodeDTO.getCompanySiteId());
+//            if (maxValue < 4) {
+//                maxValue = 4;
+//            }
+//            maxValue+= 1;
+//            resultDTO.setData(maxValue);
+//            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+//            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+//        } catch (Exception e) {
+//            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+//            resultDTO.setDescription(e.getMessage());
+//            logger.error(e.getMessage(), e);
+//        }
+//        return resultDTO;
+//    }
+
     @Override
     public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        if (DataUtil.isNullOrZero(completeCodeDTO.getCompanySiteId())) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
+        }
+
         try {
-            short maxValue = 0;
-            List<CampaignCompleteCode> list = completeCodeRepository.findCampaignCompleteCodesByCompanySiteId(completeCodeDTO.getCompanySiteId());
-            for (int i = 0; i<list.size();i++) {
-                if (list.get(i).getCompleteValue() != null && !list.get(i).getCompleteValue().equals("")) {
-                    if (maxValue < Short.parseShort(list.get(i).getCompleteValue())) {
-                        maxValue = Short.parseShort(list.get(i).getCompleteValue());
-                    }
+            StringBuilder sqlStrBuilder = new StringBuilder();
+            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "get-max-value-completevalue"));
+
+            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+            query.setParameter("p_site_id", completeCodeDTO.getCompanySiteId());
+
+            query.addScalar("completeValue", new StringType());
+            query.addScalar("companySiteId", new LongType());
+            query.setResultTransformer(Transformers.aliasToBean(CampaignCompleteCodeDTO.class));
+
+            List<CampaignCompleteCodeDTO> data = query.list();
+            if (data != null && data.size() > 0) {
+                int tmp = 4;
+                String completeValue = data.get(0).getCompleteValue();
+                if (completeValue != null && !completeValue.trim().equals("")) {
+                    tmp = Integer.parseInt(completeValue) + 1;
                 }
+                resultDTO.setData(tmp);
+            } else {
+                resultDTO.setData(null);
             }
-            maxValue+= 1;
-            resultDTO.setData(maxValue);
+
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
         } catch (Exception e) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-            resultDTO.setDescription(e.getMessage());
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            logger.error(e.getMessage(), e);
+        } finally {
+            session.close();
+            return resultDTO;
         }
-        return resultDTO;
     }
 
-//    @Override
-//    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
-//        ResultDTO result = new ResultDTO();
-//        CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
-//        CampaignCompleteCode campaignCompleteCode = new CampaignCompleteCode();
-//        try{
-//            short resultmaxValue = completeCodeRepository.findByMaxCompanySiteId(completeCodeDTO.getCompanySiteId());
-//            campaignCompleteCode.setCompleteValue(String.valueOf(resultmaxValue + 1));
-////            if (resultmaxValue < 4) {
-////                resultmaxValue =4;
-////            }
-//            result.setData(resultmaxValue);
-//            result.setErrorCode(Constants.Status.ACTIVE_STR);
-//            result.setDescription(Constants.Status.ACTIVE_STR);
-//        }
-//        catch (Exception e){
-//            logger.error(e.getMessage(), e);
-//            result.setErrorCode("-1");
-//            return result;
-//        }
-//        result.setErrorCode("0");
-//        return result;
-//    }
 }

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

@@ -16,7 +16,6 @@ import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,6 +58,23 @@ public class CampaignServiceImpl implements CampaignService {
         return campaignRepository.findByCampaignCode(requestDTO);
     }
 
+    @Override
+    public ResultDTO findByCampaignId(Long campaignId) {
+        ResultDTO result = new ResultDTO();
+        Campaign campaign = campaignRepository.findByCampaignId(campaignId);
+
+        if (campaign != null) {
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setErrorCode(Constants.ApiErrorDesc.SUCCESS);
+            result.setData(campaign);
+        } else {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setErrorCode(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return result;
+    }
+
     @Override
     public ResultDTO addNewCampaign(CampaignDTO campaignDTO) {
         logger.info("=== Start add new  campaign ");
@@ -75,7 +91,8 @@ public class CampaignServiceImpl implements CampaignService {
             Campaign campaignResult = campaignRepository.save(campaign);
             campaignId = campaign.getCampaignId();
             //insert sub tables
-            if(campaignDTO.getLstTimeRange().size() > 0) {
+
+            if (campaignDTO.getLstTimeRange().size() > 0) {
                 timeRangeDialModes = campaignDTO.getLstTimeRange();
                 timeRangeDialModes.forEach(item -> {
                     item.setCampaignId(campaignId);
@@ -84,7 +101,7 @@ public class CampaignServiceImpl implements CampaignService {
                 });
                 timeRangeDialModeRepository.saveAll(lstTimeRangeModeToInsert);
             }
-            if(campaignDTO.getLstTimeZone().size() > 0) {
+            if (campaignDTO.getLstTimeZone().size() > 0) {
                 timeZoneDialModes = campaignDTO.getLstTimeZone();
                 timeZoneDialModes.forEach(item -> {
                     item.setCampaignId(campaignId);
@@ -160,16 +177,13 @@ public class CampaignServiceImpl implements CampaignService {
                 userActionLog.setStartTime(new Date());
                 userActionLog.setEndTime(null);
                 userActionLog.setObjectId(entity.getCampaignId());
-                if(dto.getStatus().equals((short) -1)) {
+                if (dto.getStatus().equals((short) -1)) {
                     userActionLog.setActionType((short) 2);
-                }
-                else if(dto.getStatus().equals((short) 5)) {
+                } else if (dto.getStatus().equals((short) 5)) {
                     userActionLog.setActionType((short) 7);
-                }
-                else if(dto.getStatus().equals((short) 4)) {
+                } else if (dto.getStatus().equals((short) 4)) {
                     userActionLog.setActionType((short) 4);
-                }
-                else if(dto.getStatus().equals((short) 3)) {
+                } else if (dto.getStatus().equals((short) 3)) {
                     userActionLog.setActionType((short) 5);
                 }
 
@@ -192,7 +206,7 @@ public class CampaignServiceImpl implements CampaignService {
     private String generateCampaignCode(String campaignType, Short chanel) {
         int year = Calendar.getInstance().get(Calendar.YEAR);
         String maxIndexStr = campaignRepository.getMaxCampaignIndex();
-        if(maxIndexStr != null) {
+        if (maxIndexStr != null) {
             Long maxIndex = Long.valueOf(maxIndexStr) + 1;
             String result = campaignType + "_" + String.valueOf(chanel) + "_" + String.valueOf(year) + "_" + maxIndex.toString();
             return result;

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.mapper.CustomerListMapper;
+import com.viettel.campaign.mapper.CustomerMapper;
+import com.viettel.campaign.model.Customer;
 import com.viettel.campaign.model.CustomerContact;
 import com.viettel.campaign.model.CustomerList;
 import com.viettel.campaign.repository.*;
 import com.viettel.campaign.service.CustomerService;
 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.CustomerCustomDTO;
-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.mapper.CustomerMapper;
-import com.viettel.campaign.model.Customer;
-import com.viettel.campaign.utils.DataUtil;
-import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+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 org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -32,7 +29,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -52,6 +50,9 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     CampaignCustomerListRepository campaignCustomerListRepository;
 
+    @Autowired
+    CampaignCustomerRepository campaignCustomerRepository;
+
     @Autowired
     CustomerListMappingRepository customerListMappingRepository;
 
@@ -571,20 +572,47 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
-    public ResultDTO getCustomerContact(Long customerId, Short contactType, String contact) {
+    public ResultDTO getCustomerContact(CustomerContactDTO customer) {
         ResultDTO result = new ResultDTO();
 
-        List<CustomerContact> customer = customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customerId, contactType, contact);
+        try {
+            List<CustomerContact> data = customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customer.getCustomerId(), customer.getContactType(), customer.getContact(), SQLBuilder.buildPageable(customer));
 
-        if (customer != null) {
-            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            result.setDescription("customer contact data");
-            result.setListData(customer);
-        } else {
-            result.setErrorCode(Constants.ApiErrorCode.ERROR);
-            result.setDescription("customer contact data null");
+            if (customer != null) {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription("customer contact data");
+                result.setListData(data);
+                result.setTotalRow(customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customer.getCustomerId(), customer.getContactType(), customer.getContact(), null).size());
+
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.ERROR);
+                result.setDescription("customer contact data null");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+        return result;
+    }
 
+    @Override
+    public ResultDTO getCustomerRecall(Long campaignId, Long customerId) {
+        ResultDTO result = new ResultDTO();
+
+        try {
+            Long data = campaignCustomerRepository.getCustomerRecall(campaignId, customerId);
+
+            if (data != null) {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription("campaign customer data");
+                result.setData(data);
+
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.ERROR);
+                result.setDescription("campaign customer data null");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return result;
     }
 

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

@@ -23,7 +23,7 @@ public class ContactCustResultDTO extends BaseDTO{
     private Long agentId;
     private Long campaignId;
     private String campaignName;
-    private Long phoneNumber;
+    private String phoneNumber;
     private String customerName;
     private Long customerId;
     private String contactStatus;

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

@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Getter
 @Setter
-public class CustomerContactDTO {
+public class CustomerContactDTO extends BaseDTO {
     private Long contactId;
     private Long customerId;
     private Short contactType;

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

@@ -63,6 +63,7 @@ public class CampaignCompleteCodeController {
         ResultDTO result = new ResultDTO();
         try {
             result = completeCodeService.updateCompleteCode(completeCodeDTO);
+
         } catch (Exception e) {
             result.setErrorCode("-1");
             LOGGER.error(e);
@@ -96,7 +97,7 @@ public class CampaignCompleteCodeController {
     @PostMapping("/getMaxValue")
     @ResponseBody
     public ResultDTO findMaxValueCampaignType(@RequestBody CampaignCompleteCodeDTO completeCodeDTO){
-        return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
+         return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
     }
 
 

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

@@ -9,7 +9,11 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+<<<<<<< HEAD
+import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
+=======
 import org.springframework.http.HttpHeaders;
+>>>>>>> 55a6b806b604aa92fca10c101776df185d0d67af
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -33,10 +37,14 @@ public class CampaignController {
     @Autowired
     CampaignService campaignService;
 
+<<<<<<< HEAD
+    @PostMapping("/searchCampaignExecute")
+=======
     @Autowired
     CampaignExecuteService campaignExecuteService;
 
     @RequestMapping("/searchCampaignExecute")
+>>>>>>> 55a6b806b604aa92fca10c101776df185d0d67af
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
         ResultDTO result = campaignService.searchCampaignExecute(requestDto);
@@ -66,6 +74,14 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+<<<<<<< HEAD
+    @GetMapping("/findByCampaignId")
+    @ResponseBody
+    public ResponseEntity findByCampaignId(@RequestParam("campaignId") Long campaignId) {
+        ResultDTO result = campaignService.findByCampaignId(campaignId);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+=======
     @PostMapping("/searchInteractiveResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) throws Exception {
@@ -110,4 +126,5 @@ public class CampaignController {
         dto.setSessionId(request.getSession().getId());
         return campaignService.changeCampaignStatus(dto);
     }
+>>>>>>> 55a6b806b604aa92fca10c101776df185d0d67af
 }

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

 package com.viettel.campaign.web.rest.controller;
 
+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;
@@ -164,10 +165,17 @@ public class CustomerController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @GetMapping("/findCustomerContact")
+    @PostMapping("/findCustomerContact")
     @ResponseBody
-    public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestParam("customerId") Long customerId, @RequestParam("contactType") Short contactType, @RequestParam("contact") String contact) {
-        ResultDTO result = customerService.getCustomerContact(customerId, contactType, contact);
+    public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestBody CustomerContactDTO customerContactDTO) {
+        ResultDTO result = customerService.getCustomerContact(customerContactDTO);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
+
+    @GetMapping("/getCustomerRecall")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getCustomerRecall(@RequestParam("campaignId") Long campaignId, @RequestParam("customerId") Long customerId) {
+        ResultDTO result = customerService.getCustomerRecall(campaignId, customerId);
         return new ResponseEntity(result, HttpStatus.OK);
     }
 

src/main/resources/i18n/language_en.properties

 #Common
-detail = Chi ti?t
-stt = STT
+detail = Detail
+stt = No
 #Campaign Execute Interactive
-campaign.execute.interactive.title = Chi ti?t k?t qu? t??ng tc
-campaign.execute.interactive.campaignCode = M chi?n d?ch
-campaign.execute.interactive.campaignName = Tn chi?n d?ch
-campaign.execute.interactive.agentId = M t? v?n vin
-campaign.execute.interactive.phoneNumber = S? ?i?n tho?i
-campaign.execute.interactive.customerId = M khch hng
-campaign.execute.interactive.customerName = Tn khch hng
-campaign.execute.interactive.callTime = Th?i gian lin l?c
-campaign.execute.interactive.contactStatus = Tr?ng thi k?t n?i
-campaign.execute.interactive.surveyStatus = Tr?ng thi kh?o st
-campaign.execute.interactive.status = Tr?ng thi chi?n d?ch
-campaign.execute.interactive.recordStatus = Tr?ng thi b?n ghi
+campaign.execute.interactive.title = Chi tiết kết quả tương tác
+campaign.execute.interactive.campaignCode = Campaign code
+campaign.execute.interactive.campaignName = Campaign name
+campaign.execute.interactive.agentId = Agent id
+campaign.execute.interactive.phoneNumber = Phone number
+campaign.execute.interactive.customerId = Customer id
+campaign.execute.interactive.customerName = Customer name
+campaign.execute.interactive.createTime = Create time
+campaign.execute.interactive.contactStatus = Contact status
+campaign.execute.interactive.surveyStatus = Trạng thái khảo sát
+campaign.execute.interactive.status = Trạng thái chiến dịch
+campaign.execute.interactive.recordStatus = Trạng thái bản ghi

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

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

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

@@ -14,15 +14,10 @@ from contact_cust_result a
     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 = b.campaign_id
+    left join campaign g on a.campaign_id = g.campaign_id
 where a.status <> 0
-    and a.campaign_id in (:p_list_campaign_id)
-    and a.customer_id like '%'||:p_customer_id||'%'
+    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.contact_status in (:p_list_contact_status)
-    and a.call_status in (:p_list_survey_status)
-    and a.status in (:p_list_record_status)
-    and a.phone_number like '%'||:p_phone_number||'%'
     and a.duration_call >= :p_call_time_from
     and a.duration_call <= :p_call_time_to

src/main/resources/sql/campaign-status-mng/get-max-value-completevalue.sql

+SELECT max(COMPLETE_VALUE) completeValue, COMPANY_SITE_ID companySiteId from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = :p_site_id GROUP BY COMPANY_SITE_ID

src/main/resources/sql/campaign-status-mng/search-campaign-status-by-params.sql

@@ -12,7 +12,8 @@ SELECT
 FROM CAMPAIGN_COMPLETE_CODE a
 LEFT JOIN CAMPAIGN b ON a.CAMPAIGN_ID = b.CAMPAIGN_ID
 LEFT JOIN AP_PARAM c ON a.CAMPAIGN_TYPE = to_char(c.AP_PARAM_ID);
-SELECT max(COMPLETE_VALUE) ,COMPANY_SITE_ID from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = : p_site_id GROUP BY COMPANY_SITE_ID
+
+