Merge remote-tracking branch 'origin/master'

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

@@ -123,7 +123,7 @@ public class CampaignJob {
             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.setStatus((short) 2);
                 customerTime.setUpdateTime(new Date());
                 customerTimeService.update(customerTime);
             });

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

+package com.viettel.campaign.model.ccms_full;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name = "AGENT_STATUS_STAT")
+@Getter
+@Setter
+public class AgentStatusStat {
+    @Id
+    @NotNull
+    @GeneratedValue(generator = "AGENT_STATUS_STAT_SEQ")
+    @SequenceGenerator(name = "AGENT_STATUS_STAT_SEQ", sequenceName = "AGENT_STATUS_STAT_SEQ", allocationSize = 1)
+    @Basic(optional = false)
+    @Column(name = "KZ_ACCOUNT_ID")
+    @NotNull
+    private String kzAccountId;
+    @Column(name = "KZ_USER_ID")
+    @NotNull
+    private String kzUserId;
+    @Column(name = "CURRENT_STATUS")
+    @NotNull
+    private String currentStatus;
+    @Column(name = "TIMESTAMP")
+    @NotNull
+    private String timestamp;
+    @Column(name = "PREVIOUS_STATUS")
+    private String previousStatus;
+    @Column(name = "PREVIOUS_STATUS_DURATION")
+    private Long previousStatusDuration;
+    @Column(name = "ID")
+    @NotNull
+    private Long id;
+    @Column(name = "CHANNEL")
+    @NotNull
+    private String channel;
+}

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

