anhvd commit merge

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

@@ -19,7 +19,9 @@ import org.hibernate.transform.Transformers;
 import org.hibernate.type.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
@@ -27,9 +29,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
@@ -638,7 +641,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     "),\n" +
                     "data as (\n" +
                     "select a.*, rownum row_ from data_temp a\n" +
-                    "where a.totalCusList > 0" +
+                    "where a.totalCusCampaign > 0" +
                     "),\n" +
                     "count_data as (\n" +
                     "select count(*) totalRow from data_temp\n" +

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

@@ -90,6 +90,6 @@ public interface CustomerService {
 ////    List<CustomizeFields> searchCustomize();
     ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields);
 
-    ResultDTO searchCustomizeFields(int page, int pageSize, long companySiteId, long campaignId, CustomerQueryDTO customerQueryDTO);
+    ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO);
 
 }

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

 package com.viettel.campaign.web.dto;
 
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{
     private Long companySiteId;
     private Long complainId;
     private String lstCustomerId;
+    private List<CustomerQueryDTO>  listQuery;
+
+
 }

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

 package com.viettel.campaign.web.dto;
 
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO {
     private Long min;
     private Long max;
     private Long active;
+
 }

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

@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO {
     String field;
     String operator;
     String condition;
+
 }

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

@@ -12,6 +12,7 @@ import com.viettel.campaign.utils.Config;
 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.CustomerQueryDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
@@ -322,4 +323,13 @@ public class CustomerController {
         ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
+    @PostMapping("/searchCustomizeFields")
+    @ResponseBody
+    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO ) {
+        ResultDTO result = customerService.searchCustomizeFields(campaignCustomerDTO);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+
 }