anhvd commit

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

@@ -127,8 +127,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignName())) {
                 sb.append(" AND UPPER(a.CAMPAIGN_NAME) LIKE :p_name");
             }
-            if (requestDto.getStatus() != null && requestDto.getStatus() >= 0) {
-                sb.append(" AND a.STATUS = :p_status");
+            if (!DataUtil.isNullOrEmpty(requestDto.getStatuses())) {
+                sb.append(" AND a.STATUS IN (:p_statuses) ");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
                 sb.append(" AND TO_DATE(a.START_TIME, 'DD/MM/YYYY') >= :p_frDateFr");
@@ -151,8 +151,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             if (!DataUtil.isNullOrEmpty(requestDto.getTypes())) {
                 sb.append(" AND a.CAMPAIGN_TYPE IN (:p_type)");
             }
-            if (requestDto.getChanel() != null && !DataUtil.isNullOrZero(requestDto.getChanel())) {
-                sb.append(" AND a.CHANEL = :p_chanel");
+            if (!DataUtil.isNullOrEmpty(requestDto.getChannels())) {
+                sb.append(" AND a.CHANEL IN (:p_channels)");
             }
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusFr())) {
                 sb.append(" AND a.CUSTOMER_NUMBER >= :p_cusNumFr");
@@ -180,8 +180,9 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
             query.setParameter("p_company_site_id", requestDto.getCompanySiteId());
 
-            if (requestDto.getStatus() != null && requestDto.getStatus() >= 0) {
-                query.setParameter("p_status", requestDto.getStatus());
+            if (!DataUtil.isNullOrEmpty(requestDto.getStatuses())) {
+                String[] statuses = requestDto.getStatuses().split(",");
+                query.setParameterList("p_statuses", statuses);
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
                 query.setParameter("p_frDateFr", requestDto.getFromDateFr());
@@ -199,8 +200,9 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 String[] types = requestDto.getTypes().split(",");
                 query.setParameterList("p_type", types);
             }
-            if (requestDto.getChanel() != null && !DataUtil.isNullOrZero(requestDto.getChanel())) {
-                query.setParameter("p_chanel", requestDto.getChanel());
+            if (!DataUtil.isNullOrEmpty(requestDto.getChannels())) {
+                String[] channels = requestDto.getChannels().split(",");
+                query.setParameterList("p_channels", channels);
             }
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusFr())) {
                 query.setParameter("p_cusNumFr", requestDto.getNumOfCusFr() == 0 ? null : requestDto.getNumOfCusFr());

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

@@ -56,4 +56,6 @@ public class CampaignRequestDTO extends BaseDTO {
     List<FieldsToShowDTO> lstFiedCustomer;
     List<CustomerListDTO> lstCustomerCampaign;
     String customerListId;
+    String statuses;
+    String channels;
 }

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

@@ -2,15 +2,9 @@ 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.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
-import com.viettel.campaign.utils.BundleUtils;
-import com.viettel.campaign.utils.Constants;
-import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
-import com.viettel.econtact.filter.UserSession;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,16 +14,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
 
 @RestController
 @RequestMapping("/ipcc/campaign")