Commit 338033d7 authored by đinh thị đầm's avatar đinh thị đầm

searchCustomize

parent ce797e37
...@@ -86,6 +86,6 @@ public interface CustomerService { ...@@ -86,6 +86,6 @@ public interface CustomerService {
//// List<CustomizeFields> searchCustomize(); //// List<CustomizeFields> searchCustomize();
ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields); ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields);
ResultDTO searchCustomizeFields(int page, int pageSize, long companySiteId, long campaignId, CustomerQueryDTO customerQueryDTO); ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO);
} }
package com.viettel.campaign.web.dto; package com.viettel.campaign.web.dto;
import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.Date; import java.util.Date;
import java.util.List;
@Getter @Getter
@Setter @Setter
...@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{ ...@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{
private Long companySiteId; private Long companySiteId;
private Long complainId; private Long complainId;
private String lstCustomerId; private String lstCustomerId;
private List<CustomerQueryDTO> listQuery;
} }
package com.viettel.campaign.web.dto; package com.viettel.campaign.web.dto;
import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.Date; import java.util.Date;
import java.util.List;
@Getter @Getter
@Setter @Setter
...@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO { ...@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO {
private Long min; private Long min;
private Long max; private Long max;
private Long active; private Long active;
} }
...@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO { ...@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO {
String field; String field;
String operator; String operator;
String condition; String condition;
} }
...@@ -12,6 +12,7 @@ import com.viettel.campaign.utils.Config; ...@@ -12,6 +12,7 @@ import com.viettel.campaign.utils.Config;
import com.viettel.campaign.utils.Constants; import com.viettel.campaign.utils.Constants;
import com.viettel.campaign.utils.RedisUtil; import com.viettel.campaign.utils.RedisUtil;
import com.viettel.campaign.web.dto.*; 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.CustomerRequestDTO;
import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo; import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO; import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
...@@ -308,4 +309,13 @@ public class CustomerController { ...@@ -308,4 +309,13 @@ public class CustomerController {
ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo); ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo);
return new ResponseEntity<>(resultDTO, HttpStatus.OK); 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);
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment