anhvd commit merge

.mvn/wrapper/MavenWrapperDownloader.java

-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if (mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if (mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if (!outputFile.getParentFile().exists()) {
-            if (!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

pom.xml

@@ -201,6 +201,17 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.17</version>
         </dependency>
+        <dependency>
+            <groupId>com.cronutils</groupId>
+            <artifactId>cron-utils</artifactId>
+            <version>9.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>

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

@@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.TriggerContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -26,9 +28,6 @@ import java.util.concurrent.ScheduledFuture;
 @Configuration
 public class JobConfig implements SchedulingConfigurer {
 
-    @Autowired
-    private ApParamService apParamService;
-
     TaskScheduler taskScheduler;
     private ScheduledFuture<?> job1;
     private ScheduledFuture<?> job2;
@@ -38,18 +37,18 @@ public class JobConfig implements SchedulingConfigurer {
         return new CampaignJob();
     }
 
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-
-        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-        threadPoolTaskScheduler.setPoolSize(10);
-        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
-        threadPoolTaskScheduler.initialize();
-        job1(threadPoolTaskScheduler);
-        job2(threadPoolTaskScheduler);
-        this.taskScheduler = threadPoolTaskScheduler;
-        taskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
-    }
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//
+//        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+//        threadPoolTaskScheduler.setPoolSize(10);
+//        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
+//        threadPoolTaskScheduler.initialize();
+//        job1(threadPoolTaskScheduler);
+//        job2(threadPoolTaskScheduler);
+//        this.taskScheduler = threadPoolTaskScheduler;
+//        taskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
+//    }
 
     private void job1(TaskScheduler scheduler) {
         job1 = scheduler.schedule(() -> {
@@ -82,8 +81,17 @@ public class JobConfig implements SchedulingConfigurer {
 
 
 
-//    @Override
-//    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
-////        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process2(), (TriggerContext triggerContext) -> yourService.getCron());
-//    }
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+        threadPoolTaskScheduler.setPoolSize(10);
+        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
+        threadPoolTaskScheduler.initialize();
+        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
+//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
+        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
+            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
+            return trigger.nextExecutionTime(triggerContext);
+        });
+    }
 }

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

 package com.viettel.campaign.job;
 
+import com.viettel.campaign.model.Campaign;
+import com.viettel.campaign.model.ProcessConfig;
+import com.viettel.campaign.service.CampaignService;
+import com.viettel.campaign.service.ProcessConfigService;
+import com.viettel.campaign.utils.DateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author hanv_itsol
@@ -13,11 +23,74 @@ import java.util.Date;
 @Slf4j
 public class CampaignJob {
 
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
+    private static final String CUSTOMER_INACTIVE_DUARATION =  "CUSTOMER_INACTIVE_DUARATION";
+    private static final String CRON_EXPRESSION_CHECK_START =  "CRON_EXPRESSION_CHECK_START";
+    private static final String CRON_EXPRESSION_CHECK_END =  "CRON_EXPRESSION_CHECK_END";
 
-//    @Scheduled(fixedRate = 6000)
-//    @Transactional( propagation = Propagation.REQUIRED)
+    @Autowired
+    private ProcessConfigService processConfigService;
+
+    @Autowired
+    private CampaignService campaignService;
+
+//    @Scheduled(fixedRate = 5000)
+    @Transactional( propagation = Propagation.REQUIRED)
     public void process() {
-//        log.info("processing job2 ..."+ dateFormat.format(new Date()));
+        log.info(Thread.currentThread().getName() + " The Task executed at " + dateFormat.format(new Date()));
+        List<ProcessConfig> list = processConfigService.findAll();
+
+        list.parallelStream().forEach(p -> {
+            boolean isExecute = DateTimeUtil.isRun(p.getConfigValue(), p.getLastProcess());
+            switch (p.getConfigCode()){
+                case CUSTOMER_INACTIVE_DUARATION:
+                    if(isExecute){
+
+                    }
+                    break;
+                case CRON_EXPRESSION_CHECK_START:
+                    // process
+                    if(isExecute){
+                        // chuyen trang thai Du thao sang Trien khai
+                        log.info("thay doi trang thai");
+                        List<Long> status = new ArrayList<>();
+                        status.add(1L);
+                        status.add(1L);
+                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+                        campaigns.parallelStream().forEach(campaign -> {
+                            campaign.setProcessStatus(1);
+                            campaign.setStatus(2L);
+                            campaign.setCampaignStart(new Date());
+                            campaignService.updateProcess(campaign);
+                        });
+
+                        // update last check
+                        p.setLastProcess(new Date());
+                        processConfigService.update(p);
+                    }
+                    break;
+                case CRON_EXPRESSION_CHECK_END:
+                    // process
+                    if(isExecute){
+                        // chuyen trang thai sang ket thuc
+                        List<Long> status = new ArrayList<>();
+                        status.add(2L);
+                        status.add(3L);
+                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+                        campaigns.parallelStream().forEach(campaign -> {
+                            campaign.setStatus(4L);
+                            campaign.setCampaignEnd(new Date());
+                            campaignService.updateProcess(campaign);
+                        });
+                    }
+                    break;
+                default:
+
+            }
+        });
+
+
     }
+
+
 }

src/main/java/com/viettel/campaign/model/ProcessConfig.java

+package com.viettel.campaign.model;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+
+@Entity
+@Table(name = "PROCESS_CONFIG")
+@Data
+public class ProcessConfig implements Serializable {
+
+    @Id
+    @NotNull
+    @Column(name = "CONFIG_ID")
+    private Long configId;
+
+    @Column(name = "CONFIG_NAME")
+    private String configName;
+
+    @Column(name = "CONFIG_CODE")
+    private String configCode;
+
+    @Column(name = "CONFIG_VALUE")
+    private String configValue;
+
+    @Column(name = "LAST_PROCESS")
+    private Date lastProcess;
+
+    @Column(name = "COMPANY_SITE_ID")
+    private  Long siteId;
+}

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

@@ -10,25 +10,39 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+
 @Repository
-public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCompleteCode, Long> {
+public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCompleteCode, Long>, CampaignCompleteCodeRepositoryCustom {
+
     @Query(" select u FROM CampaignCompleteCode u WHERE u.status = 1")
     Page<CampaignCompleteCode> findAll(Pageable pageable);
 
-//    Page<CampaignCompleteCode> findAllByStatus(String status, Pageable pageable);
+    //    Page<CampaignCompleteCode> findAllByStatus(String status, Pageable pageable);
 
     @Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ")
     List<CampaignCompleteCode> findByName(@Param("name") String name, Pageable pageable);
 
-    List<CampaignCompleteCode>findByCompleteNameContains(String name, Pageable pageable);
+    List<CampaignCompleteCode> findByCompleteNameContains(String name, Pageable pageable);
 
     @Modifying
-    @Query("delete from CampaignCompleteCode c where c.campaignCompleteCodeId in (:ids)")
+    @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:ids)")
     int deleteds(@Param("ids") List<Long> ids);
 
-//    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
-//    Short findByMaxCompanySiteId(Long companySiteId);
+    //    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
+    //    Short findByMaxCompanySiteId(Long companySiteId);
+
     List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
 
-//    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
+    @Query(value="SELECT max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
+    Short findByMaxCompanySiteId(Long companySiteId);
+
+    //    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
+
+    //    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
+
+    @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue = :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
+    List<CampaignCompleteCode> getCustomerStatus(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
+
+    @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue = :completeValue AND completeType <> :completeType AND companySiteId = :companySiteId")
+    List<CampaignCompleteCode> getCustomerStatusWithoutType(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
 }

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

 package com.viettel.campaign.repository;
 
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.model.CampaignCompleteCode;
 
 public interface CampaignCompleteCodeRepositoryCustom {
 
-    ResultDTO updateStatusById(Long id);
-    ResultDTO findMaxValueCampaignType(Long companySiteId);
+//    CampaignCompleteCode updateStatusById(Long id);
+
+//    CampaignCompleteCode findMaxValueCampaignType(Long companySiteId);
+
 
 }

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.CampaignCustomer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface CampaignCustomerRepository extends JpaRepository<CampaignCustomer, Long> {
+    @Query(value = "SELECT COUNT(*) " +
+            "FROM CAMPAIGN_CUSTOMER CC JOIN CAMPAIGN_COMPLETE_CODE CCC ON CC.CAMPAIGN_ID = CCC.CAMPAIGN_ID " +
+            "WHERE CC.STATUS = 3 AND CC.CAMPAIGN_ID = :campaignId AND CC.CUSTOMER_ID = :customerId AND CCC.IS_RECALL = 1 AND CCC.STATUS = 1 ",
+            nativeQuery = true)
+    Long getCustomerRecall(@Param("campaignId") Long campaignId, @Param("customerId") Long customerId);
+}

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

@@ -8,9 +8,21 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 @Repository
 public interface CampaignRepository extends JpaRepository<Campaign, Long>, CampaignRepositoryCustom {
 
+    List<Campaign> findAllByCompanySiteId(Long companyId);
+
+    List<Campaign> findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(Long siteId, Date startTime, List<Long> status);
+
+    List<Campaign> findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(Long siteId, Date endTime, List<Long> status);
+
+
+
     @Query("SELECT COUNT(c.campaignId) " +
             " FROM Campaign c JOIN CampaignCustomer cc ON c.campaignId = cc.campaignId " +
             " WHERE cc.companySiteId = :pCompanySiteId " +
@@ -19,5 +31,8 @@ public interface CampaignRepository extends JpaRepository<Campaign, Long>, Campa
             " AND cc.agentId = :pAgentId")
     Long countRecallCustomer(@Param("pCompanySiteId") Long pCompanySiteId, @Param("pAgentId") Long pAgentId);
 
+    Campaign findByCampaignId(Long campaignId);
+
     Campaign findCampaignByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
+
 }

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

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

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

@@ -21,4 +21,7 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     @Modifying
     @Query("update CustomerList c set c.status = 0 where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id")
     int deleteCustomerListIds(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
+
+    @Query(value = "SELECT * FROM (SELECT c.*, MAX(c.CREATE_AT) OVER() AS LATEST_CREATED FROM CUSTOMER_LIST c) WHERE CREATE_AT = LATEST_CREATED", nativeQuery = true)
+    CustomerList latestCreated();
 }

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.ProcessConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+
+@Repository
+public interface ProcessConfigRepository extends JpaRepository<ProcessConfig, Long> {
+
+    List<ProcessConfig> findAllByConfigCode(String configCode);
+
+}

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

@@ -6,51 +6,41 @@ import com.viettel.campaign.web.dto.ResultDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
-import java.util.List;
 
 @Repository
 public class CampaignCompleteCompleteCodeRepositoryIpml implements CampaignCompleteCodeRepositoryCustom {
+
     @Autowired
     EntityManager entityManager;
 
     private Logger log = LoggerFactory.getLogger(CampaignCompleteCompleteCodeRepositoryIpml.class);
 
-
-    @Override
     @Transactional
-    public ResultDTO updateStatusById(Long id) {
-        ResultDTO dto = new ResultDTO();
+    public CampaignCompleteCode updateStatusById(Long id) {
+        CampaignCompleteCode dto = new CampaignCompleteCode();
         try {
             CampaignCompleteCode e = entityManager.find(CampaignCompleteCode.class, id);
             e.setStatus(new Short("0")); // set status = 0 --> khong hoat dong
             entityManager.merge(e);
-            dto.setErrorCode("00");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            dto.setErrorCode("01");
-            dto.setDescription(e.getMessage());
         }
         return dto;
     }
 
-    @Override
     @Transactional
-    public ResultDTO findMaxValueCampaignType(Long companySiteId) {
-        ResultDTO result = new ResultDTO();
-        try{
-            result.setErrorCode("00");
-        }
-        catch(Exception e){
+    public CampaignCompleteCode findMaxValueCampaignType(Long companySiteId) {
+        CampaignCompleteCode result = new CampaignCompleteCode();
+        try {
+
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
-            result.setErrorCode("01");
-            result.setDescription(e.getMessage());
         }
-        return null;
+
+        return result;
     }
 }

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

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

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

@@ -24,4 +24,8 @@ public interface CampaignCompleteCodeService {
 
     ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
 
+    ResultDTO getListStatus(String completeValue, Short completeType, Long companySiteId);
+
+    ResultDTO getListStatusWithoutType(String completeValue, Short completeType, Long companySiteId);
+
 }

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.model.Campaign;
 import com.viettel.campaign.web.dto.CampaignDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 public interface CampaignService {
@@ -13,6 +17,16 @@ public interface CampaignService {
 
     ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO);
 
+    List<Campaign> findAllCondition(Long companySiteId);
+
+    List<Campaign> findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(Long siteId, Date startTime, List<Long> status);
+
+    List<Campaign> findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(Long siteId, Date startTime, List<Long> status);
+
+    Campaign updateProcess(Campaign c);
+
+    ResultDTO findByCampaignId(Long campaignId);
+
     ResultDTO addNewCampaign(CampaignDTO campaignDTO);
 
     Map countRecallCustomer(Long companySiteId, Long agentId);

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.model.CustomerList;
+import com.viettel.campaign.web.dto.CustomerContactDTO;
 import com.viettel.campaign.web.dto.CustomerDTO;
 import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
-import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 
 public interface CustomerService {
 
@@ -34,7 +36,23 @@ public interface CustomerService {
 
     ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO);
 
+    CustomerList getLatestCreated();
+
     // ------------ customer contact ------------ //
 
-    ResultDTO getCustomerContact(Long customerId, Short contactType, String contact);
+<<<<<<< HEAD
+=======
+    ResultDTO getCustomerContact(CustomerContactDTO customer);
+
+>>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3
+    // danh sach khach hang cua chien dich //
+
+    ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);
+
+
+    // ------------ customer  ------------ //
+
+    ResultDTO getCustomerRecall(Long campaignId, Long customerId);
+
+
 }

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

+package com.viettel.campaign.service;
+
+import com.viettel.campaign.model.ProcessConfig;
+import com.viettel.campaign.repository.ProcessConfigRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author hanv_itsol
+ * @project campaign
+ */
+
+@Service
+@Transactional
+public class ProcessConfigService {
+
+    @Autowired
+    private ProcessConfigRepository processConfigRepository;
+
+    @Transactional(readOnly = true)
+    public List<ProcessConfig> findAll(){
+        return processConfigRepository.findAll();
+    }
+
+
+    @Transactional(readOnly = true)
+    public List<ProcessConfig> findAllByCode(String configCode){
+        return processConfigRepository.findAllByConfigCode(configCode);
+    }
+
+    public void update(ProcessConfig pc){
+        processConfigRepository.save(pc);
+    }
+
+}

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

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

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

@@ -16,12 +16,16 @@ import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.*;
 
 @Service
@@ -59,6 +63,43 @@ public class CampaignServiceImpl implements CampaignService {
         return campaignRepository.findByCampaignCode(requestDTO);
     }
 
+    @Override
+    public List<Campaign> findAllCondition(Long companySiteId) {
+        return campaignRepository.findAllByCompanySiteId(companySiteId);
+    }
+
+    @Override
+    public List<Campaign> findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(Long siteId, Date startTime, List<Long> status) {
+        return campaignRepository.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(siteId, startTime, status);
+    }
+
+    @Override
+    public List<Campaign> findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(Long siteId, Date endTime, List<Long> status) {
+        return campaignRepository.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(siteId, endTime, status);
+    }
+
+    @Override
+    public Campaign updateProcess(Campaign c) {
+        return campaignRepository.save(c);
+    }
+
+    @Override
+    public ResultDTO findByCampaignId(Long campaignId) {
+        ResultDTO result = new ResultDTO();
+        Campaign campaign = campaignRepository.findByCampaignId(campaignId);
+
+        if (campaign != null) {
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setErrorCode(Constants.ApiErrorDesc.SUCCESS);
+            result.setData(campaign);
+        } else {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setErrorCode(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return result;
+    }
+
     @Override
     public ResultDTO addNewCampaign(CampaignDTO campaignDTO) {
         logger.info("=== Start add new  campaign ");
@@ -75,7 +116,8 @@ public class CampaignServiceImpl implements CampaignService {
             Campaign campaignResult = campaignRepository.save(campaign);
             campaignId = campaign.getCampaignId();
             //insert sub tables
-            if(campaignDTO.getLstTimeRange().size() > 0) {
+
+            if (campaignDTO.getLstTimeRange().size() > 0) {
                 timeRangeDialModes = campaignDTO.getLstTimeRange();
                 timeRangeDialModes.forEach(item -> {
                     item.setCampaignId(campaignId);
@@ -84,7 +126,7 @@ public class CampaignServiceImpl implements CampaignService {
                 });
                 timeRangeDialModeRepository.saveAll(lstTimeRangeModeToInsert);
             }
-            if(campaignDTO.getLstTimeZone().size() > 0) {
+            if (campaignDTO.getLstTimeZone().size() > 0) {
                 timeZoneDialModes = campaignDTO.getLstTimeZone();
                 timeZoneDialModes.forEach(item -> {
                     item.setCampaignId(campaignId);
@@ -160,7 +202,7 @@ public class CampaignServiceImpl implements CampaignService {
                 userActionLog.setStartTime(new Date());
                 userActionLog.setEndTime(null);
                 userActionLog.setObjectId(entity.getCampaignId());
-                if(dto.getStatus().equals((short) -1)) {
+                if (dto.getStatus().equals((short) -1)) {
                     userActionLog.setActionType((short) 2);
                 }
                 else if(dto.getStatus().equals((short) 4)) {
@@ -170,6 +212,11 @@ public class CampaignServiceImpl implements CampaignService {
                     userActionLog.setActionType((short) 4);
                 }
                 else if(dto.getStatus().equals((short) 2)) {
+                } else if (dto.getStatus().equals((short) 5)) {
+                    userActionLog.setActionType((short) 7);
+                } else if (dto.getStatus().equals((short) 4)) {
+                    userActionLog.setActionType((short) 4);
+                } else if (dto.getStatus().equals((short) 3)) {
                     userActionLog.setActionType((short) 5);
                 }
 
@@ -197,7 +244,7 @@ public class CampaignServiceImpl implements CampaignService {
     private String generateCampaignCode(String campaignType, Short chanel) {
         int year = Calendar.getInstance().get(Calendar.YEAR);
         String maxIndexStr = campaignRepository.getMaxCampaignIndex();
-        if(maxIndexStr != null) {
+        if (maxIndexStr != null) {
             Long maxIndex = Long.valueOf(maxIndexStr) + 1;
             String result = campaignType + "_" + chanel + "_" + year + "_" + maxIndex.toString();
             return result;

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.mapper.CustomerListMapper;
+import com.viettel.campaign.mapper.CustomerMapper;
+import com.viettel.campaign.model.Customer;
 import com.viettel.campaign.model.CustomerContact;
 import com.viettel.campaign.model.CustomerList;
 import com.viettel.campaign.repository.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
-import com.viettel.campaign.web.dto.CustomerCustomDTO;
-import com.viettel.campaign.web.dto.CustomerDTO;
-import com.viettel.campaign.web.dto.CustomerListDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
-import com.viettel.campaign.mapper.CustomerMapper;
-import com.viettel.campaign.model.Customer;
-import com.viettel.campaign.utils.DataUtil;
-import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -32,7 +29,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -52,6 +50,9 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     CampaignCustomerListRepository campaignCustomerListRepository;
 
+    @Autowired
+    CampaignCustomerRepository campaignCustomerRepository;
+
     @Autowired
     CustomerListMappingRepository customerListMappingRepository;
 
@@ -156,9 +157,15 @@ public class CustomerServiceImpl implements CustomerService {
             StringBuilder sqlStrBuilder = new StringBuilder();
             sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-customer-detail-by-params"));
 
-            sqlStrBuilder.append(" AND ");
-            sqlStrBuilder.append(" ORDER BY name DESC");
-            sqlStrBuilder.append(" ORDER BY name DESC");
+            if (!DataUtil.isNullOrEmpty(name)) {
+                sqlStrBuilder.append(" AND b.NAME LIKE :p_name");
+            }
+            if (!DataUtil.isNullOrEmpty(mobileNumber)) {
+                sqlStrBuilder.append(" AND c.MOBILE LIKE :p_mobile_number");
+            }
+            if (!DataUtil.isNullOrEmpty(email)) {
+                sqlStrBuilder.append(" AND d.EMAIL LIKE :p_email");
+            }
             sqlStrBuilder.append(" ORDER BY name DESC");
 
             SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
@@ -166,6 +173,30 @@ public class CustomerServiceImpl implements CustomerService {
             query.setParameter("p_company_site_id", companySiteId);
             query.setParameter("p_customer_list_id", customerListId);
 
+            if (!DataUtil.isNullOrEmpty(name)) {
+                query.setParameter("p_name", "%" +
+                        name.replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
+            if (!DataUtil.isNullOrEmpty(mobileNumber)) {
+                query.setParameter("p_mobile_number", "%" +
+                        mobileNumber.replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
+            if (!DataUtil.isNullOrEmpty(email)) {
+                query.setParameter("p_email", "%" +
+                        email.replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
             query.addScalar("customerListMappingId", new LongType());
             query.addScalar("companySiteId", new LongType());
             query.addScalar("customerListId", new LongType());
@@ -571,20 +602,70 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
-    public ResultDTO getCustomerContact(Long customerId, Short contactType, String contact) {
+    public CustomerList getLatestCreated() {
+        return customerListRepository.latestCreated();
+    }
+
+    @Override
+    public ResultDTO getCustomerContact(CustomerContactDTO customer) {
         ResultDTO result = new ResultDTO();
 
-        List<CustomerContact> customer = customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customerId, contactType, contact);
+        try {
+            List<CustomerContact> data = customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customer.getCustomerId(), customer.getContactType(), customer.getContact(), SQLBuilder.buildPageable(customer));
 
-        if (customer != null) {
-            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            result.setDescription("customer contact data");
-            result.setListData(customer);
-        } else {
-            result.setErrorCode(Constants.ApiErrorCode.ERROR);
-            result.setDescription("customer contact data null");
+            if (customer != null) {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription("customer contact data");
+                result.setListData(data);
+                result.setTotalRow(customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customer.getCustomerId(), customer.getContactType(), customer.getContact(), null).size());
+
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.ERROR);
+                result.setDescription("customer contact data null");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+        return result;
+    }
+
+    @Override
+    public ResultDTO getCustomerRecall(Long campaignId, Long customerId) {
+        ResultDTO result = new ResultDTO();
 
+        try {
+            Long data = campaignCustomerRepository.getCustomerRecall(campaignId, customerId);
+
+            if (data != null) {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription("campaign customer data");
+                result.setData(data);
+
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.ERROR);
+                result.setDescription("campaign customer data null");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return result;
     }
+
+    @Override
+    public ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId) {
+        ResultDTO resultDTO = new ResultDTO();
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-customer-list-info-from-customer-list");
+            Query query = entityManager.createNativeQuery(sql);
+            query.setParameter("p_campaign_id", campaignId);
+            query.setParameter("p_company_site_id", companySiteId);
+            resultDTO.setListData(query.getResultList());
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(e.getMessage());
+        }
+        return resultDTO;
+    }
 }

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

 package com.viettel.campaign.utils;
 
+import com.cronutils.model.definition.CronDefinition;
+import com.cronutils.model.definition.CronDefinitionBuilder;
+import com.cronutils.model.time.ExecutionTime;
+import com.cronutils.parser.CronParser;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
+import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
+import org.quartz.CronExpression;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.ZonedDateTime;
 import java.util.Date;
+import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.cronutils.model.CronType.QUARTZ;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 /**
  * @author anhvd_itsol
  */
+@Slf4j
 public final class DateTimeUtil {
     public static final long DAY_IN_MILLIS = 86400000L;
     public static interface DateTimeProvider { long now(); }
@@ -84,4 +98,26 @@ public final class DateTimeUtil {
     /**
      *
      */
+
+    public static boolean isRun(String cron, Date lastCheck){
+        boolean isOk = false;
+        String format="dd-MMM-YYYY hh:mm:ss";
+//        String cronExpression="* * 12 ? * FRI *";
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        CronExpression expression = null;
+        try {
+            expression = new CronExpression(cron);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Date  currentDate = new Date();
+        assert expression != null;
+        Date lastDate = expression.getNextValidTimeAfter(lastCheck);
+        long interval =  lastDate.getTime() - currentDate.getTime();
+        if(interval <= 0){
+            isOk = true;
+        }
+
+        return  isOk;
+    }
 }

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

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

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

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

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

@@ -3,7 +3,6 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.model.ApParam;
 import com.viettel.campaign.service.ApParamService;
 import com.viettel.campaign.service.CampaignExecuteService;
-import com.viettel.campaign.web.rest.controller.CustomerController;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

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

@@ -3,12 +3,10 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
-import com.viettel.campaign.web.rest.controller.CustomerController;
 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.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -63,6 +61,7 @@ public class CampaignCompleteCodeController {
         ResultDTO result = new ResultDTO();
         try {
             result = completeCodeService.updateCompleteCode(completeCodeDTO);
+
         } catch (Exception e) {
             result.setErrorCode("-1");
             LOGGER.error(e);
@@ -96,9 +95,21 @@ public class CampaignCompleteCodeController {
     @PostMapping("/getMaxValue")
     @ResponseBody
     public ResultDTO findMaxValueCampaignType(@RequestBody CampaignCompleteCodeDTO completeCodeDTO){
-        return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
+         return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
     }
 
+    @GetMapping("/getListStatus")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getListStatus(@RequestParam("completeValue") String completeValue, @RequestParam("completeType") Short completeType, @RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = completeCodeService.getListStatus(completeValue, completeType, companySiteId);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
 
+    @GetMapping("/getListStatusWithoutType")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getListStatusWithoutType(@RequestParam("completeValue") String completeValue, @RequestParam("completeType") Short completeType, @RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = completeCodeService.getListStatusWithoutType(completeValue, completeType, companySiteId);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
 
 }

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

-package com.viettel.campaign.web.rest.controller;
+package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
@@ -9,6 +9,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -16,7 +17,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -36,7 +36,7 @@ public class CampaignController {
     @Autowired
     CampaignExecuteService campaignExecuteService;
 
-    @RequestMapping("/searchCampaignExecute")
+    @PostMapping("/searchCampaignExecute")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
         ResultDTO result = campaignService.searchCampaignExecute(requestDto);
@@ -66,6 +66,13 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @GetMapping("/findByCampaignId")
+    @ResponseBody
+    public ResponseEntity findByCampaignId(@RequestParam("campaignId") Long campaignId) {
+        ResultDTO result = campaignService.findByCampaignId(campaignId);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @PostMapping("/searchInteractiveResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) throws Exception {

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

-package com.viettel.campaign.web.rest.controller;
+package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.web.dto.CustomerContactDTO;
 import com.viettel.campaign.web.dto.CustomerDTO;
 import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
@@ -25,7 +26,6 @@ import java.io.File;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Controller
 @RequestMapping("/ipcc/customer")
@@ -164,10 +164,25 @@ public class CustomerController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @GetMapping("/findCustomerContact")
+    @GetMapping("/latestCreated")
     @ResponseBody
-    public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestParam("customerId") Long customerId, @RequestParam("contactType") Short contactType, @RequestParam("contact") String contact) {
-        ResultDTO result = customerService.getCustomerContact(customerId, contactType, contact);
+    public ResponseEntity getLatestCreated() {
+        ResultDTO result = new ResultDTO();
+        result.setData(customerService.getLatestCreated());
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/findCustomerContact")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestBody CustomerContactDTO customerContactDTO) {
+        ResultDTO result = customerService.getCustomerContact(customerContactDTO);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
+
+    @GetMapping("/getCustomerRecall")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getCustomerRecall(@RequestParam("campaignId") Long campaignId, @RequestParam("customerId") Long customerId) {
+        ResultDTO result = customerService.getCustomerRecall(campaignId, customerId);
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
@@ -226,4 +241,13 @@ public class CustomerController {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
+
+    @RequestMapping(value = "/searchCustomerListInfoFromCustomerList", method = RequestMethod.GET)
+    public ResultDTO searchCustomerListInfoFromCustomerList(@RequestParam("page") int page,
+                                                            @RequestParam("pageSize") int pageSize,
+                                                            @RequestParam("sort") String sort,
+                                                            @RequestParam("campaignId") Long campaignId,
+                                                            @RequestParam("companySiteId") Long companySiteId) {
+        return customerService.searchCustomerListInfoFromCustomerList(page, pageSize, sort, campaignId, companySiteId);
+    }
 }

src/main/resources/i18n/language_en.properties

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

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

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

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

@@ -14,15 +14,10 @@ from contact_cust_result a
     left join customer d on a.customer_id = d.customer_id
     left join campaign_complete_code e on a.contact_status = e.complete_value
     left join campaign_complete_code f on a.call_status = e.complete_value
-    left join campaign g on a.campaign_id = b.campaign_id
+    left join campaign g on a.campaign_id = g.campaign_id
 where a.status <> 0
-    and a.campaign_id in (:p_list_campaign_id)
-    and a.customer_id like '%'||:p_customer_id||'%'
+    and a.company_site_id = :p_company_site_id
     and a.create_time >= to_date(:p_date_from, 'DD/MM/YYYY')
     and a.create_time <= to_date(:p_date_to, 'DD/MM/YYYY')
-    and a.contact_status in (:p_list_contact_status)
-    and a.call_status in (:p_list_survey_status)
-    and a.status in (:p_list_record_status)
-    and a.phone_number like '%'||:p_phone_number||'%'
     and a.duration_call >= :p_call_time_from
     and a.duration_call <= :p_call_time_to

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

@@ -12,4 +12,5 @@ SELECT
     DEPT_CREATE deptCreate
 FROM CUSTOMER_LIST
 WHERE 1 = 1
+  AND STATUS = 1
   AND COMPANY_SITE_ID = :p_company_site_id

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

+with totalCustomer as (
+select clm.customer_list_id,
+clm.company_site_id,
+count(clm.customer_id) total
+from customer_list_mapping clm
+inner join customer c on clm.customer_id = c.customer_id
+where c.status = 1
+group by clm.customer_list_id,clm.company_site_id
+), customerInteractive as (
+select customer_list_id,
+company_site_id,
+count(customer_id) tt
+from campaign_customer where campaign_id = :p_campaign_id and status <> 0
+group by customer_list_id, company_site_id
+), customerNotInteractive as (
+select customer_list_id,
+company_site_id,
+count(customer_id) ktt
+from campaign_customer where campaign_id = :p_campaign_id and status = 0
+and in_campaign_status = 1
+group by customer_list_id, company_site_id
+)
+select customer_list_code ma,
+customer_list_name ten,
+cl.company_site_id,
+nvl(total, 0) tong,
+nvl(tt, 0) tongtt,
+nvl(ktt, 0) tongktt
+from customer_list cl
+left join totalCustomer tc on (cl.customer_list_id = tc.customer_list_id and cl.company_site_id = tc.company_site_id)
+left join customerInteractive ci on (cl.customer_list_id = ci.customer_list_id and cl.company_site_id = ci.company_site_id)
+left join customerNotInteractive cni on (cl.customer_list_id = cni.customer_list_id and cl.company_site_id = cni.company_site_id)
+where cl.company_site_id = :p_company_site_id
+order by customer_list_code
\ No newline at end of file

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

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

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

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