Merge branch 'master' into tubn

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

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

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

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

@@ -8,7 +8,7 @@ import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
-public interface CustomerListRepository extends JpaRepository<CustomerList, Long> {
+public interface CustomerListRepository extends JpaRepository<CustomerList, Long>, CustomerListRepositoryCustom {
 
     CustomerList findByCustomerListIdAndCompanySiteId(long customerListId, long companySiteId);
 
@@ -17,14 +17,7 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     @Query("select c from CustomerList c where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id and c.status = 1")
     List<CustomerList> findAllCustomerList(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 
-    @Modifying
-    @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")
-    int deleteCustomerList(@Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
-
     @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 AND COMPANY_SITE_ID =:p_company_site_id", nativeQuery = true)
-    CustomerList latestCreated(@Param("p_company_site_id") Long p_company_site_id);
 }

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.web.dto.CustomerListDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerListRequestDTO;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+public interface CustomerListRepositoryCustom {
+    List<CustomerListDTO> getAllCustomerListByParams(SearchCustomerListRequestDTO searchCustomerListRequestDTO, Pageable pageable);
+}

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

@@ -15,7 +15,7 @@ import java.util.Date;
 import java.util.List;
 
 @Repository
-public interface CustomerRepository extends JpaRepository<Customer, Long> {
+public interface CustomerRepository extends JpaRepository<Customer, Long>, CustomerRepositoryCustom {
 
     Page<Customer> findAll(Pageable pageable);
 

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.web.dto.*;
+import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.econtact.filter.UserSession;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+public interface CustomerRepositoryCustom {
+
+    List<CustomerDetailRequestDTO> getCustomerDetailById(Long companySiteId, Long customerListId, Long customerId);
+
+    List<CustomerCustomDTO> getAllCustomerByParams(SearchCustomerRequestDTO searchCustomerRequestDTO, Pageable pageable);
+
+    List<CampaignInformationDTO> getCampaignInformation(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerDTO> getCustomizeFields(CampaignCustomerDTO campaignCustomerDTO, UserSession userSession, Pageable pageable);
+}

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

@@ -195,8 +195,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("p_customer_id", "%" +
                         dto.getCustomerId().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 
@@ -229,8 +229,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("p_phone_number", "%" +
                         dto.getPhoneNumber().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 
@@ -238,8 +238,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("p_campaign_name", "%" +
                         dto.getCampaignName().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 
@@ -247,8 +247,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("p_user_name", "%" +
                         dto.getAgentId().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 
@@ -526,8 +526,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("pCampaignName", "%" +
                         campaignRequestDto.getCampaignName().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 

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

+package com.viettel.campaign.repository.ccms_full.impl;
+
+import com.viettel.campaign.repository.ccms_full.CustomerListRepositoryCustom;
+import com.viettel.campaign.utils.*;
+import com.viettel.campaign.web.dto.CustomerListDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerListRequestDTO;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.transform.Transformers;
+import org.hibernate.type.DateType;
+import org.hibernate.type.LongType;
+import org.hibernate.type.ShortType;
+import org.hibernate.type.StringType;
+import org.springframework.data.domain.*;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TimeZone;
+
+@Repository
+public class CustomerListRepositoryImpl implements CustomerListRepositoryCustom {
+    @Override
+    public List<CustomerListDTO> getAllCustomerListByParams(SearchCustomerListRequestDTO searchCustomerListRequestDTO, Pageable pageable) {
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes(searchCustomerListRequestDTO.getTimezoneOffset());
+        List<CustomerListDTO> listData = new ArrayList<>();
+
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+        Session session = null;
+
+        try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT");
+            sb.append("    a.CUSTOMER_LIST_ID customerListId,");
+            sb.append("    a.COMPANY_SITE_ID companySiteId,");
+            sb.append("    a.CUSTOMER_LIST_CODE customerListCode,");
+            sb.append("    a.CUSTOMER_LIST_NAME customerListName,");
+            sb.append("    a.STATUS status,");
+            sb.append("    a.CREATE_BY createBy,");
+            sb.append("    a.CREATE_AT createAt,");
+            sb.append("    a.UPDATE_BY updateBy,");
+            sb.append("    a.UPDATE_AT updateAt,");
+            sb.append("    a.SOURCE source,");
+            sb.append("    a.DEPT_CREATE deptCreate,");
+            sb.append("    b.count count");
+            sb.append(" FROM CUSTOMER_LIST a");
+            sb.append(" LEFT JOIN (SELECT COUNT(CAMPAIGN_ID) as count, CUSTOMER_LIST_ID");
+            sb.append(" FROM CAMPAIGN_CUSTOMERLIST");
+            sb.append(" GROUP BY CUSTOMER_LIST_ID) b");
+            sb.append(" ON a.CUSTOMER_LIST_ID = b.CUSTOMER_LIST_ID");
+            sb.append(" WHERE 1 = 1");
+            sb.append("  AND a.STATUS = 1");
+            sb.append("  AND a.COMPANY_SITE_ID = :p_company_site_id");
+
+            sb.append(" AND to_date(CREATE_AT, 'DD/MM/RR') >= to_date(:p_date_from, 'DD/MM/YYYY HH24:MI:SS') AND to_date(CREATE_AT, 'DD/MM/RR') <= to_date(:p_date_to, 'DD/MM/YYYY HH24:MI:SS')");
+
+            if (!DataUtil.isNullOrEmpty(searchCustomerListRequestDTO.getCustomerListCode())) {
+                sb.append(" AND UPPER(CUSTOMER_LIST_CODE) LIKE UPPER(:p_list_code)");
+            }
+            if (!DataUtil.isNullOrEmpty(searchCustomerListRequestDTO.getCustomerListName())) {
+                sb.append(" AND UPPER(CUSTOMER_LIST_NAME) LIKE UPPER(:p_list_name)");
+            }
+
+            sb.append(" ORDER BY CREATE_AT DESC");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
+
+            query.setParameter("p_company_site_id", searchCustomerListRequestDTO.getCompanySiteId());
+            query.setParameter("p_date_from", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd", searchCustomerListRequestDTO.getConvertedDateFrom()), tzClient));
+            query.setParameter("p_date_to", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd", searchCustomerListRequestDTO.getConvertedDateTo()), tzClient));
+
+            if (!DataUtil.isNullOrEmpty(searchCustomerListRequestDTO.getCustomerListCode())) {
+                query.setParameter("p_list_code", "%" +
+                        searchCustomerListRequestDTO.getCustomerListCode().trim()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
+            if (!DataUtil.isNullOrEmpty(searchCustomerListRequestDTO.getCustomerListName())) {
+                query.setParameter("p_list_name", "%" +
+                        searchCustomerListRequestDTO.getCustomerListName().trim()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
+            query.addScalar("customerListId", new LongType());
+            query.addScalar("companySiteId", new LongType());
+            query.addScalar("customerListCode", new StringType());
+            query.addScalar("customerListName", new StringType());
+            query.addScalar("status", new ShortType());
+            query.addScalar("createBy", new StringType());
+            query.addScalar("createAt", new DateType());
+            query.addScalar("updateBy", new StringType());
+            query.addScalar("updateAt", new DateType());
+            query.addScalar("source", new StringType());
+            query.addScalar("deptCreate", new StringType());
+            query.addScalar("count", new StringType());
+
+            query.setResultTransformer(Transformers.aliasToBean(CustomerListDTO.class));
+
+            if (pageable != null) {
+                query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+                query.setMaxResults(pageable.getPageSize());
+            }
+
+            listData = query.list();
+
+            listData.forEach(item -> {
+                item.setCreateAt(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getCreateAt(),tzClient)));
+                if (item.getUpdateAt() != null) {
+                    item.setUpdateAt(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getUpdateAt(),tzClient)));
+                }
+            });
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (session != null) session.close();
+        }
+
+        return listData;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerListRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 
@@ -16,37 +17,27 @@ import java.util.Map;
 
 public interface CustomerService {
 
-    ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
-
     ResultDTO getCustomerId(Long customerId);
 
-    ResultDTO searchAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId, String name, String mobileNumber, String email);
+    ResultDTO searchAllCustomer(SearchCustomerRequestDTO searchCustomerRequestDTO);
 
     ResultDTO createCustomer(CustomerDTO customerDTO);
 
-    ResultDTO deleteCustomer(CustomerRequestDTO customerRequestDTO);
-
     ResultDTO deleteIds(CustomerRequestDTO customerRequestDTO);
 
     ResultDTO getCustomerDetailById(Long companySiteId, Long customerListId, Long customerId);
 
     // ------------ customer list ------------ //
 
-    ResultDTO getAllCustomerList(int page, int pageSize, String sort, Long companySiteId);
-
     // THÍM NÀO MERGE CONFLICT THÌ GIỮ LẠI HỘ E CÁI METHOD NÀY VỚI
     // VIẾT ĐI VIẾT LẠI 4 LẦN RỒI ĐẤY
     ResultDTO createCustomerList(CustomerListDTO customerListDTO, String userName);
 
     ResultDTO updateCustomerList(CustomerListDTO customerListDTO, String userName);
 
-    ResultDTO deleteCustomerList(CustomerListDTO customerListDTO);
-
     ResultDTO deleteCustomerListIds(CustomerRequestDTO customerRequestDTO);
 
-    ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO);
-
-    CustomerList getLatestCreated(Long companySiteId);
+    ResultDTO searchCustomerList(SearchCustomerListRequestDTO searchCustomerListRequestDTO);
 
     // ------------ customer contact ------------ //
 

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

@@ -28,7 +28,7 @@ public interface ScenarioService {
 
     XSSFWorkbook buildTemplate() throws IOException;
 
-    Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
+    Map<String, Object> readAndValidateScenario(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
 
     List<ContactQuestResult> getContactQuestResult(Long companySiteId, Long campaignId, Long customerId);
 }

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

@@ -80,7 +80,6 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
             if (scenarioQuestionDTO.getLstAnswers().size() > 0) {
                 lstAnswers = scenarioQuestionDTO.getLstAnswers();
                 lstAnswers.forEach(item -> {
-                    item.setCode(scenarioQuestion.getCode() + "_" + item.getOrderIndex());
                     item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
                     item.setCreateTime(new Date());
                     item.setStatus((short) 1);

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

@@ -254,7 +254,7 @@ public class ScenarioServiceImpl implements ScenarioService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public Map<String, Object> readAndValidateCustomer (String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException{
+    public Map<String, Object> readAndValidateScenario (String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException{
         Locale locale = new Locale("vi", "VN");
         SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         Map<String, Object> result = new HashMap<>();
@@ -551,6 +551,7 @@ public class ScenarioServiceImpl implements ScenarioService {
         lstQuestions.forEach(q2 -> {
             List<ScenarioAnswerDTO> lstAnswers = q2.getLstAnswers();
             lstAnswers.forEach(a2 -> {
+                a2.setCode(q2.getCode() + "_" + a2.getOrderIndex());
                 ScenarioQuestionDTO mappingQuestion = lstQuestions.stream().filter(mq -> mq.getImportCode().equals(a2.getMappingQuestionCode())).findFirst().orElse(null);
                 if (mappingQuestion != null) {
                     a2.setMappingQuestionCode(mappingQuestion.getCode());

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

@@ -8,7 +8,6 @@ import java.util.List;
 @Getter
 @Setter
 public class CustomerRequestDTO {
-    Long customerId;
     Long customerListId;
     List<Long> ids;
     Long companySiteId;

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

+package com.viettel.campaign.web.dto.request_dto;
+
+import com.viettel.campaign.web.dto.BaseDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SearchCustomerListRequestDTO extends BaseDTO {
+    String customerListCode;
+    String customerListName;
+    String convertedDateFrom;
+    String convertedDateTo;
+    String companySiteId;
+    Long timezoneOffset;
+}

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

@@ -7,10 +7,9 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SearchCustomerRequestDTO extends BaseDTO {
-    String customerListCode;
-    String customerListName;
-    String convertedDateFrom;
-    String convertedDateTo;
-    String companySiteId;
-    Integer timezoneOffset;
+    Long companySiteId;
+    Long customerListId;
+    String name;
+    String mobileNumber;
+    String email;
 }

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

@@ -24,7 +24,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/ipcc/campaign/execute")
-//@CrossOrigin
+@CrossOrigin(origins = "*")
 public class CampaignExecuteController {
 
     private static final Logger logger = LoggerFactory.getLogger(CampaignController.class);

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

@@ -9,6 +9,7 @@ import com.viettel.campaign.utils.Config;
 import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerListRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import org.apache.commons.io.FilenameUtils;
@@ -44,13 +45,6 @@ public class CustomerController {
     @Autowired(required = true)
     CustomerService customerService;
 
-    @GetMapping("/findAll")
-    @ResponseBody
-    public ResponseEntity findAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("customerListId") long customerListId, @RequestParam("companySiteId") long companySiteId) {
-        ResultDTO result = customerService.getAllCustomer(page, pageSize, sort, customerListId, companySiteId);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
     @GetMapping("/findCustomerId")
     @ResponseBody
     public ResponseEntity<ResultDTO> findAllCustomerName(@RequestParam("customerId") Long customerId) {
@@ -58,10 +52,10 @@ public class CustomerController {
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
-    @GetMapping("/searchAllCustomerByParams")
+    @PostMapping("/searchAllCustomerByParams")
     @ResponseBody
-    public ResponseEntity findAllCustomerByParams(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("customerListId") Long customerListId, @RequestParam("companySiteId") Long companySiteId, @RequestParam("name") String name, @RequestParam("mobileNumber") String mobileNumber, @RequestParam("email") String email) {
-        ResultDTO result = customerService.searchAllCustomer(page, pageSize, sort, customerListId, companySiteId, name, mobileNumber, email);
+    public ResponseEntity findAllCustomerByParams(@RequestBody SearchCustomerRequestDTO searchCustomerRequestDTO) {
+        ResultDTO result = customerService.searchAllCustomer(searchCustomerRequestDTO);
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
@@ -73,14 +67,6 @@ public class CustomerController {
         return result;
     }
 
-    @PostMapping("/delete")
-    @ResponseBody
-    public ResultDTO deleteCustomer(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
-        ResultDTO resultDTO = new ResultDTO();
-        resultDTO = customerService.deleteCustomer(customerRequestDTO);
-        return resultDTO;
-    }
-
     @PostMapping("/deleteIds")
     @ResponseBody
     public ResultDTO deleteIds(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
@@ -98,14 +84,6 @@ public class CustomerController {
 
 
     // --------------- customer list table ----------------- //
-
-    @GetMapping("/findAlls")
-    @ResponseBody
-    public ResponseEntity findAllCustomerList(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("companySiteId") Long companySiteId) {
-        ResultDTO result = customerService.getAllCustomerList(page, pageSize, sort, companySiteId);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
     @PostMapping("/createCustomerList")
     @ResponseBody
     public ResultDTO createCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO, HttpServletRequest request) {
@@ -129,14 +107,6 @@ public class CustomerController {
         return customerService.updateCustomerList(customerListDTO, userSession.getUserName());
     }
 
-    @PostMapping("/deleteCustomerList")
-    @ResponseBody
-    public ResultDTO deleteCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO) {
-        ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomerList(customerListDTO);
-        return result;
-    }
-
     @PostMapping("/deleteCustomerListIds")
     @ResponseBody
     public ResultDTO deleteCustomerListIds(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
@@ -146,16 +116,8 @@ public class CustomerController {
     }
 
     @RequestMapping(value = "/searchCustomerList", method = RequestMethod.POST)
-    public ResponseEntity searchCustomerList(@RequestBody SearchCustomerRequestDTO searchCustomerRequestDTO) {
-        ResultDTO result = customerService.searchCustomerList(searchCustomerRequestDTO);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
-    @GetMapping("/latestCreated")
-    @ResponseBody
-    public ResponseEntity getLatestCreated(@RequestParam("companySiteId") Long companySiteId) {
-        ResultDTO result = new ResultDTO();
-        result.setData(customerService.getLatestCreated(companySiteId));
+    public ResponseEntity searchCustomerList(@RequestBody SearchCustomerListRequestDTO searchCustomerListRequestDTO) {
+        ResultDTO result = customerService.searchCustomerList(searchCustomerListRequestDTO);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

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

@@ -118,7 +118,7 @@ public class ScenarioController {
                 return new ResponseEntity<>(BundleUtils.getLangString("common.fileInvalidFormat", locale), HttpStatus.OK);
             }
             String path = saveUploadFile(file);
-            Map<String, Object> map = scenarioService.readAndValidateCustomer(path, scenarioId, campaignId, userSession.getCompanySiteId());
+            Map<String, Object> map = scenarioService.readAndValidateScenario(path, scenarioId, campaignId, userSession.getCompanySiteId());
             String code = (String) map.get("code");
             byte[] content = (byte[]) map.get("content");
             return ResponseEntity.ok()

src/main/resources/i18n/language_en.properties

@@ -14,6 +14,7 @@ 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.execute.interactive.callTime = Thời lượng cuộc gọi
 
 #Campaign
 campaign = Campaigns

src/main/resources/i18n/language_vi.properties

@@ -14,6 +14,7 @@ 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
+campaign.execute.interactive.callTime = Thời lượng cuộc gọi
 
 
 #Campaigns