phipd commit

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

@@ -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/CustomerRepositoryCustom.java

 package com.viettel.campaign.repository.ccms_full;
 
-import com.viettel.campaign.web.dto.CustomerCustomDTO;
+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;
@@ -12,4 +13,12 @@ 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

@@ -523,8 +523,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("pCampaignName", "%" +
                         campaignRequestDto.getCampaignName().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 

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

@@ -35,14 +35,10 @@ public interface CustomerService {
 
     ResultDTO updateCustomerList(CustomerListDTO customerListDTO, String userName);
 
-    ResultDTO deleteCustomerList(CustomerListDTO customerListDTO);
-
     ResultDTO deleteCustomerListIds(CustomerRequestDTO customerRequestDTO);
 
     ResultDTO searchCustomerList(SearchCustomerListRequestDTO searchCustomerListRequestDTO);
 
-    CustomerList getLatestCreated(Long companySiteId);
-
     // ------------ customer contact ------------ //
 
     ResultDTO getCustomerContact(CustomerContactDTO customer);

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

@@ -107,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) {
@@ -129,14 +121,6 @@ public class CustomerController {
         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));
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
     @PostMapping("/findCustomerContact")
     @ResponseBody
     public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestBody CustomerContactDTO customerContactDTO) {