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

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

@@ -72,9 +72,8 @@ public class JobConfig implements SchedulingConfigurer {
 
     private void job2(TaskScheduler scheduler) {
         job2 = scheduler.schedule(() -> {
-//            log.info("processing job2 ...");
-//            log.info(Thread.currentThread().getName() + " The Task2 executed at " + new Date());
-//            campaignJob().process();
+            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
+            campaignJob().process();
 
         }, triggerContext -> {
             String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
@@ -86,15 +85,15 @@ public class JobConfig implements SchedulingConfigurer {
 
     @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);
-//        });
+        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

@@ -35,7 +35,7 @@ public class CampaignJob {
     private CampaignService campaignService;
 
 //    @Scheduled(fixedRate = 5000)
-    @Transactional( propagation = Propagation.REQUIRED)
+//    @Transactional( propagation = Propagation.REQUIRED)
     public void process() {
         log.info(Thread.currentThread().getName() + " The Task executed at " + dateFormat.format(new Date()));
         List<ProcessConfig> list = processConfigService.findAll();

src/main/java/com/viettel/campaign/model/acd_full/modeltest.java

+package com.viettel.campaign.model.acd_full;
+
+/**
+ * @author anhvd_itsol
+ */
+public class modeltest {
+}

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

@@ -75,7 +75,6 @@ public class Campaign implements Serializable {
     private String dayOfWeek;
     @Column(name = "CURRENT_TIME_MODE")
     private Long currentTimeMode;
-    private Long currentTimeModel;
     @Column(name = "WRAPUP_TIME_CONNECT")
     private Long wrapupTimeConnect;
     @Column(name = "WRAPUP_TIME_DISCONNECT")

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

+package com.viettel.campaign.repository.acd_full;
+
+/**
+ * @author anhvd_itsol
+ */
+public class acdrepotest {
+}

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

@@ -43,6 +43,6 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     @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);
+    @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue <> :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
+    List<CampaignCompleteCode> getCustomerStatusWithoutValue(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
 }

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

@@ -10,7 +10,7 @@ import java.util.Date;
 import java.util.List;
 
 @Repository
-public interface CampaignRepository extends JpaRepository<Campaign, Long>, CampaignRepositoryCustom {
+public interface CampaignRepository extends JpaRepository<Campaign, Long> {
 
     List<Campaign> findAllByCompanySiteId(Long companyId);
 

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

@@ -4,10 +4,13 @@ import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author anhvd_itsol
  */
 
 @Repository
 public interface TimeRangeDialModeRepository extends JpaRepository<TimeRangeDialMode, Long> {
+    List<TimeRangeDialMode> findTimeRangeDialModeByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 }

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

@@ -4,10 +4,13 @@ import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author anhvd_itsol
  */
 
 @Repository
 public interface TimeZoneDialModeRepository extends JpaRepository<TimeZoneDialMode, Long> {
+    List<TimeZoneDialMode> findTimeZoneDialModeByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 }

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

@@ -288,7 +288,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             query.addScalar("customerNumber", new LongType());
             query.addScalar("status", new ShortType());
             query.addScalar("numOfJoinedCus", new LongType());
-            query.addScalar("numOfNotJoinedCus", new LongType());
+            query.addScalar("numOfInteractedCus", new LongType());
+            query.addScalar("numOfNotInteractedCus", new LongType());
             query.addScalar("numOfLockCus", new LongType());
             query.addScalar("companySiteId", new LongType());
             query.addScalar("content", new StringType());
@@ -305,6 +306,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             if (list.size() > 0) {
                 count = query.list().size();
             }
+            if(requestDto.getPage() != null && requestDto.getPageSize() != null) {
                 Pageable pageable = SQLBuilder.buildPageable(requestDto);
                 if (pageable != null) {
                     query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
@@ -313,6 +315,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 List<CampaignDTO> data = query.list();
                 Page<CampaignDTO> dataPage = new PageImpl<>(data, pageable, count);
                 result.setData(dataPage);
+            }else {
+                List<CampaignDTO> dataExport = query.list();
+                result.setData(dataExport);
+            }
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
         } catch (Exception ex) {

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

 package com.viettel.campaign.service;
 
 import com.viettel.campaign.model.ccms_full.Campaign;
+import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
+import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
 import com.viettel.campaign.web.dto.CampaignDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import java.util.Date;
 import java.util.List;
@@ -35,4 +38,10 @@ public interface CampaignService {
     ResultDTO changeCampaignStatus(CampaignDTO dto);
 
     ResultDTO checkAllowStatusToPrepare(Long campaignId);
+
+    XSSFWorkbook exportCampaigns(CampaignRequestDTO dto);
+
+    List<TimeRangeDialMode> getCampaignTimeRangeMode (Long campaignId, Long companySiteId);
+
+    List<TimeZoneDialMode> getCampaignTimeZoneMode (Long campaignId, Long companySiteId);
 }

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.ProcessConfig;
 import com.viettel.campaign.repository.ccms_full.ProcessConfigRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,17 +21,18 @@ public class ProcessConfigService {
     @Autowired
     private ProcessConfigRepository processConfigRepository;
 
-    @Transactional(readOnly = true)
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public List<ProcessConfig> findAll(){
         return processConfigRepository.findAll();
     }
 
 
-    @Transactional(readOnly = true)
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public List<ProcessConfig> findAllByCode(String configCode){
         return processConfigRepository.findAllByConfigCode(configCode);
     }
 
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public void update(ProcessConfig pc){
         processConfigRepository.save(pc);
     }

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

@@ -245,7 +245,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     public ResultDTO getListStatusWithoutType(String completeValue, Short completeType, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         try {
-            List<CampaignCompleteCode> list = completeCodeRepository.getCustomerStatusWithoutType(completeValue, completeType, companySiteId);
+            List<CampaignCompleteCode> list = completeCodeRepository.getCustomerStatusWithoutValue(completeValue, completeType, companySiteId);
             resultDTO.setListData(list);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);

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

@@ -270,4 +270,5 @@ public class DataUtil {
     public static boolean isNullOrZero(Short value) {
         return (value == null || value.equals(Short.parseShort("0")));
     }
+    public static boolean isNullOrZero(Integer value) { return (value == null || value.equals(Integer.parseInt("0"))); }
 }

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

+package com.viettel.campaign.utils;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+/**
+ * @author anhvd_itsol
+ */
+public class WorkBookBuilder {
+    public static Font buildDefaultFont(XSSFWorkbook workbook) {
+        Font defaultFont = workbook.createFont();
+        defaultFont.setFontHeightInPoints((short) 13);
+        defaultFont.setFontName("Times New Roman");
+        defaultFont.setColor(IndexedColors.BLACK.getIndex());
+        return defaultFont;
+    }
+
+    public static Font buildDefaultTitleFont(XSSFWorkbook workbook) {
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 18);
+        titleFont.setFontName("Times New Roman");
+        titleFont.setColor(IndexedColors.BLACK.getIndex());
+        titleFont.setBold(true);
+        return titleFont;
+    }
+
+    public static Font buildDefaultHeaderFont(XSSFWorkbook workbook) {
+        Font headerFont = workbook.createFont();
+        headerFont.setFontHeightInPoints((short) 13);
+        headerFont.setFontName("Times New Roman");
+        headerFont.setColor(IndexedColors.BLACK.getIndex());
+        headerFont.setBold(true);
+        return headerFont;
+    }
+
+    public static CellStyle buildDefaultStyleTitle(XSSFWorkbook workbook) {
+        CellStyle styleTitle = workbook.createCellStyle();
+        styleTitle.setFont(buildDefaultTitleFont(workbook));
+        styleTitle.setAlignment(HorizontalAlignment.CENTER);
+        return styleTitle;
+    }
+
+    public static CellStyle buildDefaultStyleRowHeader(XSSFWorkbook workbook) {
+        CellStyle styleRowHeader = workbook.createCellStyle();
+        styleRowHeader.setFont(buildDefaultHeaderFont(workbook));
+        styleRowHeader.setAlignment(HorizontalAlignment.CENTER);
+        styleRowHeader.setFillForegroundColor(IndexedColors.LIGHT_GREEN.getIndex());
+        styleRowHeader.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        styleRowHeader.setBorderRight(BorderStyle.THIN);
+        styleRowHeader.setRightBorderColor(IndexedColors.BLACK.getIndex());
+        styleRowHeader.setBorderBottom(BorderStyle.THIN);
+        styleRowHeader.setBottomBorderColor(IndexedColors.BLACK.getIndex());
+        styleRowHeader.setBorderLeft(BorderStyle.THIN);
+        styleRowHeader.setLeftBorderColor(IndexedColors.BLACK.getIndex());
+        styleRowHeader.setBorderTop(BorderStyle.THIN);
+        styleRowHeader.setTopBorderColor(IndexedColors.BLACK.getIndex());
+        return styleRowHeader;
+    }
+
+    public static CellStyle buildDefaultStyleRow(XSSFWorkbook workbook) {
+        CellStyle styleRow = workbook.createCellStyle();
+        styleRow.setFont(buildDefaultFont(workbook));
+        return styleRow;
+    }
+
+    public static void writeCellContent(Row row, CellStyle rowStyle, int colNo, Object content) {
+        Cell cell = row.createCell(colNo);
+        if (content == null) {
+            cell.setCellValue("");
+        } else {
+            cell.setCellValue(String.valueOf(content));
+        }
+        cell.setCellStyle(rowStyle);
+    }
+
+}

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

@@ -10,8 +10,8 @@ import java.io.Serializable;
 public class BaseDTO implements Serializable {
 
     protected String keySet;
-    protected int pageSize;
-    protected int page;
+    protected Integer pageSize;
+    protected Integer page;
     protected String sort;
     protected String langKey;
 }

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

@@ -55,7 +55,6 @@ public class CampaignDTO extends BaseDTO {
     private Integer timeWaitAgent;
     private Long questIndex;
     private Long numOfJoinedCus;
-    private Long numOfNotJoinedCus;
     private Long numOfLockCus;
     private String campaignTypeName;
     private Date timeRangeStartTime;
@@ -65,4 +64,6 @@ public class CampaignDTO extends BaseDTO {
     private List<TimeZoneDialModeDTO> lstTimeZone;
     private Short agentStatus;
     private String sessionId;
+    private Long numOfInteractedCus;
+    private Long numOfNotInteractedCus;
 }

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

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
+import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
+import com.viettel.campaign.repository.ccms_full.TimeRangeDialModeRepository;
+import com.viettel.campaign.repository.ccms_full.TimeZoneDialModeRepository;
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.web.dto.CampaignDTO;
@@ -9,7 +13,6 @@ 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;
@@ -21,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -36,6 +40,12 @@ public class CampaignController {
     @Autowired
     CampaignExecuteService campaignExecuteService;
 
+    @Autowired
+    TimeRangeDialModeRepository timeRangeDialModeRepository;
+
+    @Autowired
+    TimeZoneDialModeRepository timeZoneDialModeRepository;
+
     @PostMapping("/searchCampaignExecute")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
@@ -122,4 +132,47 @@ public class CampaignController {
     public ResultDTO checkAllowStatusToPrepare(@RequestParam("campaignId") Long campaignId) {
         return campaignService.checkAllowStatusToPrepare(campaignId);
     }
+
+    @RequestMapping(value = "/exportCampaigns", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseEntity<?> exportCampaigns(HttpServletResponse response, @RequestBody CampaignRequestDTO dto) {
+        XSSFWorkbook workbook = null;
+        byte[] contentReturn = null;
+        try {
+            String fileName = "report_campaigns.xlsx";
+            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+            OutputStream outputStream;
+            workbook = campaignService.exportCampaigns(dto);
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            workbook.write(byteArrayOutputStream);
+            contentReturn = byteArrayOutputStream.toByteArray();
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            return new ResponseEntity<byte[]>(null, null, HttpStatus.BAD_REQUEST);
+        } finally {
+            if (workbook != null) {
+                try {
+                    workbook.close();
+                } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+        }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType("application/vnd.ms-excel"));
+        return new ResponseEntity<byte[]>(contentReturn, headers, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/findCampaignTimeRangeMode", method = RequestMethod.GET)
+    public List<TimeRangeDialMode> findCampaignTimeRangeMode(@RequestParam Long campaignId, @RequestParam Long companySiteId) {
+        return timeRangeDialModeRepository.findTimeRangeDialModeByCampaignIdAndCompanySiteId(campaignId, companySiteId);
+    }
+
+    @RequestMapping(value = "/findCampaignTimeZoneMode", method = RequestMethod.GET)
+    public List<TimeZoneDialMode> findCampaignTimeZoneMode(@RequestParam Long campaignId, @RequestParam Long companySiteId) {
+        return timeZoneDialModeRepository.findTimeZoneDialModeByCampaignIdAndCompanySiteId(campaignId, companySiteId);
+    }
+
 }

src/main/resources/application.yml

@@ -12,8 +12,8 @@ spring:
   datasource2:
     driver-class-name: oracle.jdbc.driver.OracleDriver
     url: jdbc:oracle:thin:@10.60.157.135:1521:vt
-    username: CCMS_FULL
-    password: CCMS_FULL#123
+    username: ACD_FULL
+    password: ACD_FULL#123
     max_pool_size: 32
   jpa:
     database-platform: org.hibernate.dialect.Oracle10gDialect

src/main/resources/i18n/language_en.properties

@@ -14,3 +14,28 @@ 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
+
+#Campaign
+campaign = Campaigns
+campaign.code = Campaign tode
+campaign.name = Campaign tame
+campaign.type = Campaign type
+campaign.chanel = Chanel
+campaign.startTime = Start time
+campaign.endTime = End time
+campaign.cusNum = Number of customers
+campaign.joinedCusNum = Number of joined customers
+campaign.interactedCusNum = Number of customers interacted
+campaign.notInteractedCusNum = Number of customers not interacted
+campaign.logCusNum = Number of locked customers
+campaign.status = Status
+campaign.chanel.1 = Voice chanel     
+campaign.chanel.2 = SMS chanel      
+campaign.chanel.3 = Email chanel     
+campaign.chanel.4 = IVR chanel    
+campaign.status.0 = Draft   
+campaign.status.1 = Prepare   
+campaign.status.2 = Deploy   
+campaign.status.3 = Pause   
+campaign.status.4 = Finish   
+campaign.status.5 = Kêt thúc sớm   

src/main/resources/i18n/language_vi.properties

@@ -14,3 +14,32 @@ campaign.execute.interactive.contactStatus = Trạng thái kết nối
 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
+
+
+#Campaigns
+campaign = Danh sách chiến dịch
+campaign.title = DANH SÁCH CHIẾN DỊCH
+campaign.code = Mã chiến dịch
+campaign.name = Tên chiến dịch
+campaign.type = Loại chiến dịch
+campaign.chanel = Kênh
+campaign.startTime = Thời gian bắt đầu
+campaign.endTime = Thời gian kết thúc
+campaign.cusNum = Số lượng khách hàng
+campaign.joinedCusNum = Số lượng khách hàng tham gia
+campaign.interactedCusNum = Số lượng khách hàng đã tương tác 
+campaign.notInteractedCusNum = Số lượng khách hàng chưa tương tác 
+campaign.logCusNum = Số lượng khách hàng DNC/Khoá
+campaign.status = Trạng thái
+campaign.chanel.1 = Kênh Voice      
+campaign.chanel.2 = Kênh SMS      
+campaign.chanel.3 = Kênh Email      
+campaign.chanel.4 = Kênh IVR     
+campaign.status.0 = Dự thảo   
+campaign.status.1 = Chuẩn bị   
+campaign.status.2 = Triển khai   
+campaign.status.3 = Tạm ngừng   
+campaign.status.4 = Kêt thúc   
+campaign.status.5 = Kêt thúc sớm   
+
+

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

@@ -11,7 +11,8 @@ SELECT
     a.STATUS status,
     a.CUSTOMER_NUMBER cusNum,
     b.SLKHThamgiaCD numOfJoinedCus,
-    c.SLKHChuaTuongTac numOfNotJoinedCus,
+    e.SLKHDaTuongTac numOfInteractedCus,
+    c.SLKHChuaTuongTac numOfNotInteractedCus,
     d.SLKHDoNotCall_Khoa numOfLockCus,
     a.COMPANY_SITE_ID companySiteId,
     a.CONTENT content,
@@ -29,7 +30,7 @@ LEFT JOIN (SELECT campaign_id, COUNT (*) AS SLKHThamgiaCD
 ON a.CAMPAIGN_ID = b.CAMPAIGN_ID
 LEFT JOIN (SELECT campaign_id, COUNT (*) AS SLKHChuaTuongTac
                   FROM   campaign_customer cc INNER JOIN CUSTOMER cus ON cc.CUSTOMER_ID = cus.CUSTOMER_ID
-                  WHERE 1 = 1 AND cc.STATUS <> 0 AND cus.STATUS = 1
+                  WHERE 1 = 1 AND cc.STATUS = 0 AND cus.STATUS = 1
                   group by campaign_id) c
 ON c.CAMPAIGN_ID = a.CAMPAIGN_ID
 LEFT JOIN (SELECT cc.campaign_id, count(*) AS SLKHDoNotCall_Khoa
@@ -38,6 +39,11 @@ LEFT JOIN (SELECT cc.campaign_id, count(*) AS SLKHDoNotCall_Khoa
         AND (c.IPCC_STATUS = 'locked' or c.CALL_ALLOWED = 0) AND cc.STATUS = 1
         GROUP BY cc.CAMPAIGN_ID) d
 ON d.CAMPAIGN_ID = a.CAMPAIGN_ID
+LEFT JOIN (SELECT campaign_id, COUNT (*) AS SLKHDaTuongTac
+                  FROM   campaign_customer cc INNER JOIN CUSTOMER cus ON cc.CUSTOMER_ID = cus.CUSTOMER_ID
+                  WHERE 1 = 1 AND cc.STATUS <> 0 AND cus.STATUS = 1
+                  group by campaign_id) e
+ON e.CAMPAIGN_ID = a.CAMPAIGN_ID
 WHERE 1 = 1
 AND COMPANY_SITE_ID = :p_company_site_id
 AND a.STATUS <> -1