Merge branch 'master' of https://git.myitsol.com/hanv/service-campaign

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

@@ -183,6 +183,7 @@ public class CustomerController {
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
+    //<editor-fold desc="Download and import excel" defaultState="collapsed">
     @GetMapping(value = "/downloadFileTemplate")
     public ResponseEntity<byte[]> downloadFileTemplate(@RequestParam("companySiteId") Long companySiteId) {
         LOGGER.debug("--------DOWNLOAD FILE TEMPLATE---------");
@@ -239,14 +240,18 @@ public class CustomerController {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
+    //</editor-fold>
 
-    @RequestMapping(value = "/searchCustomerListInfoFromCustomerList", method = RequestMethod.GET)
-    public ResultDTO searchCustomerListInfoFromCustomerList(@RequestParam("page") int page,
-                                                            @RequestParam("pageSize") int pageSize,
-                                                            @RequestParam("sort") String sort,
-                                                            @RequestParam("campaignId") Long campaignId,
-                                                            @RequestParam("companySiteId") Long companySiteId) {
-        return null;// customerService.searchCustomerListInfoFromCustomerList(page, pageSize, sort, campaignId, companySiteId);
+    @PostMapping("/getCustomerListInfo")
+    public ResponseEntity<?> getCustomerListInfo(@RequestBody CampaignCustomerDTO dto) {
+        List<CustomerListDTO> customers = customerService.getCustomerListInfo(dto);
+        return new ResponseEntity<>(customers, HttpStatus.OK);
+    }
+
+    @PostMapping("/getIndividualCustomerInfo")
+    public ResponseEntity<?> getIndividualCustomerInfo(@RequestBody CampaignCustomerDTO dto) {
+        List<CustomerDTO> customers = customerService.getIndividualCustomerInfo(dto);
+        return new ResponseEntity<>(customers, HttpStatus.OK);
     }
 
     @PostMapping("/getCustomizeField")