@@ -19,15 +19,18 @@ import java.util.Date;
 public class CustomerTime {
 
     @Id
+    @GeneratedValue(generator = "CUSTOMER_TIME_SEQ")
+    @SequenceGenerator(name = "CUSTOMER_TIME_SEQ", sequenceName = "CUSTOMER_TIME_SEQ", allocationSize = 1)
+    @Basic(optional = false)
     @NotNull
     @Column(name = "CUSTOMER_TIME_ID")
     private Long customerTimeId;
 
     @Column(name = "COMPANY_SITE_ID")
-    private String companySiteId;
+    private Long companySiteId;
 
     @Column(name = "CUSTOMER_ID")
-    private String customerId;
+    private Long customerId;
 
     @Column(name = "START_TIME")
     private Date startTime;
@@ -36,7 +39,7 @@ public class CustomerTime {
     private Date endTime;
 
     @Column(name = "STATUS")
-    private Integer status;
+    private Short status;
 
     @Column(name = "CREATE_TIME")
     private Date createTime;
@@ -45,10 +48,10 @@ public class CustomerTime {
     private Date updateTime;
 
     @Column(name = "CREATE_BY")
-    private String createBy;
+    private Long createBy;
 
     @Column(name = "UPDATE_BY")
-    private String updateBy;
+    private Long updateBy;
 
     @Column(name = "CONTACT_CUST_RESULT_ID")
     private Long contactCustResultId;

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.model.ccms_full.AgentStatusStat;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Repository
+@Transactional(DataSourceQualify.CCMS_FULL)
+public interface AgentStatusStatRepository extends JpaRepository<AgentStatusStat, Long> {
+
+    AgentStatusStat findByKzUserIdAndCurrentStatusNotIn(String kzUserId, List<String> currentStatus);
+
+}

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

@@ -18,7 +18,9 @@ public interface CampaignAgentRepository extends JpaRepository<CampaignAgent, Lo
     @Query(value = "SELECT campaign_agent_seq.nextval FROM DUAL", nativeQuery = true)
     Long getNextSeqId();
 
-    List<CampaignAgent> findByCampaignIdAndAgentId(Long campaignId, Long agentId);
+    CampaignAgent findByCampaignIdAndAgentId(Long campaignId, Long agentId);
+
+    List<CampaignAgent> findByAgentId(Long agentId);
 
     @Modifying
     @Query("delete from CampaignAgent c where c.campaignAgentId in (:p_campaign_agent_id)")

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

@@ -13,6 +13,8 @@ import java.util.List;
 
 @Repository
 public interface CampaignCfgRepository extends JpaRepository<CampaignCfg, Long> {
+    @Query("select c from CampaignCfg c where c.campaignCompleteCodeId in (:p_ids) and c.companySiteId=:p_company_site_id and c.status = 1")
+    List<CampaignCfg> findAllCampaignCfg(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 
     @Query("FROM CampaignCfg u WHERE u.status = 1 AND u.completeValue NOT IN (1,2,3,4)")
     Page<CampaignCfg> findAll(Pageable pageable);
@@ -46,4 +48,7 @@ public interface CampaignCfgRepository extends JpaRepository<CampaignCfg, Long>
 
     @Query("select c from CampaignCfg c where c.companySiteId =:p_company_site_id")
     List<CampaignCfg> findAllCampaignCompleteCode();
+
+    @Query(value = "FROM CampaignCfg WHERE status = 1 AND completeValue = :completeValue AND companySiteId = :companySiteId")
+    CampaignCfg findByCompanySiteIdAndCompleteValue(@Param("companySiteId") Long companySiteId, @Param("completeValue") String completeValue);
 }

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

@@ -14,6 +14,14 @@ import java.util.List;
 @Transactional(DataSourceQualify.CCMS_FULL)
 public interface CampaignCustomerRepository extends JpaRepository<CampaignCustomer, Long>, CampaignCustomerRepositoryCustom {
 
+    CampaignCustomer findCampaignCustomerByCampaignCustomerId(Long id);
+
+    CampaignCustomer findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(Long campaignId, Long companySiteId, Long customerId);
+
+    List<CampaignCustomer> findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(Long campaignId, Long companySiteId, Long customerId, Short inCampaingStatus);
+
+    CampaignCustomer findCampaignCustomersByCampaignIdAndCustomerId(Long campaignId, Long customerId);
+
     @Query(value = "SELECT COUNT(*) " +
             " FROM CAMPAIGN_CUSTOMER CC " +
             " JOIN CAMPAIGN C ON CC.CAMPAIGN_ID = C.CAMPAIGN_ID " +
@@ -34,10 +42,6 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
             "AND CCC.STATUS = 1 ", nativeQuery = true)
     Long getCustomerRecall(@Param("campaignId") Long campaignId, @Param("customerId") Long customerId);
 
-    CampaignCustomer findCampaignCustomerByCampaignCustomerId(Long id);
-
-
-
     @Query(value = "select C.NAME, " +
             "C.EMAIL, " +
             "C.PLACE_OF_BIRTH, " +
@@ -57,10 +61,6 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
             , nativeQuery = true)
     Long searchCustomer(@Param("site_id") Long pSiteId);
 
-
-
-
-
     @Query(value = "SELECT * FROM CAMPAIGN_CUSTOMER CC " +
             "WHERE CC.STATUS = 0 " +
             "AND CC.CAMPAIGN_ID = :campaignId " +
@@ -69,7 +69,7 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
     List<CampaignCustomer> findCustomerNoContact(@Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId, @Param("customerListId") Long customerListId);
 
     @Query(value = "SELECT * FROM CAMPAIGN_CUSTOMER CC " +
-            "WHERE CC.STATUS IN (SELECT COMPLETE_VALUE from CAMPAIGN_COMPLETE_CODE where STATUS = 1 and IS_FINISH = 0 and IS_RECALL = 0)" +
+            "WHERE CC.STATUS IN (SELECT COMPLETE_VALUE from CAMPAIGN_COMPLETE_CODE where STATUS = 1 and COMPLETE_TYPE=1)" +
             "AND CC.CAMPAIGN_ID = :campaignId " +
             "AND CC.COMPANY_SITE_ID = :companySiteId " +
             "AND CC.CUSTOMER_LIST_ID = :customerListId", nativeQuery = true)
@@ -78,9 +78,8 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
     @Query(value = "with status_customer as (\n" +
             "select complete_value \n" +
             "from campaign_complete_code\n" +
-            "where complete_value <> 4\n" +
-            "    and is_finish <> 1\n" +
-            "    and campaign_type = 1\n" +
+            "where status = 1\n" +
+            "    and complete_type = 1\n" +
             "    and company_site_id = :p_company_site_id\n" +
             ")\n" +
             "select * from campaign_customer\n" +
@@ -89,10 +88,6 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
             "    and (status = 0 or status in (select * from status_customer))", nativeQuery = true)
     List<CampaignCustomer> findListCustomerToDel(@Param("p_company_site_id") Long companySiteId, @Param("p_campaign_id") Long campaignId, @Param("p_cus_list_id") Long customerListId);
 
-    CampaignCustomer findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(Long campaignId, Long companySiteId, Long customerId);
-
-    List<CampaignCustomer> findCampaignCustomersByCampaignIdAndCompanySiteIdAndCustomerIdAndInCampaignStatus(Long campaignId, Long companySiteId, Long customerId, Short inCampaingStatus);
-
-    @Query(value = "select complete_value from campaign_complete_code where status = 1 and is_finish = 0 and is_recall = 0", nativeQuery = true)
+    @Query(value = "select complete_value from campaign_complete_code where status = 1 and complete_type = 1", nativeQuery = true)
     List<Short> getStatus();
 }

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

@@ -21,4 +21,5 @@ public interface CampaignExecuteRepository {
     List<ContactCustResultDTO> getInteractiveResult(CampaignRequestDTO dto, Pageable pageable);
 
     List<ContactCustResultDTO> getExcelInteractiveResult(CampaignRequestDTO dto);
+
 }

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

@@ -37,6 +37,8 @@ public interface CampaignRepositoryCustom {
 
     ResultDTO getCustomerListInformation(CampaignRequestDTO dto);
 
+    ResultDTO getCountIndividualOnList(CampaignRequestDTO dto);
+
     List<ApParamDTO> getConnectStatus(Long companySiteId);
     //</editor-fold>
 }

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

@@ -2,8 +2,15 @@ package com.viettel.campaign.repository.ccms_full;
 
 import com.viettel.campaign.model.ccms_full.ContactCustResult;
 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 java.sql.Date;
+
 @Repository
 public interface ContactCustResultRepository extends JpaRepository<ContactCustResult, Long> {
+
+    @Query(value = "SELECT MAX(createTime) FROM ContactCustResult WHERE campaignId = :campaignId AND agentId = :agentId AND status = 1")
+    Date getMaxCreateTime(@Param("campaignId") Long campaignId, @Param("agentId") Long agentId);
 }

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

@@ -12,5 +12,10 @@ import java.util.List;
 @Repository
 @Transactional(DataSourceQualify.CCMS_FULL)
 public interface ContactQuestResultRepository extends JpaRepository<ContactQuestResult, Long> {
+
     List<ContactQuestResultDTO> findByCompanySiteIdAndCampaignId(Long companySiteId, Long campaignId);
+
+    List<ContactQuestResult> findByContactCustResultId(Long contactCustResultId);
+
+    List<ContactQuestResult> findByCompanySiteIdAndCampaignIdAndCustomerId(Long companySiteId, Long campaignId, Long customerId);
 }

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

@@ -11,6 +11,8 @@ import java.util.List;
 public interface CustomerListMappingRepository extends JpaRepository<CustomerListMapping, Long> {
 
     // ----------- customer ------------ //
+    @Query("select c from CustomerListMapping c where c.customerId in (:p_ids) and c.customerListId =:p_customer_list_id and c.companySiteId=:p_company_site_id")
+    List<CustomerListMapping> findAllCustomerListMapping(@Param("p_ids") List<Long> p_ids, @Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
 
     @Modifying
     @Query("delete from CustomerListMapping c where c.customerId=:p_customer_id and c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")

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

@@ -21,13 +21,13 @@ public interface TimeRangeDialModeRepository extends JpaRepository<TimeRangeDial
     List<TimeRangeDialMode> findTimeRangeDialModeByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 
     @Query(value = "SELECT * " +
-            "FROM (SELECT Z.* " +
-            "      FROM TIME_ZONE_DIAL_MODE Z INNER JOIN CAMPAIGN C ON Z.CAMPAIGN_ID = C.CAMPAIGN_ID " +
-            "      WHERE Z.COMPANY_SITE_ID = :companySiteId " +
-            "        AND Z.CAMPAIGN_ID = :campaignId " +
-            "        AND TO_DATE(START_TIME, 'YYYY/MM/DD') <= TO_DATE(SYSDATE, 'YYYY/MM/DD') " +
-            "        AND TO_DATE((to_char(SYSDATE, 'YYYY/MM/DD') || ' ' || Z.HOUR || ':' || Z.MINUTE || ':00'), 'YYYY/MM/DD HH24:MI:SS') <= SYSDATE " +
-            "      ORDER BY TO_DATE((to_char(SYSDATE, 'YYYY/MM/DD') || ' ' || Z.HOUR || ':' || Z.MINUTE || ':00'), 'YYYY/MM/DD HH24:MI:SS') DESC " +
+            "FROM (SELECT R.* " +
+            "      FROM TIME_RANGE_DIAL_MODE R INNER JOIN CAMPAIGN C ON R.CAMPAIGN_ID = C.CAMPAIGN_ID" +
+            "      WHERE R.COMPANY_SITE_ID = :companySiteId " +
+            "        AND R.CAMPAIGN_ID = :campaignId " +
+            "        AND C.START_TIME <= SYSDATE " +
+            "        AND R.START_TIME <= SYSDATE " +
+            "      ORDER BY R.START_TIME DESC " +
             "     ) WHERE ROWNUM = 1", nativeQuery = true)
     TimeRangeDialMode findDialModeAtCurrent(@Param("companySiteId") Long companySiteId, @Param("campaignId") Long campaignId);
 

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

@@ -21,14 +21,15 @@ public interface TimeZoneDialModeRepository extends JpaRepository<TimeZoneDialMo
     List<TimeZoneDialMode> findTimeZoneDialModeByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 
     @Query(value = "SELECT * " +
-            "FROM (SELECT R.* " +
-            "      FROM TIME_RANGE_DIAL_MODE R " +
-            "      WHERE R.CAMPAIGN_ID = 11 " +
-            "        AND R.COMPANY_SITE_ID = 662691 " +
-            "        AND TO_DATE(R.START_TIME, 'YYYY/MM/DD HH24:MI:SS') <= TO_DATE(SYSDATE, 'YYYY/MM/DD HH24:MI:SS') " +
-            "      ORDER BY R.START_TIME DESC " +
+            "FROM (SELECT Z.* " +
+            "      FROM TIME_ZONE_DIAL_MODE Z INNER JOIN CAMPAIGN C ON Z.CAMPAIGN_ID = C.CAMPAIGN_ID " +
+            "      WHERE Z.COMPANY_SITE_ID = :companySiteId " +
+            "        AND Z.CAMPAIGN_ID = :campaignId " +
+            "        AND TO_CHAR(C.START_TIME, 'YYYY/MM/DD') <= TO_CHAR(SYSDATE, 'YYYY/MM/DD') " +
+            "        AND TO_DATE((TO_CHAR(SYSDATE, 'YYYY/MM/DD') || ' ' || Z.HOUR || ':' || Z.MINUTE || ':00'), 'YYYY/MM/DD HH24:MI:SS') <= SYSDATE " +
+            "      ORDER BY TO_DATE((TO_CHAR(SYSDATE, 'YYYY/MM/DD') || ' ' || Z.HOUR || ':' || Z.MINUTE || ':00'), 'YYYY/MM/DD HH24:MI:SS') DESC " +
             "     ) WHERE ROWNUM = 1", nativeQuery = true)
-    TimeZoneDialMode findDialModeAtCurrent(@Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId);
+    TimeZoneDialMode findDialModeAtCurrent(@Param("companySiteId") Long companySiteId, @Param("campaignId") Long campaignId);
 
     void deleteAllByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 }

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

@@ -6,5 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.List;
 
 public interface VSAUsersRepository extends JpaRepository<VSAUsers, Long> {
+
     List<VSAUsers> findAllByCompanySiteId(Long companySiteId);
+
+    VSAUsers findByUserId(Long userId);
 }

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

@@ -2,15 +2,13 @@ package com.viettel.campaign.repository.ccms_full.impl;
 
 import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.repository.ccms_full.CampaignExecuteRepository;
+import com.viettel.campaign.repository.ccms_full.ContactQuestResultRepository;
 import com.viettel.campaign.repository.ccms_full.TimeRangeDialModeRepository;
 import com.viettel.campaign.repository.ccms_full.TimeZoneDialModeRepository;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.HibernateUtil;
-import com.viettel.campaign.web.dto.ApParamDTO;
-import com.viettel.campaign.web.dto.CampaignDTO;
-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.hibernate.SQLQuery;
 import org.hibernate.Session;
@@ -57,6 +55,9 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
     @Autowired
     TimeRangeDialModeRepository rangeDialModeRepository;
 
+    @Autowired
+    ContactQuestResultRepository contactQuestResultRepository;
+
     @Override
     public List<ApParamDTO> getComboBoxStatus(String companySiteId, String completeType) {
         List<ApParamDTO> list = new ArrayList<>();
@@ -122,7 +123,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             sql.append("    CCR.PHONE_NUMBER                AS phoneNumber, ");
             sql.append("    CUS.NAME                        AS customerName, ");
             sql.append("    CCR.START_CALL                  AS startCall, ");
-            sql.append("    CC1.COMPLETE_NAME               AS contactStatus, ");
+            sql.append("    CC1.COMPLETE_NAME               AS connectStatus, ");
             sql.append("    CC2.COMPLETE_NAME               AS surveyStatus, ");
             sql.append("    C.STATUS                        AS status, ");
             sql.append("    CCR.STATUS                      AS recordStatus, ");
@@ -290,7 +291,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 item.setPhoneNumber((String) obj[5]);
                 item.setCustomerName((String) obj[6]);
                 item.setStartCall(obj[7] == null ? null : (Date) obj[7]);
-                item.setContactStatus((String) obj[8]);
+                item.setConnectStatus((String) obj[8]);
                 item.setSurveyStatus((String) obj[9]);
                 item.setStatus(obj[10] == null ? 0 : ((BigDecimal) obj[10]).shortValueExact());
                 item.setRecordStatus(obj[11] == null ? 0 : ((BigDecimal) obj[11]).shortValueExact());
@@ -459,6 +460,9 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public List<CampaignDTO> searchCampaignExecute(CampaignRequestDTO campaignRequestDto, Pageable pageable) {
         List<CampaignDTO> result = new ArrayList<>();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+        Session session = null;
+
         StringBuilder expression = new StringBuilder()
                 .append(" SELECT C.CAMPAIGN_CODE, C.CAMPAIGN_NAME, C.CONTENT, C.START_TIME, C.END_TIME, C.STATUS, CA.STATUS AS AGENT_STATUS, C.CAMPAIGN_ID ")
                 .append(" FROM CAMPAIGN C INNER JOIN CAMPAIGN_AGENT CA ON C.CAMPAIGN_ID = CA.CAMPAIGN_ID ")
@@ -505,12 +509,15 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
         }
 
         try {
-            Query query = entityManager.createNativeQuery(expression.toString());
+            session = sessionFactory.openSession();
+            session.beginTransaction();
+
+            SQLQuery query = session.createSQLQuery(expression.toString());
             query.setParameter("pAgentId", Long.parseLong(campaignRequestDto.getAgentId()));
 
-            if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode())) {
+            if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode()) && !DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode().trim())) {
                 String[] lstCode = campaignRequestDto.getCampaignCode().split(",");
-                query.setParameter("pCampaignCode", lstCode);
+                query.setParameterList("pCampaignCode", lstCode);
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignName())) {
@@ -556,9 +563,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setMaxResults(pageable.getPageSize());
             }
 
-            List<Object[]> data = query.getResultList();
-            //TimeZoneDialMode zoneDialMode = zoneDialModeRepository.findDialModeAtCurrent(Long.parseLong(campaignRequestDto.getCampaignId()), Long.parseLong(campaignRequestDto.getCompanySiteId()));
-            //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(campaignRequestDto.getCampaignId()), Long.parseLong(campaignRequestDto.getCompanySiteId()));
+            List<Object[]> data = query.list();
 
             for (Object[] obj : data) {
                 CampaignDTO item = new CampaignDTO();
@@ -579,7 +584,11 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
 
             return result;
         } catch (Exception e) {
-            // e.printStackTrace();
+            e.printStackTrace();
+        } finally {
+            if (null != session) {
+                session.close();
+            }
         }
 
         return result;

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

@@ -4,10 +4,7 @@ import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import com.viettel.campaign.repository.ccms_full.CampaignCustomerRepository;
 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.utils.*;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
@@ -29,10 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
@@ -40,7 +34,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
     private static final Logger logger = LogManager.getLogger(CampaignRepositoryImpl.class);
 
     @Autowired
-    @PersistenceContext( unitName= DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
+    @PersistenceContext(unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
     EntityManager entityManager;
 
     @Autowired
@@ -52,6 +46,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
     @Override
     public ResultDTO search(CampaignRequestDTO requestDto) {
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes((long) requestDto.getTimezoneOffset());
         logger.info("Start search campaign::");
 
         ResultDTO result = new ResultDTO();
@@ -121,7 +116,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append(" AND a.STATUS <> -1");
 
 
-            if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {
+            if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode()) && !DataUtil.isNullOrEmpty(requestDto.getCampaignCode().trim())) {
                 sb.append(" AND a.CAMPAIGN_CODE IN (:p_code) ");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignName())) {
@@ -131,16 +126,16 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 sb.append(" AND a.STATUS IN (:p_statuses) ");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
-                sb.append(" AND TO_DATE(a.START_TIME, 'DD-MM-RR') >= TO_DATE(:p_frDateFr, 'YYYYMMDD')");
+                sb.append(" AND a.START_TIME >= TO_DATE(:p_frDateFr, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateFr())) {
-                sb.append(" AND TO_DATE(a.START_TIME, 'DD-MM-RR') <= TO_DATE(:p_toDateFr, 'YYYYMMDD')");
+                sb.append(" AND a.START_TIME <= TO_DATE(:p_toDateFr, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateTo())) {
-                sb.append(" AND TO_DATE(a.END_TIME, 'DD-MM-RR') >= TO_DATE(:p_frDateTo, 'YYYYMMDD')");
+                sb.append(" AND a.END_TIME >= TO_DATE(:p_frDateTo, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateTo())) {
-                sb.append(" AND TO_DATE(a.END_TIME, 'DD-MM-RR') <= TO_DATE(:p_toDateTo, 'YYYYMMDD')");
+                sb.append(" AND a.END_TIME <= TO_DATE(:p_toDateTo, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusFr())) {
                 sb.append(" AND a.CUSTOMER_NUMBER >= :p_cusNumFr");
@@ -164,7 +159,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append(" ORDER BY a.CREATE_TIME DESC ");
 
             SQLQuery query = session.createSQLQuery(sb.toString());
-            if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {
+            if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode()) && !DataUtil.isNullOrEmpty(requestDto.getCampaignCode().trim())) {
                 String[] lstCode = requestDto.getCampaignCode().trim().split(",");
                 query.setParameterList("p_code", lstCode);
             }
@@ -185,16 +180,16 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 query.setParameterList("p_statuses", statuses);
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
-                query.setParameter("p_frDateFr", requestDto.getFromDateFr());
+                query.setParameter("p_frDateFr", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getFromDateFr()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateTo())) {
-                query.setParameter("p_frDateTo", requestDto.getFromDateTo());
+                query.setParameter("p_frDateTo", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getFromDateTo()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateFr())) {
-                query.setParameter("p_toDateFr", requestDto.getToDateFr());
+                query.setParameter("p_toDateFr", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getToDateFr()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateTo())) {
-                query.setParameter("p_toDateTo", requestDto.getToDateTo());
+                query.setParameter("p_toDateTo", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getToDateTo()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getTypes())) {
                 String[] types = requestDto.getTypes().split(",");
@@ -247,10 +242,18 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     query.setMaxResults(pageable.getPageSize());
                 }
                 List<CampaignDTO> data = query.list();
+                data.forEach(item -> {
+                    item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
+                    item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
+                });
                 Page<CampaignDTO> dataPage = new PageImpl<>(data, pageable, count);
                 result.setData(dataPage);
             } else {
                 List<CampaignDTO> dataExport = query.list();
+                dataExport.forEach(item -> {
+                    item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
+                    item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
+                });
                 result.setData(dataExport);
             }
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
@@ -260,7 +263,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setDescription(Constants.ApiErrorDesc.ERROR);
             logger.error(ex.getMessage(), ex);
         } finally {
-            if(null != session) {
+            if (null != session) {
                 session.close();
             }
         }
@@ -350,7 +353,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
-            if(session != null) session.close();
+            if (session != null) session.close();
         }
         return result;
     }
@@ -381,8 +384,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
-        }finally {
-            if(session != null) session.close();
+        } finally {
+            if (session != null) session.close();
         }
         return null;
     }
@@ -514,7 +517,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO resultDTO = new ResultDTO();
         try {
             List<CustomerCustomDTO> list = dto.getCustomerCustomDTOList();
-            for (CustomerCustomDTO customerCustomDTO: list) {
+            for (CustomerCustomDTO customerCustomDTO : list) {
                 CampaignCustomer campaignCustomer = campaignCustomerRepository.findCampaignCustomerByCampaignCustomerId(customerCustomDTO.getCampaignCustomerId());
                 campaignCustomer.setStatus((short) 0);
                 campaignCustomer.setCallStatus(null);
@@ -536,22 +539,22 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO resultDTO = new ResultDTO();
         Map<String, String> params = new HashMap<>();
         List<FieldsToShowDTO> list = new ArrayList<>();
-        StringBuilder stringBuilder = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         try {
 //            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-list-fields-not-show");
-            String sql = "with column_name_temp as (\n" +
-                    "    select column_name columnName, null customizeFieldId, 1 isFix from user_tab_columns, dual\n" +
-                    "    where table_name = 'CUSTOMER'\n" +
-                    ")\n" +
-                    "select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column where column_name is not null)\n" +
-                    "union all\n" +
-                    "select title columnName, customize_field_id customizeFieldId, 0 isFix from customize_fields, dual\n" +
-                    "where function_code = 'CUSTOMER'\n" +
-                    "    and site_id = :p_company_site_id\n" +
-                    "    and customize_field_id not in (select customize_field_id from campaign_customerlist_column where campaign_customerlist_column.campaign_id = :p_campaign_id)\n";
+            sb.append(" with column_name_temp as (");
+            sb.append("     select column_name columnName, null customizeFieldId, 1 isFix from user_tab_columns, dual");
+            sb.append("     where table_name = 'CUSTOMER'");
+            sb.append(" )");
+            sb.append(" select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column where campaign_id = :p_campaign_id and column_name is not null)");
+            sb.append(" union all");
+            sb.append(" select title columnName, customize_field_id customizeFieldId, 0 isFix from customize_fields, dual");
+            sb.append(" where function_code = 'CUSTOMER'");
+            sb.append("     and site_id = :p_company_site_id");
+            sb.append("     and customize_field_id not in (select customize_field_id from campaign_customerlist_column where campaign_customerlist_column.campaign_id = :p_campaign_id)");
             params.put("p_company_site_id", dto.getCompanySiteId());
             params.put("p_campaign_id", dto.getCampaignId());
-            list = namedParameterJdbcTemplate.query(sql, params, BeanPropertyRowMapper.newInstance(FieldsToShowDTO.class));
+            list = namedParameterJdbcTemplate.query(sb.toString(), params, BeanPropertyRowMapper.newInstance(FieldsToShowDTO.class));
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             resultDTO.setListData(list);
@@ -569,25 +572,25 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO resultDTO = new ResultDTO();
         Map<String, String> params = new HashMap<>();
         List<FieldsToShowDTO> list = new ArrayList<>();
-        StringBuilder sqlBuilder = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         try {
 //            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-list-fields-to-show");
-            String sql = "with field_name as (\n" +
-                    "select a.campaign_cus_list_column_id id, to_char(a.column_name) columnName, a.order_index, a.customize_field_id customizeFieldId, 1 isFix\n" +
-                    "from campaign_customerlist_column a, dual\n" +
-                    "where a.campaign_id = :p_campaign_id\n" +
-                    "    and a.company_site_id = :p_company_site_id\n" +
-                    "    and column_name is not null\n" +
-                    "union all\n" +
-                    "select a.campaign_cus_list_column_id id, a.customize_field_title columnName, a.order_index, a.customize_field_id customizeFieldId, 0 isFix\n" +
-                    "from campaign_customerlist_column a\n" +
-                    "where a.campaign_id = :p_campaign_id\n" +
-                    "    and a.company_site_id = :p_company_site_id\n" +
-                    ")\n" +
-                    "select id, columnName, customizeFieldId, isFix from field_name where columnName is not null order by order_index\n";
+            sb.append(" with field_name as (");
+            sb.append(" select a.campaign_cus_list_column_id id, to_char(a.column_name) columnName, a.order_index, a.customize_field_id customizeFieldId, 1 isFix");
+            sb.append(" from campaign_customerlist_column a, dual");
+            sb.append(" where a.campaign_id = :p_campaign_id");
+            sb.append("     and a.company_site_id = :p_company_site_id");
+            sb.append("     and column_name is not null");
+            sb.append(" union all");
+            sb.append(" select a.campaign_cus_list_column_id id, a.customize_field_title columnName, a.order_index, a.customize_field_id customizeFieldId, 0 isFix");
+            sb.append(" from campaign_customerlist_column a");
+            sb.append(" where a.campaign_id = :p_campaign_id");
+            sb.append("     and a.company_site_id = :p_company_site_id");
+            sb.append(" )");
+            sb.append(" select id, columnName, customizeFieldId, isFix from field_name where columnName is not null order by order_index");
             params.put("p_campaign_id", dto.getCampaignId());
             params.put("p_company_site_id", dto.getCompanySiteId());
-            list = namedParameterJdbcTemplate.query(sql, params, BeanPropertyRowMapper.newInstance(FieldsToShowDTO.class));
+            list = namedParameterJdbcTemplate.query(sb.toString(), params, BeanPropertyRowMapper.newInstance(FieldsToShowDTO.class));
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             resultDTO.setListData(list);
@@ -624,7 +627,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     "),\n" +
                     "customer_interactive_table as (\n" +
                     "    select count(a.customer_id) campaignCustomerCalled, a.customer_list_id customerListId, a.campaign_id from campaign_customer a\n" +
-                    "    where a.status <> 0 and a.campaign_id = :p_campaign_id and in_campaign_status = 1\n" +
+                    "    where a.status <> 0 and a.campaign_id = :p_campaign_id\n" +
                     "    group by a.customer_list_id, a.campaign_id\n" +
                     "),\n" +
                     "customer_not_interactive_table as (\n" +
@@ -655,7 +658,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     "select count(*) totalRow from data\n" +
                     ")\n" +
                     "select a.customerListId, a.customerListCode, a.customerListName, a.totalCusList, a.totalCusCampaign, a.totalCusCalled, a.totalCusNotInteract, totalRow from data a, count_data\n" +
-                    "where row_ >= ((:p_page_number - 1) * :p_page_size + 1) and row_ < (:p_page_number * :p_page_size + 1)\n";
+                    "where row_ >= ((:p_page_number - 1) * :p_page_size + 1) and row_ < (:p_page_number * :p_page_size + 1)\n" +
+                    "order by a.customerListName";
             params.put("p_campaign_id", dto.getCampaignId());
             params.put("p_company_site_id", dto.getCompanySiteId());
             params.put("p_page_number", dto.getPage().toString());
@@ -799,73 +803,74 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO resultDTO = new ResultDTO();
         Map<String, String> params = new HashMap<>();
 
-//        StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         try {
 //            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-customer-list-choosen");
-            String sql = "with campaign_customer_id as (\n" +
-                    "    select ccl.CUSTOMER_LIST_ID from campaign_customerlist ccl\n" +
-                    "    where ccl.campaign_id = :p_campaign_id and ccl.company_site_id = :p_company_site_id\n" +
-                    "),\n" +
-                    "customer_table as (\n" +
-                    "    select count(a.customer_id) totalCustomer, a.customer_list_id customerListId from customer_list_mapping a\n" +
-                    "    left join customer b on a.customer_id = b.customer_id\n" +
-                    "    where b.status = 1\n" +
-                    "    group by a.customer_list_id\n" +
-                    "),\n" +
-                    "customer_active_table as (\n" +
-                    "    select count(a.customer_id) customerActive, a.customer_list_id customerListId from customer_list_mapping a\n" +
-                    "    left join customer b on a.customer_id = b.customer_id\n" +
-                    "    where b.status = 1 and b.ipcc_status = 'active'\n" +
-                    "    group by a.customer_list_id\n" +
-                    "),\n" +
-                    "customer_lock_table as (\n" +
-                    "    select count(a.customer_id) customerLock, a.customer_list_id customerListId from customer_list_mapping a\n" +
-                    "    left join customer b on a.customer_id = b.customer_id\n" +
-                    "    where b.status = 1 and b.ipcc_status = 'locked'\n" +
-                    "    group by a.customer_list_id\n" +
-                    "),\n" +
-                    "customer_dnc_table as (\n" +
-                    "    select count(a.customer_id) customerDnc, a.customer_list_id customerListId from customer_list_mapping a\n" +
-                    "    left join customer b on a.customer_id = b.customer_id\n" +
-                    "    where b.status = 1 and b.call_allowed = 0\n" +
-                    "    group by a.customer_list_id\n" +
-                    "),\n" +
-                    "customer_filter_table as (\n" +
-                    "    select count(a.customer_id) customerFilter, a.customer_list_id customerListId from campaign_customer a\n" +
-                    "    where a.campaign_id = :p_campaign_id\n" +
-                    "    group by a.customer_list_id\n" +
-                    "),\n" +
-                    "data_temp as (\n" +
-                    "select  a.customer_list_id customerListId,\n" +
-                    "        a.customer_list_code customerListCode,\n" +
-                    "        a.customer_list_name customerListName,\n" +
-                    "        nvl(b.totalCustomer, 0) totalCusList,\n" +
-                    "        nvl(c.customerActive, 0) totalCusActive,\n" +
-                    "        nvl(d.customerLock, 0) totalCusLock,\n" +
-                    "        nvl(e.customerDnc, 0) totalCusDnc,\n" +
-                    "        nvl(null, 0) totalCusAddRemove,\n" +
-                    "        nvl(f.customerFilter, 0) totalCusFilter\n" +
-                    "from customer_list a\n" +
-                    "left join customer_table b on a.customer_list_id = b.customerListId\n" +
-                    "left join customer_active_table c on a.customer_list_id = c.customerListId\n" +
-                    "left join customer_lock_table d on a.customer_list_id = d.customerListId\n" +
-                    "left join customer_dnc_table e on a.customer_list_id = e.customerListId\n" +
-                    "left join customer_filter_table f on a.customer_list_id = f.customerListId\n" +
-                    "where a.customer_list_id in (select CUSTOMER_LIST_ID from campaign_customer_id)\n" +
-                    "),\n" +
-                    "data as (\n" +
-                    "select a.*, rownum row_ from data_temp a\n" +
-                    "),\n" +
-                    "count_data as (\n" +
-                    "select count(*) totalRow from data_temp\n" +
-                    ")\n" +
-                    "select a.customerListId, a.customerListCode, a.customerListName, a.totalCusList, a.totalCusActive, a.totalCusLock, a.totalCusDnc, a.totalCusAddRemove, a.totalCusFilter, totalRow from data a, count_data\n" +
-                    "where row_ >= ((:p_page_number - 1) * :p_page_size + 1) and row_ < (:p_page_number * :p_page_size + 1)\n";
+            sb.append(" with campaign_customer_id as (");
+            sb.append("     select ccl.CUSTOMER_LIST_ID from campaign_customerlist ccl");
+            sb.append("     where ccl.campaign_id = :p_campaign_id and ccl.company_site_id = :p_company_site_id");
+            sb.append(" ),");
+            sb.append(" customer_table as (");
+            sb.append("     select count(a.customer_id) totalCustomer, a.customer_list_id customerListId from customer_list_mapping a");
+            sb.append("     left join customer b on a.customer_id = b.customer_id");
+            sb.append("     where b.status = 1");
+            sb.append("     group by a.customer_list_id");
+            sb.append(" ),");
+            sb.append(" customer_active_table as (");
+            sb.append("     select count(a.customer_id) customerActive, a.customer_list_id customerListId from customer_list_mapping a");
+            sb.append("     left join customer b on a.customer_id = b.customer_id");
+            sb.append("     where b.status = 1 and b.ipcc_status = 'active'");
+            sb.append("     group by a.customer_list_id");
+            sb.append(" ),");
+            sb.append(" customer_lock_table as (");
+            sb.append("     select count(a.customer_id) customerLock, a.customer_list_id customerListId from customer_list_mapping a");
+            sb.append("     left join customer b on a.customer_id = b.customer_id");
+            sb.append("     where b.status = 1 and b.ipcc_status = 'locked'");
+            sb.append("     group by a.customer_list_id");
+            sb.append(" ),");
+            sb.append(" customer_dnc_table as (");
+            sb.append("     select count(a.customer_id) customerDnc, a.customer_list_id customerListId from customer_list_mapping a");
+            sb.append("     left join customer b on a.customer_id = b.customer_id");
+            sb.append("     where b.status = 1 and b.call_allowed = 0");
+            sb.append("     group by a.customer_list_id");
+            sb.append(" ),");
+            sb.append(" customer_filter_table as (");
+            sb.append("     select count(a.customer_id) customerFilter, a.customer_list_id customerListId from campaign_customer a");
+            sb.append("     where a.campaign_id = :p_campaign_id and a.in_campaign_status = 1");
+            sb.append("     group by a.customer_list_id");
+            sb.append(" ),");
+            sb.append(" data_temp as (");
+            sb.append(" select  a.customer_list_id customerListId,");
+            sb.append("         a.customer_list_code customerListCode,");
+            sb.append("         a.customer_list_name customerListName,");
+            sb.append("         nvl(b.totalCustomer, 0) totalCusList,");
+            sb.append("         nvl(c.customerActive, 0) totalCusActive,");
+            sb.append("         nvl(d.customerLock, 0) totalCusLock,");
+            sb.append("         nvl(e.customerDnc, 0) totalCusDnc,");
+            sb.append("         nvl(null, 0) totalCusAddRemove,");
+            sb.append("         nvl(f.customerFilter, 0) totalCusFilter");
+            sb.append(" from customer_list a");
+            sb.append(" left join customer_table b on a.customer_list_id = b.customerListId");
+            sb.append(" left join customer_active_table c on a.customer_list_id = c.customerListId");
+            sb.append(" left join customer_lock_table d on a.customer_list_id = d.customerListId");
+            sb.append(" left join customer_dnc_table e on a.customer_list_id = e.customerListId");
+            sb.append(" left join customer_filter_table f on a.customer_list_id = f.customerListId");
+            sb.append(" where a.customer_list_id in (select CUSTOMER_LIST_ID from campaign_customer_id)");
+            sb.append(" ),");
+            sb.append(" data as (");
+            sb.append(" select a.*, rownum row_ from data_temp a");
+            sb.append(" ),");
+            sb.append(" count_data as (");
+            sb.append(" select count(*) totalRow from data_temp");
+            sb.append(" )");
+            sb.append(" select a.customerListId, a.customerListCode, a.customerListName, a.totalCusList, a.totalCusActive, a.totalCusLock, a.totalCusDnc, a.totalCusAddRemove, a.totalCusFilter, totalRow from data a, count_data");
+            sb.append(" where row_ >= ((:p_page_number - 1) * :p_page_size + 1) and row_ < (:p_page_number * :p_page_size + 1)");
+            sb.append(" order by a.customerListName");
             params.put("p_campaign_id", dto.getCampaignId());
             params.put("p_company_site_id", dto.getCompanySiteId());
             params.put("p_page_number", dto.getPage().toString());
             params.put("p_page_size", dto.getPageSize().toString());
-            list = namedParameterJdbcTemplate.query(sql, params, BeanPropertyRowMapper.newInstance(CustomerListDTO.class));
+            list = namedParameterJdbcTemplate.query(sb.toString(), params, BeanPropertyRowMapper.newInstance(CustomerListDTO.class));
             int total = 0;
             if (list.size() > 0) {
                 total = list.get(0).getTotalRow();
@@ -883,7 +888,6 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
     }
 
 
-
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getCampaignCustomerInformation(CampaignRequestDTO dto) {
@@ -892,12 +896,19 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         Map<String, String> params = new HashMap<>();
         StringBuilder sb = new StringBuilder();
         try {
+//            sb.append(" with status_customer as (");
+//            sb.append(" select complete_value");
+//            sb.append(" from campaign_complete_code");
+//            sb.append(" where complete_value <> 4");
+//            sb.append("     and is_finish <> 1");
+//            sb.append("     and campaign_type = 1");
+//            sb.append("     and company_site_id = :p_company_site_id");
+//            sb.append(" ),");
             sb.append(" with status_customer as (");
             sb.append(" select complete_value");
             sb.append(" from campaign_complete_code");
-            sb.append(" where complete_value <> 4");
-            sb.append("     and is_finish <> 1");
-            sb.append("     and campaign_type = 1");
+            sb.append(" where status = 1");
+            sb.append("     and complete_type = 1");
             sb.append("     and company_site_id = :p_company_site_id");
             sb.append(" ),");
             sb.append(" count_customer as (");
@@ -907,11 +918,11 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append("                 else 0");
             sb.append("             end) totalIndividual,");
             sb.append("         sum(case");
-            sb.append("                 when status = 0 then 1");
+            sb.append("                 when status = 0 and in_campaign_status = 1 then 1");
             sb.append("                 else 0");
             sb.append("             end) totalNotInteractive,");
             sb.append("         sum(case");
-            sb.append("                 when status in (select * from status_customer) then 1");
+            sb.append("                 when status in (select * from status_customer) and in_campaign_status = 1 then 1");
             sb.append("                 else 0");
             sb.append("             end) totalNotCall,");
             sb.append("         sum(case");
@@ -950,12 +961,19 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         Map<String, String> params = new HashMap<>();
         StringBuilder sb = new StringBuilder();
         try {
+//            sb.append(" with status_customer as (");
+//            sb.append(" select complete_value");
+//            sb.append(" from campaign_complete_code");
+//            sb.append(" where complete_value <> 4");
+//            sb.append("     and is_finish <> 1");
+//            sb.append("     and campaign_type = 1");
+//            sb.append("     and company_site_id = :p_company_site_id");
+//            sb.append(" ),");
             sb.append(" with status_customer as (");
             sb.append(" select complete_value");
             sb.append(" from campaign_complete_code");
-            sb.append(" where complete_value <> 4");
-            sb.append("     and is_finish <> 1");
-            sb.append("     and campaign_type = 1");
+            sb.append(" where status =1");
+            sb.append("     and complete_type = 1");
             sb.append("     and company_site_id = :p_company_site_id");
             sb.append(" ),");
             sb.append(" count_customer as (");
@@ -966,11 +984,11 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append("                 else 0");
             sb.append("             end) totalIndividual,");
             sb.append("         sum(case");
-            sb.append("                 when status = 0 then 1");
+            sb.append("                 when status = 0 and in_campaign_status = 1 then 1");
             sb.append("                 else 0");
             sb.append("             end) totalNotInteractive,");
             sb.append("         sum(case");
-            sb.append("                 when status in (select * from status_customer) then 1");
+            sb.append("                 when status in (select * from status_customer) and in_campaign_status = 1 then 1");
             sb.append("                 else 0");
             sb.append("             end) totalNotCall");
             sb.append(" from campaign_customer");
@@ -995,6 +1013,42 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO getCountIndividualOnList(CampaignRequestDTO dto) {
+        List<CampaignInformationDTO> list = new ArrayList();
+        ResultDTO resultDTO = new ResultDTO();
+        Map<String, String> params = new HashMap<>();
+        StringBuilder sb = new StringBuilder();
+        try {
+            sb.append(" with customer_temp as (");
+            sb.append(" select c.customer_id, clm.customer_list_id");
+            sb.append(" from customer c");
+            sb.append(" inner join customer_list_mapping clm on c.customer_id = clm.customer_id");
+            sb.append(" where clm.customer_list_id in (select distinct cc.customer_list_id from campaign_customerlist cc where cc.campaign_id = :p_campaign_id and cc.company_site_id = :p_company_site_id)");
+            sb.append(" )");
+            sb.append(" select count(cc.customer_id) totalIndividual, c.customer_list_id customerListId");
+            sb.append(" from campaign_customer cc");
+            sb.append(" inner join customer_temp c on c.customer_id = cc.customer_id");
+            sb.append(" where campaign_id = :p_campaign_id");
+            sb.append("     and cc.customer_list_id is null");
+            sb.append("     and cc.in_campaign_status = 1");
+            sb.append("     and cc.customer_id in (select customer_id from customer_temp)");
+            sb.append(" group by c.customer_list_id");
+            params.put("p_campaign_id", dto.getCampaignId());
+            params.put("p_company_site_id", dto.getCompanySiteId());
+            list = namedParameterJdbcTemplate.query(sb.toString(), params, BeanPropertyRowMapper.newInstance(CampaignInformationDTO.class));
+            resultDTO.setListData(list);
+            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
     @Transactional(DataSourceQualify.CCMS_FULL)
     public List<ApParamDTO> getConnectStatus(Long companySiteId) {

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

@@ -22,4 +22,6 @@ public interface AgentsService {
     ResultDTO searchCampaignAgentSelectByName(int page, int pageSize, Long companySiteId, Long campaignId, String userName, String fullName);
 
     ResultDTO createMultipleCampaignAgent(CampaignAgentRequestDTO campaignAgentRequestDTO);
+
+    ResultDTO updateAgent(CampaignAgentDTO campaignAgentDTO);
 }

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

@@ -12,7 +12,7 @@ public interface CampaignCfgService {
 
     Map listCompleteCodeByName(int page, int pageSize, String sort, String name);
 
-    ResultDTO createCompleteCode(CampaignCfgDTO completeCodeDTO);
+    ResultDTO createCompleteCode(CampaignCfgDTO completeCodeDTO, Long userId);
 
     ResultDTO updateCompleteCode(CampaignCfgDTO completeCodeDTO);
 

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

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
 import java.io.IOException;
 import java.util.List;
 
-@Service
 public interface CampaignExecuteService {
     //<editor-fold: hungtt>
     ResultDTO getComboBoxStatus(String companySiteId, String completeType);
@@ -21,7 +20,9 @@ public interface CampaignExecuteService {
 
     XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) throws IOException;
 
-    ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto, String xAuthToken);
+    ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto);
+
+    ResultDTO checkExecuteCampaign(CampaignRequestDTO requestDto);
 
     ResultDTO getExecuteCampaign(CampaignRequestDTO requestDto);
 
@@ -33,11 +34,13 @@ public interface CampaignExecuteService {
 
     ResultDTO getCallLog(ReceiveCustLogDTO dto);
 
-    ResultDTO getCallStatus(CampaignRequestDTO dto);
-
     ResultDTO getAgentLogout(CampaignRequestDTO dto);
 
-    ResultDTO callCustomer(ContactCustResultDTO dto, UserSession userSession);
+    ResultDTO getLogoutContactResult(ReceiveCustLogDTO dto);
+
+    ResultDTO updateContactCustResult(ContactCustResultDTO dto, UserSession userSession);
+
+    ResultDTO draftAtTen(ContactCustResultDTO dto, UserSession userSession);
 
     ResultDTO recallCustomer(ContactCustResultDTO dto);
 
@@ -49,9 +52,15 @@ public interface CampaignExecuteService {
 
     ResultDTO getCustomerInfor(Long companySiteId, Long customerId, Long campaignId);
 
-    ResultDTO createListContacQuestResult(List<ContactQuestResultDTO> dtoList);
+    ResultDTO createListContactQuestResult(List<ContactQuestResultDTO> dtoList);
 
-    String getDialModeAtCurrent(Long campaignId, Long companySiteId);
+    ResultDTO updateListContactQuestResult(ContactQuestResultDTO dto);
+
+    String getDialModeAtCurrent(Long companySiteId, Long campaignId);
 
     ResultDTO getContactCustResultById(Long contactCustResultId);
+
+    ResultDTO updateCampaignCustomer(CampaignCustomerDTO dto);
+
+    ResultDTO updateSurveyStatus(CustomerTimeDTO dto, UserSession userSession);
 }

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

@@ -70,6 +70,8 @@ public interface CampaignService {
 
     ResultDTO getCustomerListInformation(CampaignRequestDTO dto);
 
+    ResultDTO getCountIndividualOnList(CampaignRequestDTO dto);
+
     ResultDTO saveCustomerCampaign(CampaignRequestDTO dto);
 
     ResultDTO getConnectStatus(Long companySiteId);

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.model.ccms_full.ContactQuestResult;
 import com.viettel.campaign.model.ccms_full.Scenario;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.econtact.filter.UserSession;
@@ -28,4 +29,6 @@ public interface ScenarioService {
     XSSFWorkbook buildTemplate() throws IOException;
 
     Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
+
+    List<ContactQuestResult> getContactQuestResult(Long companySiteId, Long campaignId, Long customerId);
 }

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

@@ -314,16 +314,12 @@ public class AgentsServiceImpl implements AgentsService {
             sqlStrBuilder.append(" AND vu.COMPANY_SITE_ID = :p_company_site_id");
             sqlStrBuilder.append(" AND vu.STATUS = 1");
             sqlStrBuilder.append(" AND r.ROLE_CODE IN ('AGENT', 'SUPERVISOR')");
-            sqlStrBuilder.append(" AND vu.USER_ID NOT IN (SELECT vu.USER_ID         userId");
-            sqlStrBuilder.append("                         FROM VSA_USERS vu");
-            sqlStrBuilder.append("                             LEFT JOIN CAMPAIGN_AGENT ca on vu.USER_ID = ca.AGENT_ID");
-            sqlStrBuilder.append("                             INNER JOIN USER_ROLE ur on vu.USER_ID = ur.USER_ID");
-            sqlStrBuilder.append("                             INNER JOIN ROLE r on ur.ROLE_ID = r.ROLE_ID");
+            sqlStrBuilder.append(" AND vu.USER_ID NOT IN (SELECT vu.USER_ID");
+            sqlStrBuilder.append("                         FROM CAMPAIGN_AGENT ca");
+            sqlStrBuilder.append("                             INNER JOIN VSA_USERS vu ON ca.AGENT_ID = vu.USER_ID");
             sqlStrBuilder.append("                         WHERE 1 = 1");
-            sqlStrBuilder.append("                            AND vu.COMPANY_SITE_ID = :p_company_site_id");
-            sqlStrBuilder.append("                            AND vu.STATUS = 1");
-            sqlStrBuilder.append("                            AND ca.CAMPAIGN_ID = :p_campaign_id");
-            sqlStrBuilder.append("                            AND r.ROLE_CODE IN ('AGENT', 'SUPERVISOR'))");
+            sqlStrBuilder.append("                            AND ca.COMPANY_SITE_ID = :p_company_site_id");
+            sqlStrBuilder.append("                            AND ca.CAMPAIGN_ID = :p_campaign_id)");
 
             if (!DataUtil.isNullOrEmpty(userName)) {
                 sqlStrBuilder.append(" AND UPPER(vu.USER_NAME) LIKE UPPER(:p_user_name)");
@@ -537,4 +533,28 @@ public class AgentsServiceImpl implements AgentsService {
 
         return resultDTO;
     }
+
+    @Override
+    public ResultDTO updateAgent(CampaignAgentDTO campaignAgentDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        try {
+            if (campaignAgentDTO != null) {
+                Agents agents = new Agents();
+                agents.setAgentId(campaignAgentDTO.getAgentId().toString());
+                agents.setCampaignSystemStatus("AVAILABLE");
+                agentsRepository.save(agents);
+
+                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+
+            } else {
+                resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            }
+        } catch (Exception e) {
+            // e.printStackTrace();
+        }
+
+        return resultDTO;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
 
 import com.viettel.campaign.model.ccms_full.CampaignCfg;
 import com.viettel.campaign.repository.ccms_full.CampaignCfgRepository;
+import com.viettel.campaign.repository.ccms_full.CampaignRepository;
 import com.viettel.campaign.service.CampaignCfgService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
@@ -157,7 +158,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO createCompleteCode(CampaignCfgDTO completeCodeDTO) {
+    public ResultDTO createCompleteCode(CampaignCfgDTO completeCodeDTO, Long userId) {
         ResultDTO resultDTO = new ResultDTO();
         CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
         Date today = new Date();
@@ -165,12 +166,37 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
 
         try {
             if (completeCodeDTO != null) {
+
                 // insert
-                compCode = compCodeMapper.toPersistenceBean(completeCodeDTO);
-                compCode = completeCodeRepository.save(compCode);
+//                compCode = compCodeMapper.toPersistenceBean(completeCodeDTO);
+//                compCode = completeCodeRepository.save(compCode);
+//
+//                resultDTO.setErrorCode("0");
+//                resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " created!");
+                CampaignCfg cl = new CampaignCfg();
+                cl.setStatus((short) 1);
+                cl.setCreateBy(String.valueOf(userId));
+                cl.setCreateAt(new Date());
+                cl.setUpdateBy(null);
+                cl.setUpdateAt(null);
+                cl.setChanel(completeCodeDTO.getChanel());
+                cl.setCompleteName(completeCodeDTO.getCompleteName().trim());
+                cl.setCompleteValue(completeCodeDTO.getCompleteValue());
+                cl.setCampaignType(completeCodeDTO.getCampaignType());
+                cl.setDescription(completeCodeDTO.getDescription().trim());
+                cl.setCompleteType(completeCodeDTO.getCompleteType());
+                cl.setCompanySiteId(completeCodeDTO.getCompanySiteId());
+                cl.setCampaignCompleteCodeId(completeCodeDTO.getCampaignCompleteCodeId());
+                cl.setCampaignId(completeCodeDTO.getCampaignId());
+                cl.setDurationLock(completeCodeDTO.getDurationLock());
+                cl.setIsFinish(completeCodeDTO.getIsFinish());
+                cl.setIsLock(completeCodeDTO.getIsLock());
+                cl.setIsRecall(completeCodeDTO.getIsRecall());
 
                 resultDTO.setErrorCode("0");
                 resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " created!");
+                resultDTO.setData(completeCodeRepository.save(cl));
+                return resultDTO;
             } else {
                 resultDTO.setErrorCode("-2");
                 resultDTO.setDescription("CompleteCodeDTO null");
@@ -194,16 +220,18 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             if (completeCodeDTO != null) {
                 // update
                 compCode = compCodeMapper.toPersistenceBean(completeCodeDTO);
-                compCode = completeCodeRepository.save(compCode);
+                completeCodeRepository.save(compCode);
 
-                resultDTO.setErrorCode("0");
+                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                 resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " updated!");
             } else {
-                resultDTO.setErrorCode("-2");
+                resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription("CompleteCodeDTO null");
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            logger.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         }
 
         return resultDTO;
@@ -240,10 +268,16 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         ResultDTO resultDTO = new ResultDTO();
         try {
             if (completeCodeDTO != null) {
+                if (completeCodeRepository.findAllCampaignCfg(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId()).size() > 0) {
                     completeCodeRepository.deletedList(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId());
 
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                     resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+                }
+
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);

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

@@ -25,6 +25,8 @@ import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 
 @Service
@@ -71,6 +73,18 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Autowired
     ContactQuestResultRepository contactQuestResultRepository;
 
+    @Autowired
+    CampaignCfgRepository cfgRepository;
+
+    @Autowired
+    CustomerRepository customerRepository;
+
+    @Autowired
+    AgentStatusStatRepository agentStatusStatRepository;
+
+    @Autowired
+    VSAUsersRepository vsaUsersRepository;
+
     public CampaignExecuteServiceImp() throws NoSuchAlgorithmException {
     }
 
@@ -247,31 +261,70 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     //</editor-fold: hungtt>
 
     @Override
-    public ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto, String xAuthToken) {
+    public ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto) {
         ResultDTO result = new ResultDTO();
         Map data = new HashMap();
-        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+        String campaignSystemStatus = "";
+        String campaignExecuting = "";
 
-        Integer count = campaignExecuteRepository.searchCampaignExecute(requestDto, null).size();
+        try {
+            Integer count = campaignExecuteRepository.searchCampaignExecute(requestDto, null).size();
+
+            if (count > 0) {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                result.setTotalRow(count);
+                List<CampaignDTO> campaignList = campaignExecuteRepository.searchCampaignExecute(requestDto, SQLBuilder.buildPageable(requestDto));
+                result.setListData(campaignList);
+
+                Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
+                if (agents.getCampaignSystemStatus() != null && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
+                    campaignSystemStatus = "1";
+                    for (CampaignDTO item : campaignList) {
+                        if (item.getStatus() == 2 && item.getAgentStatus() == 1) {
+                            campaignExecuting = item.getCampaignId().toString();
+                            break;
+                        }
+                    }
+                }
+                data.put("campaignSystemStatus", campaignSystemStatus);
+                data.put("campaignExecuting", campaignExecuting);
+                result.setData(data);
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                data.put("dialModeManual", campaignSystemStatus);
+                data.put("campaignExecuting", campaignExecuting);
+                result.setData(data);
+            }
+        } catch (Exception e) {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
 
-        if (count > 0) {
-            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            result.setTotalRow(count);
-            result.setListData(campaignExecuteRepository.searchCampaignExecute(requestDto, SQLBuilder.buildPageable(requestDto)));
+        return result;
+    }
 
-            Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
-            //TimeZoneDialMode zoneDialMode = zoneDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
-            //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
+    @Override
+    public ResultDTO checkExecuteCampaign(CampaignRequestDTO requestDto) {
+        ResultDTO result = new ResultDTO();
 
-            if (agents.getUserStatus() != null && agents.getCampaignSystemStatus() != null) {
-                if (agents.getUserStatus().equalsIgnoreCase("CALLOUT") && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
-                    //if (zoneDialMode != null && zoneDialMode.getDialMode().equals(0) || rangeDialMode != null && rangeDialMode.getDialMode().equals(0))
-                    data.put("dialModeManual", "1");
-                }
+        try {
+            String dialMode = getDialModeAtCurrent(Long.parseLong(requestDto.getCompanySiteId()), Long.parseLong(requestDto.getCampaignId()));
+            VSAUsers vsa = vsaUsersRepository.findByUserId(Long.parseLong(requestDto.getAgentId()));
+            AgentStatusStat ass = agentStatusStatRepository.findByKzUserIdAndCurrentStatusNotIn(vsa.getUserKazooId(), Arrays.asList("logged_out", "campaign"));
+            if (ass != null) {
+                result.setErrorCode("02");
+                result.setDescription("campaign-agents-err-callout");
+            } else if (dialMode.equalsIgnoreCase("-1")) {
+                result.setErrorCode("03");
+                result.setDescription("campaign-agents-err-dial-mode");
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription(Constants.ApiErrorDesc.SUCCESS);
             }
-            result.setData(data);
-        } else {
+        } catch (Exception e) {
+            // e.printStackTrace();
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
         }
@@ -282,9 +335,16 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Override
     public ResultDTO getExecuteCampaign(CampaignRequestDTO requestDto) {
         ResultDTO result = new ResultDTO();
-        String dialMode = getDialModeAtCurrent(Long.parseLong(requestDto.getCompanySiteId()), Long.parseLong(requestDto.getCampaignId()));
 
         try {
+            if (requestDto.getType() == 2) {
+                List<CampaignAgent> ca = campaignAgentRepository.findByAgentId(Long.parseLong(requestDto.getAgentId()));
+                for (CampaignAgent item: ca) {
+                    item.setStatus(0);
+                }
+                ca = campaignAgentRepository.saveAll(ca);
+            }
+
             // update acd_full.agents table
             Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
             agents.setAgentId(requestDto.getAgentId());
@@ -294,11 +354,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
             Agents a1 = agentsRepository.save(agents);
 
             // update ccms_full.campaign_agent table
-            List<CampaignAgent> ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getAgentId()));
-            for (CampaignAgent item : ca) {
-                item.setStatus(1);
-            }
-            List<CampaignAgent> ca1 = campaignAgentRepository.saveAll(ca);
+            CampaignAgent ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getAgentId()));
+            ca.setStatus(1);
+            ca = campaignAgentRepository.save(ca);
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -496,16 +554,20 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public ResultDTO getCallStatus(CampaignRequestDTO dto) {
+    public ResultDTO getAgentLogout(CampaignRequestDTO dto) {
         ResultDTO result = new ResultDTO();
-//        Random r = new Random();
-        String[] arr = {"ACCEPT", "REJECT", "MISSING"};
 
-        if (dto != null) {
+        try {
+            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId(), "LOGOUT");
+            // update ccms_full.campaign_agent table
+            CampaignAgent ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getAgentId()));
+            ca.setStatus(0);
+            ca = campaignAgentRepository.save(ca);
+
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            result.setData(arr[this.rand.nextInt(arr.length)]);
-        } else {
+        } catch (Exception e) {
+            // e.printStackTrace();
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
         }
@@ -514,20 +576,80 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public ResultDTO getAgentLogout(CampaignRequestDTO dto) {
+    public ResultDTO getLogoutContactResult(ReceiveCustLogDTO dto) {
         ResultDTO result = new ResultDTO();
 
         try {
-            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId(), "LOGOUT");
-            // update ccms_full.campaign_agent table
-            List<CampaignAgent> ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getAgentId()));
-            for (CampaignAgent item : ca) {
-                item.setStatus(1);
+            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId().toString(), "AVAILABLE");
+            // update receive customer log
+            ReceiveCustLog rcl = custLogRepository.getOne(dto.getReceiveCustLogId());
+            rcl.setEndTime(new Date());
+            rcl = custLogRepository.save(rcl);
+
+            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 updateContactCustResult(ContactCustResultDTO dto, UserSession userSession) {
+        ResultDTO result = new ResultDTO();
+        ContactCustResult ccr = new ContactCustResult();
+
+        try {
+            if (dto.getEventCall().equalsIgnoreCase("call")) {
+                ccr = ccResultRepository.save(modelMapper.map(dto, ContactCustResult.class));
+            }
+
+            if (dto.getContactCustResultId() != null) {
+                ccr = ccResultRepository.getOne(dto.getContactCustResultId());
+
+                if (dto.getEventCall().equalsIgnoreCase("ringing")) {
+                    ccr.setCallId(dto.getCallId());
+                    ccr.setUpdateBy(userSession.getUserId());
+                    ccr.setUpdateTime(new Date());
+                    ccr = ccResultRepository.save(ccr);
+                }
+
+                if (dto.getEventCall().equalsIgnoreCase("ended")) {
+                    ccr.setDurationCall(dto.getDurationCall());
+                    ccr.setStartCall(dto.getStartCall());
+                    ccr.setReceiveTime(dto.getReceiveTime());
+                    ccr.setPreEndTime(ccResultRepository.getMaxCreateTime(dto.getCampaignId(), dto.getAgentId()));
+                    ccr.setEndTime(dto.getEndTime());
+                    ccr.setWaitTime(dto.getWaitTime());
+                    ccr = ccResultRepository.save(ccr);
+                    CampaignCustomer cc = campaignCustomerRepository.findCampaignCustomersByCampaignIdAndCustomerId(dto.getCampaignId(), dto.getCustomerId());
+                    cc.setCallTime(dto.getStartCall());
+                    cc = campaignCustomerRepository.save(cc);
+                    Agents ag = agentsRepository.findByAgentId(dto.getAgentId().toString());
+                    ag.setSystemStatus("AVAILABLE");
+                    ag = agentsRepository.save(ag);
+                }
+
+                if (dto.getEventCall().equalsIgnoreCase("endedBeforeTen")) {
+                    ccr.setStatus((short) 0);
+                    ccr.setUpdateBy(userSession.getUserId());
+                    ccr.setUpdateTime(new Date());
+                    ccr = ccResultRepository.save(ccr);
+                }
+            }
+
+            if (dto.getEventCall().equalsIgnoreCase("endedAfterTen")) {
+                ccr = modelMapper.map(dto, ContactCustResult.class);
+                ccr.setPreEndTime(ccResultRepository.getMaxCreateTime(dto.getCampaignId(), dto.getAgentId()));
+                ccr = ccResultRepository.save(ccr);
             }
-            List<CampaignAgent> ca1 = campaignAgentRepository.saveAll(ca);
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            result.setData(ccr);
         } catch (Exception e) {
             // e.printStackTrace();
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -538,11 +660,37 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public ResultDTO callCustomer(ContactCustResultDTO dto, UserSession userSession) {
+    public ResultDTO draftAtTen(ContactCustResultDTO dto, UserSession userSession) {
         ResultDTO result = new ResultDTO();
+        ContactCustResult ccr = new ContactCustResult();
 
         try {
-            ContactCustResult ccr = ccResultRepository.save(modelMapper.map(dto, ContactCustResult.class));
+            ccResultRepository.deleteById(dto.getContactCustResultId());
+
+            ccr.setCompanySiteId(dto.getCompanySiteId());
+            ccr.setCallStatus(dto.getCallStatus());
+            ccr.setContactStatus(dto.getContactStatus());
+            ccr.setStatus(dto.getStatus());
+            ccr.setDescription(dto.getDescription());
+            ccr.setCreateTime(new Date());
+            ccr.setAgentId(dto.getAgentId());
+            ccr.setCampaignId(dto.getCampaignId());
+            ccr.setUpdateBy(userSession.getUserId());
+            ccr.setCustomerId(dto.getCustomerId());
+            ccr.setDurationCall(dto.getDurationCall());
+            ccr.setStartCall(dto.getStartCall());
+            ccr.setReceiveCustLogId(dto.getReceiveCustLogId());
+            ccr.setCallId(dto.getCallId());
+            ccr.setPhoneNumber(dto.getPhoneNumber());
+            ccr.setReceiveTime(dto.getReceiveTime());
+            ccr.setPreEndTime(ccResultRepository.getMaxCreateTime(dto.getCampaignId(), dto.getAgentId()));
+            ccr.setRecallTime(dto.getRecallTime());
+            ccr.setIsFinalRecall(dto.getIsFinalRecall());
+            ccr.setIsSendEmail(dto.getIsSendEmail());
+            ccr.setEndTime(dto.getEndTime());
+            ccr.setWaitTime(dto.getWaitTime());
+            ccr.setDialMode(dto.getDialMode());
+            ccr = ccResultRepository.save(ccr);
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -625,8 +773,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
 
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO countRecallCustomer(Long companySiteId, Long agentId) {
-        Long count = campaignCustomerRepository.countRecallCustomer(companySiteId, agentId);
         ResultDTO resultDTO = new ResultDTO();
+        Long count = campaignCustomerRepository.countRecallCustomer(companySiteId, agentId);
+
         if (count != null) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -682,20 +831,44 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    @Transactional
-    public ResultDTO createListContacQuestResult(List<ContactQuestResultDTO> dtoList) {
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO createListContactQuestResult(List<ContactQuestResultDTO> dtoList) {
         ResultDTO resultDTO = new ResultDTO();
         List<ContactQuestResult> lstContactQuestResult = new ArrayList<>();
 
-        for (ContactQuestResultDTO item : dtoList) {
-            lstContactQuestResult.add(modelMapper.map(item, ContactQuestResult.class));
+        try {
+            for (ContactQuestResultDTO item : dtoList) {
+                lstContactQuestResult.add(modelMapper.map(item, ContactQuestResult.class));
+            }
+
+            List<ContactQuestResult> dataReturn = new ArrayList<>();
+            dataReturn = contactQuestResultRepository.saveAll(lstContactQuestResult);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setListData(dataReturn);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         }
 
+        return resultDTO;
+    }
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO updateListContactQuestResult(ContactQuestResultDTO dto) {
+        ResultDTO resultDTO = new ResultDTO();
+        List<ContactQuestResult> lstContactQuestResult = new ArrayList<>();
+
         try {
-            List<ContactQuestResult> dataReturn = contactQuestResultRepository.saveAll(lstContactQuestResult);
+            lstContactQuestResult = contactQuestResultRepository.findByContactCustResultId(dto.getContactCustResultId());
+            for (ContactQuestResult item : lstContactQuestResult) {
+                item.setStatus((short) 0);
+            }
+            lstContactQuestResult = contactQuestResultRepository.saveAll(lstContactQuestResult);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            resultDTO.setListData(dataReturn);
+            resultDTO.setListData(lstContactQuestResult);
         } catch (Exception e) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
@@ -705,19 +878,19 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public String getDialModeAtCurrent(Long campaignId, Long companySiteId) {
+    public String getDialModeAtCurrent(Long companySiteId, Long campaignId) {
         // 0: manual, 1- Preview, 2-Progressive, 3-Super Progressive, 4- Predictive
         try {
             TimeRangeDialMode lstTimeRange = rangeDialModeRepository.findDialModeAtCurrent(companySiteId, campaignId);
             TimeZoneDialMode lstTimeZone = zoneDialModeRepository.findDialModeAtCurrent(companySiteId, campaignId);
 
-            if (lstTimeRange.getTimeRangeDialModeId() != null) {
+            if (lstTimeRange != null) {
                 return lstTimeRange.getDialMode().toString();
-            } else if (lstTimeZone.getTimeZoneDialModeId() != null) {
+            } else if (lstTimeZone != null) {
                 return lstTimeZone.getDialMode().toString();
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            e.printStackTrace();
         }
 
         return "-1";
@@ -726,6 +899,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Override
     public ResultDTO getContactCustResultById(Long contactCustResultId) {
         ResultDTO resultDTO = new ResultDTO();
+
         try {
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -737,4 +911,61 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
 
         return resultDTO;
     }
+
+    @Override
+    public ResultDTO updateCampaignCustomer(CampaignCustomerDTO dto) {
+        ResultDTO resultDTO = new ResultDTO();
+
+        try {
+            CampaignCustomer cc = campaignCustomerRepository.findCampaignCustomersByCampaignIdAndCustomerId(dto.getCampaignId(), dto.getCustomerId());
+            cc.setStatus(dto.getStatus());
+            cc.setAgentId(dto.getAgentId());
+            cc.setRecallTime(dto.getRecallTime());
+            cc.setRecallCount(cc.getRecallCount() + 1);
+            cc.setCallTime(dto.getCallTime());
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setData(cc);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return resultDTO;
+    }
+
+    public ResultDTO updateSurveyStatus(CustomerTimeDTO dto, UserSession userSession) {
+        ResultDTO resultDTO = new ResultDTO();
+
+        try {
+            CampaignCfg cfg = cfgRepository.findByCompanySiteIdAndCompleteValue(dto.getCompanySiteId(), dto.getCompleteValue());
+            if (cfg.getIsLock() == 1) {
+                Customer c = customerRepository.getOne(dto.getCustomerId());
+                c.setIpccStatus("locked");
+                c = customerRepository.save(c);
+            } else {
+                CustomerTime c = new CustomerTime();
+                c.setCompanySiteId(dto.getCompanySiteId());
+                c.setCustomerId(dto.getCustomerId());
+                c.setStartTime(dto.getStartTime());
+                LocalDateTime ldt = dto.getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusDays(cfg.getDurationLock());
+                c.setEndTime(Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant()));
+                c.setStatus((short) 1);
+                c.setCreateTime(new Date());
+                c.setCreateBy(userSession.getUserId());
+                c.setUpdateTime(new Date());
+                c.setUpdateBy(userSession.getUserId());
+                c.setContactCustResultId(dto.getContactCustResultId());
+            }
+
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setData(null);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return resultDTO;
+    }
 }

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

@@ -130,6 +130,8 @@ public class CampaignServiceImpl implements CampaignService {
     public ResultDTO addNewCampaign(CampaignDTO campaignDTO) {
         logger.info("=== Start add new  campaign ");
         ResultDTO resultDTO = new ResultDTO();
+        campaignDTO.setCampaignName(campaignDTO.getCampaignName().trim());
+        campaignDTO.setContent(campaignDTO.getContent().trim());
         Campaign campaign = modelMapper.map(campaignDTO, Campaign.class);
         Long campaignId;
         List<TimeZoneDialModeDTO> timeZoneDialModes = new ArrayList<>();
@@ -207,6 +209,11 @@ public class CampaignServiceImpl implements CampaignService {
         try {
             Campaign entity = campaignRepository.findCampaignByCampaignIdAndCompanySiteId(dto.getCampaignId(), dto.getCompanySiteId());
             if (entity != null) {
+                if(entity.getStatus().equals(dto.getStatus().longValue())) {
+                    result.setDescription("Duplicate status");
+                    result.setErrorCode("02");
+                    return result;
+                }
                 entity.setStatus(dto.getStatus().longValue());
                 entity.setUpdateTime(new Date());
                 entity.setUpdateBy(dto.getUpdateBy());
@@ -350,7 +357,7 @@ public class CampaignServiceImpl implements CampaignService {
                 entity.setUpdateBy(campaignDTO.getUpdateBy());
                 entity.setEndTime(campaignDTO.getEndTime());
 
-                campaignRepository.save(entity);
+                //campaignRepository.save(entity);
 
                 UserActionLogDTO userActionLog = new UserActionLogDTO();
                 userActionLog.setAgentId(null);
@@ -361,7 +368,7 @@ public class CampaignServiceImpl implements CampaignService {
                 userActionLog.setEndTime(null);
                 userActionLog.setObjectId(entity.getCampaignId());
                 userActionLog.setActionType((short) 6);
-                userActionLogRepository.insertToUserActionLog(userActionLog);
+                //userActionLogRepository.insertToUserActionLog(userActionLog);
                 resultDTO.setData(entity);
                 resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
                 resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
@@ -627,6 +634,12 @@ public class CampaignServiceImpl implements CampaignService {
         return campaignRepositoryCustom.getCustomerListInformation(dto);
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO getCountIndividualOnList(CampaignRequestDTO dto) {
+        return campaignRepositoryCustom.getCountIndividualOnList(dto);
+    }
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO saveCustomerCampaign(CampaignRequestDTO dto) {
@@ -668,7 +681,12 @@ public class CampaignServiceImpl implements CampaignService {
                     // Lay ra danh sach khach hang can loai bo
                     List<CampaignCustomer> listCustomerToDelete = campaignCustomerRepository.findListCustomerToDel(companySiteId, campaignId, customerListDTO.getCustomerListId());
                     for (int j = 0; j < custToDel; j++) {
-                        campaignCustomerRepository.delete(listCustomerToDelete.get(j));
+                        if (listCustomerToDelete.get(j).getStatus() == 0) {
+                            campaignCustomerRepository.delete(listCustomerToDelete.get(j));
+                        } else {
+                            listCustomerToDelete.get(j).setInCampaignStatus((short) 0);
+                            campaignCustomerRepository.save(listCustomerToDelete.get(j));
+                        }
                     }
                 }
             }

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

@@ -20,6 +20,7 @@ import cz.jirutka.rsql.parser.ast.RSQLVisitor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
@@ -51,11 +52,15 @@ import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomerServiceImpl.class);
+    //    private static final Pattern EMAIL_REGEXP = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
+    private static final Pattern EMAIL_REGEXP = Pattern.compile("^(.+)@(.+)$", Pattern.CASE_INSENSITIVE);
 
     @Autowired
     @PersistenceContext(unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
@@ -387,14 +392,22 @@ public class CustomerServiceImpl implements CustomerService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO deleteCustomer(CustomerRequestDTO customerRequestDTO) {
         ResultDTO resultDTO = new ResultDTO();
+        List<Long> listId = new ArrayList<>();
+        listId.add(customerRequestDTO.getCustomerId());
         try {
             if (customerRequestDTO != null) {
-                // delete
+
+                if (customerListMappingRepository.findAllCustomerListMapping(listId, customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId()).size() > 0) {
+                    // delete
 //                customerRepository.deleteById(customerDTO.getCustomerId());
-                customerListMappingRepository.deleteMappingByCustomerId(customerRequestDTO.getCustomerId(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId());
+                    customerListMappingRepository.deleteMappingByCustomerId(customerRequestDTO.getCustomerId(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId());
 
-                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+                }
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
@@ -761,6 +774,7 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO) {
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes((long) searchCustomerRequestDTO.getTimezoneOffset());
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
@@ -801,7 +815,7 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append("  AND a.STATUS = 1");
             sb.append("  AND a.COMPANY_SITE_ID = :p_company_site_id");
 
-            sb.append(" AND to_date(CREATE_AT, 'DD-MM-RR') >= to_date(:p_date_from, 'YYYYMMDD') AND to_date(CREATE_AT, 'DD-MM-RR') <= to_date(:p_date_to, 'YYYYMMDD')");
+            sb.append(" AND CREATE_AT >= to_date(:p_date_from, 'DD/MM/YYYY HH24:MI:SS') AND CREATE_AT <= to_date(:p_date_to, 'DD/MM/YYYY HH24:MI:SS')");
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListCode())) {
                 sb.append(" AND UPPER(CUSTOMER_LIST_CODE) LIKE UPPER(:p_list_code)");
@@ -815,8 +829,8 @@ public class CustomerServiceImpl implements CustomerService {
             SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_company_site_id", searchCustomerRequestDTO.getCompanySiteId());
-            query.setParameter("p_date_from", searchCustomerRequestDTO.getConvertedDateFrom());
-            query.setParameter("p_date_to", searchCustomerRequestDTO.getConvertedDateTo());
+            query.setParameter("p_date_from", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",searchCustomerRequestDTO.getConvertedDateFrom()), tzClient));
+            query.setParameter("p_date_to", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",searchCustomerRequestDTO.getConvertedDateTo()), tzClient));
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListCode())) {
                 query.setParameter("p_list_code", "%" +
@@ -864,6 +878,10 @@ public class CustomerServiceImpl implements CustomerService {
 
             List<CustomerListDTO> data = query.list();
             Page<CustomerListDTO> dataPage = new PageImpl<>(data, pageable, count);
+            dataPage.forEach(item -> {
+                item.setCreateAt(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getCreateAt(),tzClient)));
+                item.setUpdateAt(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getUpdateAt(),tzClient)));
+            });
             resultDTO.setData(dataPage);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -950,6 +968,7 @@ public class CustomerServiceImpl implements CustomerService {
         StringBuilder sb = new StringBuilder();
         int failedCount = 0;
         XSSFWorkbook workbook = null;
+        boolean isMainPhoneNull = false, isSecondPhoneNull = false, isEmailNull = false;
         try {
 
             //<editor-fold desc="Khởi tạo mảng header tĩnh" defaultstate="collapsed">
@@ -975,7 +994,7 @@ public class CustomerServiceImpl implements CustomerService {
             FileInputStream fis = new FileInputStream(file);
             workbook = new XSSFWorkbook(fis);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
-            Sheet sheet = workbook.getSheetAt(0);
+            XSSFSheet sheet = workbook.getSheetAt(0);
             Row row = sheet.getRow(3);
 
             //<editor-fold desc="Tạo style cho cột kết quả" defaultstate="collapsed">
@@ -988,15 +1007,42 @@ public class CustomerServiceImpl implements CustomerService {
             resultStyle.setBorderRight(BorderStyle.THIN);
             resultStyle.setBorderBottom(BorderStyle.THIN);
             resultStyle.setBorderTop(BorderStyle.THIN);
+            resultStyle.setAlignment(HorizontalAlignment.CENTER);
+            resultStyle.setVerticalAlignment(VerticalAlignment.CENTER);
             //</editor-fold>
 
             //<editor-fold desc="Kiểm tra header của template" defaultstate="collapsed">
-            for (int i = 0; i < header.size(); i++) {
-                Cell cell = row.getCell(i);
-                if (!cell.getStringCellValue().equals(header.get(i).getTitle().split("#")[0])) {
-                    result.put("content", Files.readAllBytes(file.toPath()));
-                    result.put("message", "template-invalid");
-                    return result;
+            if (row.getPhysicalNumberOfCells() > header.size()) {
+                for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) {
+                    if (sheet.isColumnHidden(i)) {
+                        sheet.setColumnHidden(i, false);
+                    }
+                    if (isColumnNullOrBlank(sheet, i)) {
+                        sheet.shiftColumns(i + 1, i + 1, -1);
+                        sheet.removeMergedRegion(0);
+                        sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 13));
+                    }
+                }
+                for (int i = 0; i < header.size(); i++) {
+                    Cell cell = row.getCell(i);
+                    if (!cell.getStringCellValue().equals(header.get(i).getTitle().split("#")[0])) {
+                        result.put("content", Files.readAllBytes(file.toPath()));
+                        result.put("message", "template-invalid");
+                        return result;
+                    }
+                }
+            } else if (row.getPhysicalNumberOfCells() < header.size()) {
+                result.put("content", Files.readAllBytes(file.toPath()));
+                result.put("message", "template-invalid");
+                return result;
+            } else {
+                for (int i = 0; i < header.size(); i++) {
+                    Cell cell = row.getCell(i);
+                    if (!cell.getStringCellValue().equals(header.get(i).getTitle().split("#")[0])) {
+                        result.put("content", Files.readAllBytes(file.toPath()));
+                        result.put("message", "template-invalid");
+                        return result;
+                    }
                 }
             }
             //</editor-fold>
@@ -1009,14 +1055,17 @@ public class CustomerServiceImpl implements CustomerService {
                 result.put("content", Files.readAllBytes(file.toPath()));
                 return result;
             } else {
-                Cell resultCell = sheet.getRow(3).createCell(sheet.getRow(3).getPhysicalNumberOfCells());
+                Cell resultCell = sheet.getRow(3).getCell(header.size());
+                if (resultCell == null) {
+                    resultCell = sheet.getRow(3).createCell(header.size());
+                }
                 resultCell.setCellValue(BundleUtils.getLangString("customer.result", locale));
                 resultCell.setCellStyle(resultStyle);
             }
             //</editor-fold>
 
             //<editor-fold desc="Đọc dữ liệu từng dòng 1" defaultstate="collapsed">
-            for (int i = 4; i < sheet.getPhysicalNumberOfRows(); i++) {
+            for (int i = 4; i <= sheet.getPhysicalNumberOfRows(); i++) {
                 Row dataRow = sheet.getRow(i);
                 if (dataRow != null) {
                     Object[] obj = new Object[row.getPhysicalNumberOfCells() - 1];
@@ -1050,34 +1099,43 @@ public class CustomerServiceImpl implements CustomerService {
                         sb.append(str);
                     }
                 } else sb.append(BundleUtils.getLangString("customer.nameRequired", locale));
-                if (rawDataList.get(i).length > 4
-                        && rawDataList.get(i)[2] != null
-                        && !rawDataList.get(i)[2].toString().trim().equals("")
-                        && rawDataList.get(i)[3] != null
-                        && !rawDataList.get(i)[3].toString().trim().equals("")
-                        && rawDataList.get(i)[4] != null
-                        && !rawDataList.get(i)[4].toString().trim().equals("")) {
-                    String str = validatePhone(rawDataList.get(i)[2].toString().trim(), locale);
-                    str += (validateLength(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0], rawDataList.get(i)[3].toString(), 50, locale));
-                    if (!validateEmail(rawDataList.get(i)[4].toString().trim())) {
-                        str += (BundleUtils.getLangString("customer.emailInvalid", locale));
+                if (rawDataList.get(i).length > 4 && (rawDataList.get(i)[2] == null || rawDataList.get(i)[2].toString().trim().equals(""))) {
+                    isMainPhoneNull = true;
+                } else {
+                    if (validateNumberOnly(rawDataList.get(i)[2].toString().trim())) {
+                        sb.append(validateExistPhone(rawDataList.get(i)[2].toString().trim(), locale));
                     } else {
-                        str += (validateDuplicateEmail(rawDataList.get(i)[4].toString().trim(), locale));
+                        sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
                     }
-                    sb.append(validateLength(BundleUtils.getLangString("customer.email", locale).split("#")[0], rawDataList.get(i)[4].toString(), 50, locale));
-                    sb.append(str);
+                }
+                if (rawDataList.get(i).length > 4 && (rawDataList.get(i)[3] == null || rawDataList.get(i)[3].toString().trim().equals(""))) {
+                    isSecondPhoneNull = true;
                 } else {
-                    if (rawDataList.get(i).length > 2 && rawDataList.get(i)[2] == null) {
-                        sb.append(BundleUtils.getLangString("customer.mainPhoneRequired", locale));
-                    } else if (rawDataList.get(i).length > 3 && rawDataList.get(i)[3] == null) {
-                        sb.append(BundleUtils.getLangString("customer.secondPhoneRequired", locale));
-                    } else if (rawDataList.get(i).length > 4 && rawDataList.get(i)[4] == null) {
-                        sb.append(BundleUtils.getLangString("customer.emailRequired", locale));
+                    if (validateNumberOnly(rawDataList.get(i)[3].toString().trim())) {
+                        sb.append(validateLength(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0], rawDataList.get(i)[3].toString(), 50, locale));
+                    } else {
+                        sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
+                    }
+                }
+                if (rawDataList.get(i).length > 4 && (rawDataList.get(i)[4] == null || rawDataList.get(i)[4].toString().trim().equals(""))) {
+                    isEmailNull = true;
+                } else {
+                    if (!validateEmail(rawDataList.get(i)[4].toString().trim())) {
+                        sb.append(BundleUtils.getLangString("customer.emailInvalid", locale));
+                    } else {
+                        sb.append(validateDuplicateEmail(rawDataList.get(i)[4].toString().trim(), locale));
+                        sb.append(validateLength(BundleUtils.getLangString("customer.email", locale).split("#")[0], rawDataList.get(i)[4].toString(), 50, locale));
                     }
                 }
+                if (isEmailNull && isMainPhoneNull && isSecondPhoneNull) {
+                    sb.append(BundleUtils.getLangString("customer.invalidRecord", locale));
+                }
                 if (rawDataList.get(i).length > 5 && rawDataList.get(i)[5] != null) {
                     sb.append(validateLength(BundleUtils.getLangString("customer.address", locale).split("#")[0], rawDataList.get(i)[5].toString(), 500, locale));
                 }
+                if (rawDataList.get(i).length > 6 && rawDataList.get(i)[6] != null) {
+                    sb.append(validateCusType(rawDataList.get(i)[6].toString().trim(), locale));
+                }
                 if (rawDataList.get(i).length > 7 && rawDataList.get(i)[7] != null) {
                     sb.append(validateLength(BundleUtils.getLangString("customer.companyName", locale).split("#")[0], rawDataList.get(i)[7].toString(), 100, locale));
                 }
@@ -1104,6 +1162,9 @@ public class CustomerServiceImpl implements CustomerService {
                     resultCell.setCellValue("Ok");
                 }
                 sb = new StringBuilder();
+                isEmailNull = false;
+                isMainPhoneNull = false;
+                isSecondPhoneNull = false;
             }
             //</editor-fold>
 
@@ -1114,8 +1175,12 @@ public class CustomerServiceImpl implements CustomerService {
                     c.setName(rawDataList.get(i)[1].toString().trim());
                     c.setSiteId(userSession.getSiteId());
                     c.setCode(null);
-                    c.setDescription(rawDataList.get(i)[8].toString().trim());
-                    c.setCompanyName(rawDataList.get(i)[7].toString().trim());
+                    if (rawDataList.get(i).length > 8 && rawDataList.get(i)[8] != null && !rawDataList.get(i)[8].toString().trim().equals("")) {
+                        c.setDescription(rawDataList.get(i)[8].toString().trim());
+                    }
+                    if (rawDataList.get(i).length > 7 && rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals("")) {
+                        c.setCompanyName(rawDataList.get(i)[7].toString().trim());
+                    }
                     c.setCustomerImg(null);
                     c.setCreateDate(new Date());
                     c.setUpdateDate(null);
@@ -1123,7 +1188,9 @@ public class CustomerServiceImpl implements CustomerService {
                     c.setCreateBy(userSession.getUserName());
                     c.setUpdateBy(null);
                     c.setGender((short) 1);
-                    c.setCurrentAddress(rawDataList.get(i)[5].toString().trim());
+                    if (rawDataList.get(i).length > 5 && rawDataList.get(i)[5] != null && !rawDataList.get(i)[5].toString().trim().equals("")) {
+                        c.setCurrentAddress(rawDataList.get(i)[5].toString().trim());
+                    }
 //                    c.setPlaceOfBirth();
 //                    c.setDateOfBirth();
                     c.setMobileNumber(null);
@@ -1279,14 +1346,15 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     //<editor-fold desc="Validate Methods" defaultstate="collapsed">
-    private String validatePhone(String str, Locale locale) {
+    private String validateExistPhone(String str, Locale locale) {
         String result = "";
         String[] arr = str.split(";");
+        List<CustomerContact> contactList;
         if (str.length() > 50) {
             result = BundleUtils.getLangString("customer.phoneMax50", locale);
         }
         for (int i = 0; i < arr.length; i++) {
-            List<CustomerContact> contactList = customerContactRepository.findCustomerContactsByContactEquals(arr[i]);
+            contactList = customerContactRepository.findCustomerContactsByContactEquals(arr[i]);
             if (contactList.size() != 0) {
                 return result.concat(BundleUtils.getLangString("customer.phoneExists", locale));
             }
@@ -1294,11 +1362,24 @@ public class CustomerServiceImpl implements CustomerService {
         return result;
     }
 
+    private boolean validateNumberOnly(String str) {
+        String regexp = "\\b\\d+\\b";
+        String[] arr = str.split(";");
+        int count = 0;
+        for (int i = 0; i < arr.length; i++) {
+            if (!arr[i].matches(regexp)) {
+                count++;
+            }
+        }
+        return count == 0;
+    }
+
     private String validateDuplicateEmail(String str, Locale locale) {
         String result = "";
         String[] arr = str.split(";");
+        List<CustomerContact> contactList;
         for (int i = 0; i < arr.length; i++) {
-            List<CustomerContact> contactList = customerContactRepository.findCustomerContactsByContactEquals(arr[i]);
+            contactList = customerContactRepository.findCustomerContactsByContactEquals(arr[i]);
             if (contactList.size() != 0) {
                 return result.concat(BundleUtils.getLangString("customer.emailExists", locale));
             }
@@ -1328,19 +1409,43 @@ public class CustomerServiceImpl implements CustomerService {
 
     private boolean validateEmail(String str) {
         String[] arr = str.split(";");
-        String regexp = "^[\\w-_\\.+]*[\\w-_\\.]\\@([\\w]+\\.)+[\\w]+[\\w]$";
         for (int i = 0; i < arr.length; i++) {
-            if (!arr[i].matches(regexp)) {
+            Matcher matcher = EMAIL_REGEXP.matcher(arr[i]);
+            if (!matcher.matches()) {
                 return false;
             }
         }
         return true;
     }
 
+    private String validateCusType(String str, Locale locale) {
+        String[] arr = {BundleUtils.getLangString("customer.cusType.normal", locale),
+                BundleUtils.getLangString("customer.cusType.vip", locale),
+                BundleUtils.getLangString("customer.cusType.blacklist", locale)};
+        List<String> cusTypes = Arrays.asList(arr);
+        if (cusTypes.contains(str.trim())) {
+            return "";
+        } else {
+            return BundleUtils.getLangString("customer.cusTypeInvalid", locale);
+        }
+    }
+
     private boolean validateLetter(String str) {
         String regexp = "@\"^\\p{L}+$\"";
         return str.matches(regexp);
     }
+
+    private boolean isColumnNullOrBlank(Sheet sheet, int columnIndex) {
+        for (Row row : sheet) {
+            if (row.getRowNum() < 3) continue;
+            Cell cell = row.getCell(columnIndex, Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
+            if (cell != null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     //</editor-fold>
 
     @Override
@@ -1381,10 +1486,14 @@ public class CustomerServiceImpl implements CustomerService {
             headerFont.setBold(true);
             CellStyle headerStyle = workbook.createCellStyle();
             CellStyle importantStyle = workbook.createCellStyle();
+            CellStyle columnStyle = workbook.createCellStyle();
             importantStyle.setFont(importantFont);
             headerStyle.setAlignment(HorizontalAlignment.CENTER);
             headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
             headerStyle.setFont(headerFont);
+            columnStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+            columnStyle.setAlignment(HorizontalAlignment.CENTER);
+            columnStyle.setWrapText(true);
             //</editor-fold>
 
             //<editor-fold desc="Thêm combobox" defaultstate="collapsed">
@@ -1457,6 +1566,7 @@ public class CustomerServiceImpl implements CustomerService {
             cell2.setCellStyle(importantStyle);
             cell2.setCellValue(BundleUtils.getLangString("customer.notice", locale));
             for (int i = 0; i < header.size(); i++) {
+                sheet.setDefaultColumnStyle(i, columnStyle);
                 Cell headerCell = row3.createCell(i);
                 headerCell.setCellValue(header.get(i).getTitle().split("#")[0]);
                 headerStyle.setBorderTop(BorderStyle.THIN);
@@ -1869,8 +1979,8 @@ public class CustomerServiceImpl implements CustomerService {
                     {"-5", "Địa chỉ", "text"},
                     {"-6", "Nơi sinh", "text"},
                     {"-7", "Ngày sinh", "date"},
-                    {"-8", "Số điện thoại", "number"},
-                    {"-9", "email", "text"},
+                    {"-8", "Số điện thoại", "text"},
+                    {"-9", "Email", "text"},
                     {"-10", "Tên đăng nhập", "text"},
                     {"-11", "Loại Khách hàng", "combobox"},
             };
@@ -1923,41 +2033,42 @@ public class CustomerServiceImpl implements CustomerService {
         try {
             StringBuilder sb = new StringBuilder();
 
-            sb.append("select c.customer_id customerId,");
+            sb.append("select distinct c.customer_id customerId,");
             sb.append("    C.NAME name,");
-            sb.append("    a.mobile mobileNumber,");
-            sb.append("    b.Email email,");
+            sb.append("    cc.CONTACT mobileNumber,");
+            sb.append("    cc2.CONTACT email,");
             sb.append("    c.customer_type customerType,");
             sb.append("    C.COMPANY_NAME companyName,");
             sb.append("    c.current_address currentAddress,");
             sb.append("    c.Description description");
             sb.append("    FROM CUSTOMER C");
             sb.append("         inner join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY ");
-            sb.append(" NULL) AS MOBILE");
+            sb.append(" NULL) AS CONTACT");
             sb.append("               FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 AND STATUS = 1 GROUP BY ");
-            sb.append(" CUSTOMER_ID) a on c.CUSTOMER_ID = a.CUSTOMER_ID");
+            sb.append(" CUSTOMER_ID) cc on c.CUSTOMER_ID = cc.CUSTOMER_ID");
             sb.append("         inner join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY ");
-            sb.append(" NULL) AS EMAIL");
+            sb.append(" NULL) AS CONTACT");
             sb.append("               FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 AND STATUS = 1 GROUP BY ");
-            sb.append(" CUSTOMER_ID) b on b.CUSTOMER_ID = c.CUSTOMER_ID ");
+            sb.append(" CUSTOMER_ID) cc2 on cc2.CUSTOMER_ID = c.CUSTOMER_ID ");
 //            sb.append("  INNER JOIN CUSTOMER_contact cc ON (C.CUSTOMER_ID = Cc.customer_id " +
 //                    "and cc.status = 1 and cc.contact_type = 5)");
 //            sb.append("   INNER JOIN CUSTOMER_contact Cc2 ON (C.CUSTOMER_ID = Cc2.customer_id and cc2.status = 1 and cc2.contact_type = 2)");
             sb.append("inner join customize_field_object cfo on c.customer_id = cfo.object_id and cfo.status = 1");
             sb.append("  AND C.STATUS = 1");
             sb.append("   AND C.customer_id not in (select customer_id from campaign_customer where campaign_id = :p_campaign_id) ");
+            sb.append(" where 1 = 1 ");
 
             List<CustomerQueryDTO> customerDTOList = campaignCustomerDTO.getListQuery();
             if (customerDTOList.get(0).getField() > 0) {// field dong
                 switch (customerDTOList.get(0).getType()) {
                     case "combobox":
-                        sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.field_option_value_id " + customerDTOList.get(0).getOperator() + "" + customerDTOList.get(0).getCondition() + ")");
+                        sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.field_option_value_id " + customerDTOList.get(0).getOperator() + " " + customerDTOList.get(0).getCondition() + ")");
                         break;
                     case "text":
                         if ("like".equals(customerDTOList.get(0).getOperator()) || "not like".equals(customerDTOList.get(0).getOperator())) {
-                            sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '%" + customerDTOList.get(0).getCondition().trim() + "%')");
+                            sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '%" + customerDTOList.get(0).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "%')");
                         } else {
-                            sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '" + customerDTOList.get(0).getCondition().trim() + "')");
+                            sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '" + customerDTOList.get(0).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "')");
                         }
                         break;
                     case "date":
@@ -1972,7 +2083,9 @@ public class CustomerServiceImpl implements CustomerService {
                 }
             } else {// field tinh
                 if ("like".equals(customerDTOList.get(0).getOperator()) || "not like".equals(customerDTOList.get(0).getOperator())) {
-                    sb.append("and (" + requestCustomer.get(customerDTOList.get(0).getField().toString()) + " " + customerDTOList.get(0).getOperator() + " '%" + customerDTOList.get(0).getCondition() + "%')");
+                    sb.append("and (" + requestCustomer.get(customerDTOList.get(0).getField().toString()) + " " + customerDTOList.get(0).getOperator() + " '%" + customerDTOList.get(0).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "%')");
+                } else if (customerDTOList.get(0).getField() == -8 || customerDTOList.get(0).getField() == -9) {
+                    sb.append("and (" + requestCustomer.get(customerDTOList.get(0).getField().toString()) + " " + ("=".equals(customerDTOList.get(0).getOperator()) ? "like " : "not like") + " '%" + customerDTOList.get(0).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "%')");
                 } else {
                     sb.append("and (" + requestCustomer.get(customerDTOList.get(0).getField().toString()) + " " + customerDTOList.get(0).getOperator() + " " + customerDTOList.get(0).getCondition() + ")");
                 }
@@ -1981,15 +2094,20 @@ public class CustomerServiceImpl implements CustomerService {
                 if (customerDTOList.get(i).getField() < 0) {
                     if ("like".equals(customerDTOList.get(i).getOperator()) || "not like".equals(customerDTOList.get(i).getOperator())) {
 //                        sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(i).getField() + " and cfo.value_text " + customerDTOList.get(i).getOperator() + " '%" + customerDTOList.get(i).getCondition() + "%')");
-                        sb.append(" " + customerDTOList.get(i).getJoin() + "  "
+                        sb.append(" " + customerDTOList.get(i).getJoin() + "  ("
                                 + requestCustomer.get(customerDTOList.get(i).getField().toString()) + "  "
                                 + customerDTOList.get(i).getOperator() + "  "
-                                + "'%" + customerDTOList.get(i).getCondition().trim() + "%'  ");
+                                + "'%" + customerDTOList.get(i).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "%'  )");
+                    } else if (customerDTOList.get(i).getField() == -8 || customerDTOList.get(i).getField() == -9) {
+                        sb.append(" " + customerDTOList.get(i).getJoin() + "  ("
+                                + requestCustomer.get(customerDTOList.get(i).getField().toString()) + "  "
+                                + ("=".equals(customerDTOList.get(i).getOperator()) ? "like" : "not like") + "  '%"
+                                + customerDTOList.get(i).getCondition().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "%'  )");
                     } else {
-                        sb.append(" " + customerDTOList.get(i).getJoin() + "  "
+                        sb.append(" " + customerDTOList.get(i).getJoin() + "  ("
                                 + requestCustomer.get(customerDTOList.get(i).getField().toString()) + "  "
                                 + customerDTOList.get(i).getOperator() + "  "
-                                + customerDTOList.get(i).getCondition() + "  ");
+                                + customerDTOList.get(i).getCondition() + "  )");
                     }
                 } else {
                     switch (customerDTOList.get(i).getType()) {
@@ -1998,9 +2116,9 @@ public class CustomerServiceImpl implements CustomerService {
                             break;
                         case "text":
                             if ("like".equals(customerDTOList.get(i).getOperator()) || "not like".equals(customerDTOList.get(i).getOperator())) {
-                                sb.append(customerDTOList.get(i).getJoin() + " (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '%" + customerDTOList.get(0).getCondition().trim() + "%')");
+                                sb.append(customerDTOList.get(i).getJoin() + " (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '%" + customerDTOList.get(0).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "%')");
                             } else {
-                                sb.append(customerDTOList.get(i).getJoin() + " (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '" + customerDTOList.get(0).getCondition().trim() + "')");
+                                sb.append(customerDTOList.get(i).getJoin() + " (cfo.customize_fields_id =" + customerDTOList.get(0).getField() + " and cfo.value_text " + customerDTOList.get(0).getOperator() + " '" + customerDTOList.get(0).getCondition().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_") + "')");
                             }
 //                            sb.append("and (cfo.customize_fields_id =" + customerDTOList.get(i).getField() + " and cfo.value_text " + customerDTOList.get(i).getOperator() + " %'" + customerDTOList.get(i).getCondition() + "%')");
                             break;
@@ -2045,7 +2163,7 @@ public class CustomerServiceImpl implements CustomerService {
                 query.setMaxResults(pageable.getPageSize());
             }
 
-            List<CustomerDTO>data = query.list();
+            List<CustomerDTO> data = query.list();
             Page<CustomerDTO> dataPage = new PageImpl<>(data, pageable, count);
             resultDTO.setData(dataPage);
             resultDTO.setTotalRow(count);

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

@@ -69,6 +69,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         ResultDTO resultDTO = new ResultDTO();
         List<ScenarioAnswerDTO> lstAnswers = new ArrayList<>();
         List<ScenarioAnswer> lstAnswersToInsert = new ArrayList<>();
+        scenarioQuestionDTO.setQuestion(scenarioQuestionDTO.getQuestion().trim());
         try {
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
 
@@ -83,6 +84,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                     item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
                     item.setCreateTime(new Date());
                     item.setStatus((short) 1);
+                    item.setAnswer(item.getAnswer().trim());
                     ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                     lstAnswersToInsert.add(answer);
                 });

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

@@ -461,6 +461,12 @@ public class ScenarioServiceImpl implements ScenarioService {
         return result;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public List<ContactQuestResult> getContactQuestResult(Long companySiteId, Long campaignId, Long customerId) {
+        return questResultRepository.findByCompanySiteIdAndCampaignIdAndCustomerId(companySiteId, campaignId, customerId);
+    }
+
     private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
         if (mappingQuestion != null && mappingQuestion.equals(currentQuestionCode)) return false;
 

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

+/*
+ * 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.
+ */
+package com.viettel.campaign.utils;
+
+import org.apache.log4j.Logger;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+/**
+ *
+ * @author phamky
+ */
+public class TimeZoneUtils {
+
+    private static Long getTimeZone(TimeZone tz) {
+        return TimeUnit.MILLISECONDS.toHours(tz.getRawOffset());
+    }
+
+    private static Long getTimeZoneToMinutes(TimeZone tz) {
+        return TimeUnit.MILLISECONDS.toMinutes(tz.getRawOffset());
+    }
+
+    public static String toQueryTimeZoneZero(Date date){
+        String dateStr = toDateStringWithTimeZoneZero(date);
+        return "to_date( '"+dateStr+"', 'DD/MM/YYYY HH24:MI:SS')";
+    }
+
+    public static String changeTimeZoneString(String dateStr, TimeZone tz){
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+            Date date = sdf.parse(dateStr);
+            sdf.setTimeZone(tz);
+            return sdf.format(date);
+
+        } catch (ParseException ex) {
+        }
+        return "";
+    }
+
+    public static String changeTimeZoneStringPattern(String dateStr, TimeZone tz, String pattern){
+        try {
+            SimpleDateFormat sdf1 = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+            Date date = sdf1.parse(dateStr);
+            SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+            sdf.setTimeZone(tz);
+            return sdf.format(date);
+
+        } catch (ParseException ex) {
+        }
+        return "";
+    }
+
+    public static String toDateStringWithTimeZoneZero(Date date){
+        TimeZone tz = getZone(0l);
+        return toDateStringWithTimeZone(date, tz);
+    }
+
+    public static String toDateStringWithTimeZonePattern(Date date, long tz, String pattern){
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        sdf.setTimeZone(getZone(tz));
+        return sdf.format(date);
+    }
+
+//    public static String toHourStringWithTimeZonePattern(Long hour, long tz){
+//        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+//        sdf.setTimeZone(getZone(tz));
+//        return sdf.format(date);
+//    }
+
+
+    public static String toDateStringWithTimeZonePattern(Date date, TimeZone tz, String pattern){
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        sdf.setTimeZone(tz);
+        return sdf.format(date);
+    }
+
+
+    public static String toDateStringWithTimeZone(Date date, TimeZone tz){
+        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        sdf.setTimeZone(tz);
+        return sdf.format(date);
+    }
+
+    public static TimeZone getZone(Long timeZone){
+        if(timeZone == null){
+            //timezone is null, return default
+            return TimeZone.getDefault();
+        }
+        String[] ids = TimeZone.getAvailableIDs();
+        for (String id : ids) {
+            TimeZone tz = TimeZone.getTimeZone(id);
+            if(getTimeZone(tz).equals(timeZone)){
+                //zone need change
+                return tz;
+            }
+        }
+        return TimeZone.getDefault();
+    }
+
+    public static TimeZone getZoneMinutes(Long timeZone){
+        if(timeZone == null){
+            //timezone is null, return default
+            return TimeZone.getDefault();
+        }
+        String[] ids = TimeZone.getAvailableIDs();
+        for (String id : ids) {
+            TimeZone tz = TimeZone.getTimeZone(id);
+            if(getTimeZoneToMinutes(tz).equals(timeZone)){
+                //zone need change
+                return tz;
+            }
+        }
+        return TimeZone.getDefault();
+    }
+
+    public static Date changeTimeZone(Date date, Long timeZone){
+        if(timeZone == null){
+            //timezone is null, do not change timezone
+            return date;
+        }
+        String[] ids = TimeZone.getAvailableIDs();
+        for (String id : ids) {
+            TimeZone tz = TimeZone.getTimeZone(id);
+            if(getTimeZone(tz).equals(timeZone)){
+                //zone need change
+
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                df.setTimeZone(tz);
+                try {
+                    SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    Date newDate = df2.parse(df.format(date));
+                    System.out.println(df2.format(newDate));
+                    return newDate;
+                } catch (ParseException ex) {
+                }
+            }
+        }
+        return date;
+    }
+
+    public static void main(String args[]){
+        Date date = new Date();
+        System.out.println(changeTimeZone(date, -6l));
+        System.out.println(changeTimeZone(date, 0l));
+
+        System.out.println(getZone(0l));
+    }
+
+}

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

@@ -66,4 +66,7 @@ public class CampaignDTO extends BaseDTO {
     private String sessionId;
     private Long numOfInteractedCus;
     private Long numOfNotInteractedCus;
+
+    //timezone to get true date
+    private Double timezone;
 }

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

@@ -14,7 +14,7 @@ public class ContactCustResultDTO extends BaseDTO {
     private Long contactCustResultId;
     private Long companySiteId;
     private Short callStatus;
-    private String contactStatus;
+    private Short contactStatus;
     private Short status;
     private Integer satisfaction;
     private String description;
@@ -52,7 +52,9 @@ public class ContactCustResultDTO extends BaseDTO {
     private String campaignCode;
     private String userName;
     private String surveyStatus;
+    private String connectStatus;
     private Boolean enableEdit;
 
     private Integer totalRow;
+    private String eventCall;
 }

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class CustomerTimeDTO extends BaseDTO {
+    private Long customerTimeId;
+    private Long companySiteId;
+    private Long customerId;
+    private Date startTime;
+    private Date endTime;
+    private Short status;
+    private Date createTime;
+    private Date updateTime;
+    private Long createBy;
+    private Long updateBy;
+    private Long contactCustResultId;
+
+    private String completeValue;
+}

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

@@ -10,4 +10,5 @@ public class CampaignCfgRequestDTO {
     List<Long> listId;
     Long companySiteId;
     Long campaignCompleteCodeID;
+    String completeValue;
 }

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

@@ -12,4 +12,5 @@ public class SearchCustomerRequestDTO extends BaseDTO {
     String convertedDateFrom;
     String convertedDateTo;
     String companySiteId;
+    Integer timezoneOffset;
 }

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

@@ -82,4 +82,12 @@ public class AgentsController {
         result = agentsService.createMultipleCampaignAgent(campaignAgentRequestDTO);
         return result;
     }
+
+    @PostMapping("/updateAgent")
+    @ResponseBody
+    public ResultDTO updateAgent(@RequestBody @Valid CampaignAgentDTO requestDTO) {
+        ResultDTO result = new ResultDTO();
+        result = agentsService.updateAgent(requestDTO);
+        return result;
+    }
 }

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

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.CampaignCfgDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CampaignCfgService;
 import com.viettel.campaign.web.dto.request_dto.CampaignCfgRequestDTO;
+import com.viettel.econtact.filter.UserSession;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.Map;
 
@@ -38,13 +41,16 @@ public class CampaignCfgController {
 
     @PostMapping("/create")
     @ResponseBody
-    public ResultDTO createCompleteCode(@RequestBody @Valid CampaignCfgDTO completeCodeDTO) {
+    public ResultDTO createCompleteCode(@RequestBody @Valid CampaignCfgDTO completeCodeDTO , HttpServletRequest httpServletRequest) {
+        String xAuthToken = httpServletRequest.getHeader("X-Auth-Token");
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+
         ResultDTO result = new ResultDTO();
         //LogUtil logUtil = new LogUtil();
         //logUtil.initKpiLog("createCust")
         try {
             //LOGGER.info("Returning createCustomer: start");
-            result = completeCodeService.createCompleteCode(completeCodeDTO);
+            result = completeCodeService.createCompleteCode(completeCodeDTO, userSession.getUserId());
             //LOGGER.info("Returning createCustomer:" + result.getErrorCode());
             //logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
         } catch (Exception e) {

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

@@ -15,6 +15,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
@@ -205,6 +206,13 @@ public class CampaignController {
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
+    @PostMapping("/getCountIndividualOnList")
+    @ResponseBody
+    public ResponseEntity getCountIndividualOnList(@RequestBody CampaignRequestDTO campaignRequestDTO) {
+        ResultDTO resultDTO = campaignService.getCountIndividualOnList(campaignRequestDTO);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
     @PostMapping("/saveCustomerCampaign")
     @ResponseBody
     public ResponseEntity saveCustomerCampaign(@RequestBody CampaignRequestDTO campaignRequestDTO) {

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

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.model.ccms_full.ContactQuestResult;
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
@@ -25,7 +24,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/ipcc/campaign/execute")
-@CrossOrigin
+//@CrossOrigin
 public class CampaignExecuteController {
 
     private static final Logger logger = LoggerFactory.getLogger(CampaignController.class);
@@ -35,9 +34,15 @@ public class CampaignExecuteController {
 
     @PostMapping("/searchCampaignExecute")
     @ResponseBody
-    public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto, HttpServletRequest request) {
-        String xAuthToken = request.getHeader("X-Auth-Token");
-        ResultDTO result = campaignExecuteService.searchCampaignExecute(requestDto, xAuthToken);
+    public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
+        ResultDTO result = campaignExecuteService.searchCampaignExecute(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/checkExecuteCampaign")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> checkExecuteCampaign(@RequestBody CampaignRequestDTO requestDto) {
+        ResultDTO result = campaignExecuteService.checkExecuteCampaign(requestDto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -69,13 +74,6 @@ public class CampaignExecuteController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @PostMapping("/getCallStatus")
-    @ResponseBody
-    public ResponseEntity<ResultDTO> getCallStatus(@RequestBody CampaignRequestDTO requestDto) {
-        ResultDTO result = campaignExecuteService.getCallStatus(requestDto);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
     @GetMapping("/countRecallCustomer")
     @ResponseBody
     public ResponseEntity countRecallCustomer(@RequestParam("companySiteId") Long companySiteId, @RequestParam("agentId") Long agentId) {
@@ -90,6 +88,13 @@ public class CampaignExecuteController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @PostMapping("/getLogoutContactResult")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getLogoutContactResult(@RequestBody ReceiveCustLogDTO requestDto) {
+        ResultDTO result = campaignExecuteService.getLogoutContactResult(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @PostMapping("/searchInteractiveResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) throws Exception {
@@ -136,12 +141,12 @@ public class CampaignExecuteController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @PostMapping("/callCustomer")
+    @PostMapping("/updateContactCustResult")
     @ResponseBody
-    public ResponseEntity<ResultDTO> callCustomer(@RequestBody ContactCustResultDTO requestDto, HttpServletRequest request) {
+    public ResponseEntity<ResultDTO> updateContactCustResult(@RequestBody ContactCustResultDTO requestDto, HttpServletRequest request) {
         String xAuthToken = request.getHeader("X-Auth-Token");
         UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
-        ResultDTO result = campaignExecuteService.callCustomer(requestDto, userSession);
+        ResultDTO result = campaignExecuteService.updateContactCustResult(requestDto, userSession);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -166,11 +171,19 @@ public class CampaignExecuteController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @PostMapping("/createListContactQuestResult")
+    @PutMapping("/createListContactQuestResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> createListContactQuestResult(@RequestBody List<ContactQuestResultDTO> dtoList) {
         ResultDTO result = null;
-        result = campaignExecuteService.createListContacQuestResult(dtoList);
+        result = campaignExecuteService.createListContactQuestResult(dtoList);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PutMapping("/updateListContactQuestResult")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> updateListContactQuestResult(@RequestBody ContactQuestResultDTO dto) {
+        ResultDTO result = null;
+        result = campaignExecuteService.updateListContactQuestResult(dto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -187,4 +200,29 @@ public class CampaignExecuteController {
         ResultDTO result = campaignExecuteService.getContactCustResultById(contactCustResultId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @PostMapping("/draftAtTen")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> draftAtTen(@RequestBody ContactCustResultDTO requestDto, HttpServletRequest request) {
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+        ResultDTO result = campaignExecuteService.draftAtTen(requestDto, userSession);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/updateCampaignCustomer")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> updateCampaignCustomer(@RequestBody CampaignCustomerDTO requestDto) {
+        ResultDTO result = campaignExecuteService.updateCampaignCustomer(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/updateSurveyStatus")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> updateSurveyStatus(@RequestBody CustomerTimeDTO requestDto, HttpServletRequest request) {
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+        ResultDTO result = campaignExecuteService.updateSurveyStatus(requestDto, userSession);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }

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

@@ -37,7 +37,7 @@ import java.util.Map;
 @RequestMapping("/ipcc/customer")
 @CrossOrigin(origins = "*")
 public class CustomerController {
-    private CustomerQueryRepository  customerQueryRepo;
+    private CustomerQueryRepository customerQueryRepo;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomerController.class);
 
@@ -76,9 +76,9 @@ public class CustomerController {
     @PostMapping("/delete")
     @ResponseBody
     public ResultDTO deleteCustomer(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
-        ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomer(customerRequestDTO);
-        return result;
+        ResultDTO resultDTO = new ResultDTO();
+        resultDTO = customerService.deleteCustomer(customerRequestDTO);
+        return resultDTO;
     }
 
     @PostMapping("/deleteIds")
@@ -198,11 +198,8 @@ public class CustomerController {
         try {
             UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
             if (file.isEmpty()) {
-                return new ResponseEntity<>("file-empty", HttpStatus.OK);
+                return new ResponseEntity<>("file-empty", HttpStatus.NO_CONTENT);
             }
-//            if (!Objects.equals(FilenameUtils.getExtension(file.getOriginalFilename()), Constants.FileType.xlsx)) {
-//                return new ResponseEntity<>("template-invalid", HttpStatus.OK);
-//            }
             String path = saveUploadFile(file);
             List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());
             Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, Long.parseLong(customerListId));
@@ -265,18 +262,15 @@ public class CustomerController {
     }
 
 
-
     private String saveUploadFile(MultipartFile file) {
         try {
             String currentTime = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss").format(new Date());
             String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "_" + currentTime + "." + FilenameUtils.getExtension(file.getOriginalFilename());
             byte[] content = file.getBytes();
-//            File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
             File uploadFolder = new File(Config.EXCEL_DIR);
             if (!uploadFolder.exists()) {
                 uploadFolder.mkdir();
             }
-//            Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
             Path path = Paths.get(Config.EXCEL_DIR, fileName);
             Files.write(path, content);
             return path.toString();
@@ -286,7 +280,7 @@ public class CustomerController {
         return null;
     }
 
-//    @GetMapping("/query")
+    //    @GetMapping("/query")
 //    public ResponseEntity<List<Customer>> query(@RequestParam(value = "search") String query) {
 //        List<Customer> things = customerQueryRepo.findAll(query);
 //        if (things.isEmpty()) {
@@ -294,16 +288,16 @@ public class CustomerController {
 //        }
 //        return ResponseEntity.ok(things);
 //    }
-    @GetMapping(path = "", produces = { MediaType.APPLICATION_JSON_VALUE })
+    @GetMapping(path = "", produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<List<Customer>> query(@RequestParam(value = "search") String query) {
         List<Customer> result = null;
         try {
-            result= customerService.searchByQuery(query);
-        }catch (IllegalArgumentException iae){
-            return  ResponseEntity.status(HttpStatus.BAD_REQUEST)
+            result = customerService.searchByQuery(query);
+        } catch (IllegalArgumentException iae) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
                     .body(result);
         }
-        return  ResponseEntity.status(HttpStatus.OK)
+        return ResponseEntity.status(HttpStatus.OK)
                 .body(result);
     }
 
@@ -316,7 +310,7 @@ public class CustomerController {
 
     @PostMapping("/searchIndividualCustomer")
     @ResponseBody
-    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO ) {
+    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO) {
         ResultDTO result = customerService.searchCustomizeFields(campaignCustomerDTO);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }

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

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.model.ccms_full.ContactQuestResult;
 import com.viettel.campaign.model.ccms_full.Scenario;
 import com.viettel.campaign.service.ScenarioService;
 import com.viettel.campaign.utils.BundleUtils;
@@ -36,7 +37,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/ipcc/campaign/scenario")
-@CrossOrigin
+@CrossOrigin(origins = "*")
 public class ScenarioController {
 
     private static final Logger logger = LoggerFactory.getLogger(ScenarioController.class);
@@ -147,4 +148,9 @@ public class ScenarioController {
         return null;
     }
 
+    @RequestMapping(value = "/getContactQuestResult", method = RequestMethod.GET)
+    public List<ContactQuestResult> getContactQuestResult(@RequestParam Long companySiteId, @RequestParam Long campaignId, @RequestParam Long customerId) {
+        return scenarioService.getContactQuestResult(companySiteId, campaignId, customerId);
+    }
+
 }

src/main/resources/i18n/language_en.properties

@@ -89,7 +89,9 @@ customer.yes = Yes
 customer.not = No
 customer.noData = Template empty
 customer.nameRequired = Full name required;
-customer.emailMax50 = Email must less than 50 character;
+customer.emailMax100=Email must less than 100 character;
+customer.invalidRecord=Invalid Record, required one more contact information;
+customer.onlyNumber=Phone contain number only;
 customer.importSuccess = Import Successful
 customer.importFailed = Import Failed
 customer.errorValidate = Error while validating
@@ -102,6 +104,7 @@ customer.importCustomer = IMPORT CUSTOMER
 customer.notice = Attention: A record is valid when Full Name is not null and one of three fields Main phone, secondary phone or email is not null
 customer.emailInvalid=Invalid email;
 customer.emailExists=Email exists;
+customer.cusTypeInvalid=Customer type Invalid;
 
 common.fileNotSelected=Please select a file
 common.fileInvalidFormat=File invalid

src/main/resources/i18n/language_vi.properties

@@ -91,10 +91,9 @@ customer.yes = Có
 customer.not = Không
 customer.noData = Template không có dữ liệu
 customer.nameRequired = Họ và tên không được để trống;
-customer.emailMax50 = Email không được quá 50 kí tự;
-customer.mainPhoneRequired=Số điện thoại chính không được để trống
-customer.secondPhoneRequired=Số điện thoại phụ không được để trống
-customer.emailRequired=Số điện thoại email không được để trống
+customer.emailMax100=Email không được quá 100 kí tự;
+customer.invalidRecord=Bắt buộc nhập 1 trong 3 thông tin liên lạc(Số điện thoại chính, Số điện thoại phụ, Email);
+customer.onlyNumber=Số điện thoại chỉ được nhập số;
 customer.importSuccess = Import dữ liệu thành công
 customer.importFailed = Import dữ liệu thất bại
 customer.errorValidate = Validate dữ liệu lỗi
@@ -107,6 +106,7 @@ customer.importCustomer = IMPORT KHÁCH HÀNG
 customer.notice = Chú ý: 1 bản ghi được coi là hợp lệ bắt buộc phải có thông tin Họ và Tên và 1 trong 3 thông tin liên lạc (số điện thoại chính, số điện thoại phụ hoặc email)
 customer.emailInvalid=Email không đúng định dạng;
 customer.emailExists=Email đã tồn tại;
+customer.cusTypeInvalid=Loại khách hàng không hợp lệ;
 
 common.fileNotSelected=Bạn chưa chọn file
 common.fileInvalidFormat=File không hợp lệ