hungtt-commit reallocation customer

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

@@ -19,7 +19,7 @@ public interface CampaignRepositoryCustom {
     ResultDTO checkAllowStatusToPrepare(Long campaignId);
 
     //hungtt
-    ResultDTO findCustomerList(CampaignRequestDTO dto);
+    ResultDTO findCustomerListReallocation(CampaignRequestDTO dto);
     //hungtt
     ResultDTO reallocationCustomer(CampaignRequestDTO dto);
 }

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

@@ -332,7 +332,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO findCustomerList(CampaignRequestDTO dto) {
+    public ResultDTO findCustomerListReallocation(CampaignRequestDTO dto) {
         ResultDTO resultDTO = new ResultDTO();
         List<CustomerCustomDTO> list = new ArrayList<>();
         Map<String, String> params = new HashMap<>();

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

@@ -51,7 +51,7 @@ public interface CampaignService {
     ResultDTO updateCampaign(CampaignDTO dto);
 
     //<editor-fold: hungtt>
-    ResultDTO findCustomerList(CampaignRequestDTO dto);
+    ResultDTO findCustomerListReallocation(CampaignRequestDTO dto);
 
     ResultDTO reallocationCustomer(CampaignRequestDTO dto);
     //</editor-fold>

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

@@ -455,8 +455,8 @@ public class CampaignServiceImpl implements CampaignService {
     // hungtt
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO findCustomerList(CampaignRequestDTO dto) {
-        return campaignRepositoryCustom.findCustomerList(dto);
+    public ResultDTO findCustomerListReallocation(CampaignRequestDTO dto) {
+        return campaignRepositoryCustom.findCustomerListReallocation(dto);
     }
 
     // hungtt

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

@@ -216,10 +216,10 @@ public class CampaignController {
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
-    @PostMapping("/findCustomerList")
+    @PostMapping("/findCustomerListReallocation")
     @ResponseBody
-    public ResponseEntity<?> findCustomerList(@RequestBody CampaignRequestDTO dto) {
-        ResultDTO result = campaignService.findCustomerList(dto);
+    public ResponseEntity<?> findCustomerListReallocation(@RequestBody CampaignRequestDTO dto) {
+        ResultDTO result = campaignService.findCustomerListReallocation(dto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

src/main/resources/sql/campaign-mng/get-list-customer-reallocation.sql

@@ -34,7 +34,7 @@ data as (
     where a.campaign_id = :p_campaign_id
         and a.in_campaign_status = 1
         and a.status in (select connect_status from connect_status_list)
-    order by customerName
+    order by connectTime desc, customerName
 ),
 final_data as (
     select a.*, rownum row_ from data a