Merge branch 'anhvd_campaign_mng'

# Conflicts:
#	src/main/java/com/viettel/campaign/repository/CampaignRepositoryCustom.java
#	src/main/java/com/viettel/campaign/repository/CampaignRepositoryImpl.java
#	src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
#	src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java

pom.xml

@@ -156,6 +156,31 @@
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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

 package com.viettel.campaign.repository;
 
 import com.viettel.campaign.web.dto.CampaignDTO;
+import com.viettel.campaign.dto.CampaignDTO;
+import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.dto.request_dto.CampaignRequestDTO;
+import com.viettel.campaign.model.Campaign;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 public interface CampaignRepositoryCustom {
-
     List<CampaignDTO> searchCampaignExecute(String agentId, Pageable pageable);
+    ResultDTO search(CampaignRequestDTO requestDto);
 }

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

 package com.viettel.campaign.service;
 
-import org.springframework.stereotype.Service;
+import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.dto.request_dto.CampaignRequestDTO;
+import com.viettel.campaign.model.Campaign;
+import org.springframework.data.domain.Page;
 
 import java.util.Map;
 
-@Service
 public interface CampaignService {
-
     Map searchCampaignExecute(int page, int pageSize, String sort, String agentId);
+    ResultDTO search(CampaignRequestDTO requestDto);
 }

src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java

 package com.viettel.campaign.service.impl;
 
-<<<<<<< HEAD:src/main/java/com/viettel/campaign/service/CampaignServiceImpl.java
 import com.viettel.campaign.repository.CampaignRepository;
 import com.viettel.campaign.web.dto.CampaignDTO;
-=======
 import com.viettel.campaign.dto.CampaignDTO;
 import com.viettel.campaign.dto.ResultDTO;
 import com.viettel.campaign.dto.request_dto.CampaignRequestDTO;
 import com.viettel.campaign.model.Campaign;
 import com.viettel.campaign.repository.CampaignRepository;
 import com.viettel.campaign.service.CampaignService;
->>>>>>> anhvd_campaign_mng:src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

src/main/java/com/viettel/campaign/service/CampaignServiceImpl.java → src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java~HEAD

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
+<<<<<<< HEAD:src/main/java/com/viettel/campaign/service/CampaignServiceImpl.java
 import com.viettel.campaign.repository.CampaignRepository;
 import com.viettel.campaign.web.dto.CampaignDTO;
+=======
+import com.viettel.campaign.dto.CampaignDTO;
+import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.dto.request_dto.CampaignRequestDTO;
+import com.viettel.campaign.model.Campaign;
+import com.viettel.campaign.repository.CampaignRepository;
+import com.viettel.campaign.service.CampaignService;
+>>>>>>> anhvd_campaign_mng:src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -32,4 +42,9 @@ public class CampaignServiceImpl implements CampaignService {
 
         return result;
     }
+
+    @Override
+    public ResultDTO search(CampaignRequestDTO requestDto) {
+        return campaignRepository.search(requestDto);
+    }
 }

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

@@ -12,6 +12,6 @@ public class ResultDTO {
 
     private String errorCode;
     private String description;
-    private List listData = new ArrayList();
+    private List<?> listData = new ArrayList();
     private Object data;
 }

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

 package com.viettel.campaign.web.rest.controller;
 
+import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.dto.request_dto.CampaignRequestDTO;
+import com.viettel.campaign.model.Campaign;
 import com.viettel.campaign.service.CampaignService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,10 +10,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.data.domain.Page;
 
 import java.util.Map;
 
-@Controller
+@RestController
 @RequestMapping("/ipcc/campaign")
 @CrossOrigin
 public class CampaignController {
@@ -26,4 +31,11 @@ public class CampaignController {
         Map result = campaignService.searchCampaignExecute(page, pageSize, sort, agentId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @RequestMapping(value = "/search",method = RequestMethod.POST)
+    public ResponseEntity<ResultDTO> search(@RequestBody CampaignRequestDTO requestDto) {
+        ResultDTO result = campaignService.search(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
 }