phi pd commit: chinh sua tim kiem

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

@@ -6,9 +6,27 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
+
 public interface CustomerListMappingRepository extends JpaRepository<CustomerListMapping, Long> {
 
+    // ----------- 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);
+
+    @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);
+
+    // ----------- customer list --------------- //
+
+    @Modifying
+    @Query("delete from CustomerListMapping c where c.customerListId=:p_customerListId")
+    int deleteMappingByCustomerListId(@Param("p_customerListId") Long p_customerListId);
+
     @Modifying
-    @Query("delete from CustomerListMapping c where c.customerListId=:customerListId")
-    int deleteMappingByCustomerListId(@Param("customerListId") Long customerListId);
+    @Query("delete from CustomerListMapping c where c.customerListId in (:p_ids)")
+    int deleteMappingByCustomerListIds(@Param("p_ids") List<Long> p_ids);
 }

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

@@ -15,6 +15,10 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     CustomerList findByCustomerListCode(String customerListCode);
 
     @Modifying
-    @Query("delete from CustomerList c where c.customerListId in (:ids)")
-    int deleteCustomerListIds(@Param("ids") List<Long> ids);
+    @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customerListId")
+    int deleteCustomerList(@Param("p_customerListId") Long p_customerListId);
+
+    @Modifying
+    @Query("update CustomerList c set c.status = 0 where c.customerListId in (:p_ids)")
+    int deleteCustomerListIds(@Param("p_ids") List<Long> p_ids);
 }

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

@@ -3,6 +3,8 @@ 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 java.util.Date;
 import java.util.List;
@@ -16,9 +18,9 @@ public interface CustomerService {
 
     ResultDTO createCustomer(CustomerDTO customerDTO);
 
-    ResultDTO deleteCustomer(CustomerDTO customerDTO);
+    ResultDTO deleteCustomer(DeleteCustomerRequestDTO deleteCustomerRequestDTO);
 
-    ResultDTO deleteIds(List<Long> ids);
+    ResultDTO deleteIds(DeleteCustomerRequestDTO deleteCustomerRequestDTO);
 
     // ------------ customer list ------------ //
 
@@ -32,5 +34,5 @@ public interface CustomerService {
 
     ResultDTO deleteCustomerListIds(List<Long> ids);
 
-    ResultDTO searchCustomerList(String customerListCode, String customerListName, Date dateFrom, Date dateTo, int page, int pageSize, String sort);
+    ResultDTO searchCustomerList(CampaignCustomerRequestDTO campaignCustomerRequestDTO);
 }

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

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.service.CampaignCompleteCodeService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;

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

@@ -17,7 +17,6 @@ import org.springframework.data.domain.Sort;
 public class SQLBuilder {
     public static final String SQL_MODULE_CAMPAIGN_MNG = "campaign-mng";
     public static final String SQL_MODULE_CAMPAIGN_STATUS_MNG = "campaign-status-mng";
-    public static final String SQL_MODULE_CAMPAIGN_CUSTOMER = "campaign-customer";
 
     public static String getSqlQueryById(String module,
                                          String queryId) {

src/main/java/com/viettel/campaign/web/dto/request_dto/CampaignCustomerRequestDTO.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 CampaignCustomerRequestDTO extends BaseDTO {
+    String customerListCode;
+    String customerListName;
+    String convertedDateFrom;
+    String convertedDateTo;
+    String companySiteId;
+}

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

+package com.viettel.campaign.web.dto.request_dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class DeleteCustomerRequestDTO {
+    Long customerId;
+    Long customerListId;
+    List<Long> customerIds;
+}

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

@@ -4,6 +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 org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -12,7 +14,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -61,17 +62,17 @@ public class CustomerController {
 
     @PostMapping("/delete")
     @ResponseBody
-    public ResultDTO deleteCustomer(@RequestBody @Valid CustomerDTO customerDTO) {
+    public ResultDTO deleteCustomer(@RequestBody @Valid DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomer(customerDTO);
+        result = customerService.deleteCustomer(deleteCustomerRequestDTO);
         return result;
     }
 
     @PostMapping("/deleteIds")
     @ResponseBody
-    public ResultDTO deleteIds(@RequestBody @Valid List<Long> ids) {
+    public ResultDTO deleteIds(@RequestBody @Valid DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteIds(ids);
+        result = customerService.deleteIds(deleteCustomerRequestDTO);
         return result;
     }
 
@@ -140,10 +141,9 @@ public class CustomerController {
         return result;
     }
 
-    @GetMapping("/searchCustomerList")
-    @ResponseBody
-    public ResponseEntity searchCustomerList(@RequestParam("customerListCode") String customerListCode, @RequestParam("customerListName") String customerListName, @RequestParam("dateFrom") Date dateFrom, @RequestParam("dateTo") Date dateTo, @RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
-        ResultDTO result = customerService.searchCustomerList(customerListCode, customerListName, dateFrom, dateTo, page, pageSize, sort);
+    @RequestMapping(value = "/searchCustomerList", method = RequestMethod.POST)
+    public ResponseEntity searchCustomerList(@RequestBody CampaignCustomerRequestDTO campaignCustomerRequestDTO) {
+        ResultDTO result = customerService.searchCustomerList(campaignCustomerRequestDTO);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 }

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

 SELECT
-    CUSTOMER_LIST_ID,
-    COMPANY_SITE_ID,
-    CUSTOMER_LIST_CODE,
-    CUSTOMER_LIST_NAME,
-    STATUS,
-    CREATE_BY,
-    CREATE_AT,
-    UPDATE_BY,
-    UPDATE_AT,
-    SOURCE,
-    DEPT_CREATE
+    CUSTOMER_LIST_ID customerListId,
+    COMPANY_SITE_ID companySiteId,
+    CUSTOMER_LIST_CODE customerListCode,
+    CUSTOMER_LIST_NAME customerListName,
+    STATUS status,
+    CREATE_BY createBy,
+    CREATE_AT createAt,
+    UPDATE_BY updateBy,
+    UPDATE_AT updateAt,
+    SOURCE source,
+    DEPT_CREATE deptCreate
 FROM CUSTOMER_LIST
 WHERE 1 = 1
 AND CREATE_AT BETWEEN :p_date_from AND :p_date_to