anhvd commit

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

@@ -13,20 +13,20 @@ public interface CustomerListMappingRepository extends JpaRepository<CustomerLis
     // ----------- customer ------------ //
 
     @Modifying
-    @Query("delete from CustomerListMapping c where c.customerId=:p_customer_id and c.customerListId=:p_customer_list_id")
-    int deleteMappingByCustomerId(@Param("p_customer_id") Long p_customer_id, @Param("p_customer_list_id") Long p_customer_list_id);
+    @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_id) and c.customerListId =:p_customer_list_id")
-    int deleteMappingByCustomerIds(@Param("p_id") List<Long> p_id, @Param("p_customer_list_id") Long p_customer_list_id);
+    @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_customerListId")
-    int deleteMappingByCustomerListId(@Param("p_customerListId") Long p_customerListId);
+    @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)")
-    int deleteMappingByCustomerListIds(@Param("p_ids") List<Long> p_ids);
+    @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/CustomerListRepository.java

@@ -10,15 +10,15 @@ import java.util.List;
 
 public interface CustomerListRepository extends JpaRepository<CustomerList, Long> {
 
-    CustomerList findCustomerListByCustomerListId(long customerListId);
+    CustomerList findByCustomerListIdAndCompanySiteId(long customerListId, long companySiteId);
 
     CustomerList findByCustomerListCode(String customerListCode);
 
     @Modifying
-    @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customerListId")
-    int deleteCustomerList(@Param("p_customerListId") Long p_customerListId);
+    @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)")
-    int deleteCustomerListIds(@Param("p_ids") List<Long> p_ids);
+    @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);
 }

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

@@ -3,16 +3,14 @@ package com.viettel.campaign.service;
 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.CampaignCustomerRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.DeleteCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 public interface CustomerService {
 
-    Map listAllCustomer(int page, int pageSize, String sort);
+    ResultDTO listAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
 
     ResultDTO getCustomerId(Long customerId);
 
@@ -20,9 +18,9 @@ public interface CustomerService {
 
     ResultDTO createCustomer(CustomerDTO customerDTO);
 
-    ResultDTO deleteCustomer(DeleteCustomerRequestDTO deleteCustomerRequestDTO);
+    ResultDTO deleteCustomer(CustomerRequestDTO customerRequestDTO);
 
-    ResultDTO deleteIds(DeleteCustomerRequestDTO deleteCustomerRequestDTO);
+    ResultDTO deleteIds(CustomerRequestDTO customerRequestDTO);
 
     // ------------ customer list ------------ //
 
@@ -34,7 +32,9 @@ public interface CustomerService {
 
     ResultDTO deleteCustomerList(CustomerListDTO customerListDTO);
 
-    ResultDTO deleteCustomerListIds(List<Long> ids);
+    ResultDTO deleteCustomerListIds(CustomerRequestDTO customerRequestDTO);
+
+    ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO);
 
     ResultDTO searchCustomerList(CampaignCustomerRequestDTO campaignCustomerRequestDTO);
 

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

@@ -5,7 +5,6 @@ import java.nio.file.Paths;
 import java.io.IOException;
 
 import com.viettel.campaign.web.dto.BaseDTO;
-import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CustomerCustomDTO {
+    Long customerListMappingId;
+    Long companySiteId;
+    Long customerListId;
+    Long customerId;
+    String name;
+    String description;
+    String companyName;
+    String customerType;
+    String currentAddress;
+    String mobileNumber;
+    String email;
+}

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

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

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

@@ -6,7 +6,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class CampaignCustomerRequestDTO extends BaseDTO {
+public class SearchCustomerRequestDTO extends BaseDTO {
     String customerListCode;
     String customerListName;
     String convertedDateFrom;

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

@@ -4,8 +4,8 @@ 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.service.CustomerService;
-import com.viettel.campaign.web.dto.request_dto.CampaignCustomerRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.DeleteCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -14,12 +14,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 import java.util.Map;
 
 @Controller
 @RequestMapping("/ipcc/customer")
-@CrossOrigin("*")
+@CrossOrigin(origins = "*")
 public class CustomerController {
 
     private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
@@ -29,8 +28,8 @@ public class CustomerController {
 
     @GetMapping("/findAll")
     @ResponseBody
-    public ResponseEntity findAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
-        Map result = customerService.listAllCustomer(page, pageSize, sort);
+    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.listAllCustomer(page, pageSize, sort, customerListId, companySiteId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -69,17 +68,17 @@ public class CustomerController {
 
     @PostMapping("/delete")
     @ResponseBody
-    public ResultDTO deleteCustomer(@RequestBody @Valid DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
+    public ResultDTO deleteCustomer(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomer(deleteCustomerRequestDTO);
+        result = customerService.deleteCustomer(customerRequestDTO);
         return result;
     }
 
     @PostMapping("/deleteIds")
     @ResponseBody
-    public ResultDTO deleteIds(@RequestBody @Valid DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
+    public ResultDTO deleteIds(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteIds(deleteCustomerRequestDTO);
+        result = customerService.deleteIds(customerRequestDTO);
         return result;
     }
 
@@ -142,15 +141,15 @@ public class CustomerController {
 
     @PostMapping("/deleteCustomerListIds")
     @ResponseBody
-    public ResultDTO deleteCustomerListIds(@RequestBody @Valid List<Long> ids) {
+    public ResultDTO deleteCustomerListIds(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomerListIds(ids);
+        result = customerService.deleteCustomerListIds(customerRequestDTO);
         return result;
     }
 
     @RequestMapping(value = "/searchCustomerList", method = RequestMethod.POST)
-    public ResponseEntity searchCustomerList(@RequestBody CampaignCustomerRequestDTO campaignCustomerRequestDTO) {
-        ResultDTO result = customerService.searchCustomerList(campaignCustomerRequestDTO);
+    public ResponseEntity searchCustomerList(@RequestBody SearchCustomerRequestDTO searchCustomerRequestDTO) {
+        ResultDTO result = customerService.searchCustomerList(searchCustomerRequestDTO);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

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

+select
+    a.CUSTOMER_LIST_MAPPING_ID customerListMappingId,
+    a.COMPANY_SITE_ID companySiteId,
+    a.CUSTOMER_LIST_ID customerListId,
+    a.CUSTOMER_ID customerId,
+    b.NAME name,
+    b.DESCRIPTION description,
+    b.COMPANY_NAME companyName,
+    b.CUSTOMER_TYPE customerType,
+    b.CURRENT_ADDRESS currentAddress,
+    c.MOBILE mobileNumber,
+    d.EMAIL email
+from CUSTOMER_LIST_MAPPING a
+         join CUSTOMER b on a.CUSTOMER_ID = b.CUSTOMER_ID
+         left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS MOBILE
+               FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 GROUP BY CUSTOMER_ID) c on b.CUSTOMER_ID = c.CUSTOMER_ID
+         left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS EMAIL
+               FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 GROUP BY CUSTOMER_ID) d on b.CUSTOMER_ID = d.CUSTOMER_ID
+where 1 = 1
+   and COMPANY_SITE_ID = :p_company_site_id
+   and CUSTOMER_LIST_ID = :p_customer_list_id

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 CREATE_AT BETWEEN :p_date_from AND :p_date_to
+  AND CREATE_AT BETWEEN to_date(:p_date_from, 'YYYYMMDD') AND to_date(:p_date_to, 'YYYYMMDD')
+  AND COMPANY_SITE_ID = :p_company_site_id