findAll with companySiteID

pom.xml

@@ -212,24 +212,6 @@
             <version>2.3.0</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-
-
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/viettel/campaign/config/JobConfig.java

@@ -26,19 +26,19 @@ import java.util.concurrent.ScheduledFuture;
  * @project campaign
  */
 
-@Slf4j
-@EnableScheduling
-@Configuration
-public class JobConfig implements SchedulingConfigurer {
-
-    TaskScheduler taskScheduler;
-    private ScheduledFuture<?> job1;
-    private ScheduledFuture<?> job2;
-
-    @Bean
-    public CampaignJob campaignJob(){
-        return new CampaignJob();
-    }
+//@Slf4j
+//@EnableScheduling
+//@Configuration
+//public class JobConfig implements SchedulingConfigurer {
+//
+//    TaskScheduler taskScheduler;
+//    private ScheduledFuture<?> job1;
+//    private ScheduledFuture<?> job2;
+//
+//    @Bean
+//    public CampaignJob campaignJob(){
+//        return new CampaignJob();
+//    }
 
 //    @Override
 //    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@@ -53,47 +53,47 @@ public class JobConfig implements SchedulingConfigurer {
 //        taskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
 //    }
 
-    private void job1(TaskScheduler scheduler) {
-        job1 = scheduler.schedule(() -> {
-            log.info("processing job1 ...");
-            log.info(Thread.currentThread().getName() + " The Task1 executed at " + new Date());
-            try {
-                Thread.sleep(10000);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }, triggerContext -> {
-
-            String cronExp = "0/5 * * * * ?";// Can be pulled from a db .
-            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
-        });
-    }
-
-    private void job2(TaskScheduler scheduler) {
-        job2 = scheduler.schedule(() -> {
-            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
-            campaignJob().process();
-
-        }, triggerContext -> {
-            String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
-            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
-        });
-    }
-
-
-
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
-        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-        threadPoolTaskScheduler.setPoolSize(10);
-        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
-        threadPoolTaskScheduler.initialize();
-        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
-//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
-        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
-            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
-            return trigger.nextExecutionTime(triggerContext);
-        });
-    }
-}
+//    private void job1(TaskScheduler scheduler) {
+//        job1 = scheduler.schedule(() -> {
+//            log.info("processing job1 ...");
+//            log.info(Thread.currentThread().getName() + " The Task1 executed at " + new Date());
+//            try {
+//                Thread.sleep(10000);
+//            } catch (InterruptedException e) {
+//                // TODO Auto-generated catch block
+//                e.printStackTrace();
+//            }
+//        }, triggerContext -> {
+//
+//            String cronExp = "0/5 * * * * ?";// Can be pulled from a db .
+//            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
+//        });
+//    }
+//
+//    private void job2(TaskScheduler scheduler) {
+//        job2 = scheduler.schedule(() -> {
+//            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
+//            campaignJob().process();
+//
+//        }, triggerContext -> {
+//            String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
+//            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
+//        });
+//    }
+//
+//
+//
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+//        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+//        threadPoolTaskScheduler.setPoolSize(10);
+//        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
+//        threadPoolTaskScheduler.initialize();
+//        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
+////        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
+//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
+//            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
+//            return trigger.nextExecutionTime(triggerContext);
+//        });
+//    }
+//}

src/main/java/com/viettel/campaign/job/CampaignJob.java

@@ -42,51 +42,51 @@ public class CampaignJob {
 
         list.parallelStream().forEach(p -> {
             boolean isExecute = DateTimeUtil.isRun(p.getConfigValue(), p.getLastProcess());
-            switch (p.getConfigCode()){
-                case CUSTOMER_INACTIVE_DUARATION:
-                    if(isExecute){
-
-                    }
-                    break;
-                case CRON_EXPRESSION_CHECK_START:
-                    // process
-                    if(isExecute){
-                        // chuyen trang thai Du thao sang Trien khai
-                        log.info("thay doi trang thai");
-                        List<Long> status = new ArrayList<>();
-                        status.add(1L);
-                        status.add(1L);
-                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
-                        campaigns.parallelStream().forEach(campaign -> {
-                            campaign.setProcessStatus(1);
-                            campaign.setStatus(2L);
-                            campaign.setCampaignStart(new Date());
-                            campaignService.updateProcess(campaign);
-                        });
-
-                        // update last check
-                        p.setLastProcess(new Date());
-                        processConfigService.update(p);
-                    }
-                    break;
-                case CRON_EXPRESSION_CHECK_END:
-                    // process
-                    if(isExecute){
-                        // chuyen trang thai sang ket thuc
-                        List<Long> status = new ArrayList<>();
-                        status.add(2L);
-                        status.add(3L);
-                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
-                        campaigns.parallelStream().forEach(campaign -> {
-                            campaign.setStatus(4L);
-                            campaign.setCampaignEnd(new Date());
-                            campaignService.updateProcess(campaign);
-                        });
-                    }
-                    break;
-                default:
-
-            }
+//            switch (p.getConfigCode()){
+//                case CUSTOMER_INACTIVE_DUARATION:
+//                    if(isExecute){
+//
+//                    }
+//                    break;
+//                case CRON_EXPRESSION_CHECK_START:
+//                    // process
+//                    if(isExecute){
+//                        // chuyen trang thai Du thao sang Trien khai
+//                        log.info("thay doi trang thai");
+//                        List<Long> status = new ArrayList<>();
+//                        status.add(1L);
+//                        status.add(1L);
+//                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+//                        campaigns.parallelStream().forEach(campaign -> {
+//                            campaign.setProcessStatus(1);
+//                            campaign.setStatus(2L);
+//                            campaign.setCampaignStart(new Date());
+//                            campaignService.updateProcess(campaign);
+//                        });
+//
+//                        // update last check
+//                        p.setLastProcess(new Date());
+//                        processConfigService.update(p);
+//                    }
+//                    break;
+//                case CRON_EXPRESSION_CHECK_END:
+//                    // process
+//                    if(isExecute){
+//                        // chuyen trang thai sang ket thuc
+//                        List<Long> status = new ArrayList<>();
+//                        status.add(2L);
+//                        status.add(3L);
+//                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+//                        campaigns.parallelStream().forEach(campaign -> {
+//                            campaign.setStatus(4L);
+//                            campaign.setCampaignEnd(new Date());
+//                            campaignService.updateProcess(campaign);
+//                        });
+//                    }
+//                    break;
+//                default:
+//
+//            }
         });
 
 

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

@@ -17,7 +17,6 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     @Query(" select u FROM CampaignCompleteCode u WHERE u.status = 1")
     Page<CampaignCompleteCode> findAll(Pageable pageable);
 
-    //    Page<CampaignCompleteCode> findAllByStatus(String status, Pageable pageable);
 
     @Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ")
     List<CampaignCompleteCode> findByName(@Param("name") String name, Pageable pageable);
@@ -26,23 +25,23 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
 
     @Modifying
     @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:p_ids) and c.companySiteId=:p_company_site_id" )
-    int deleteds(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
+    int deletedList(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 
-    //    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
-    //    Short findByMaxCompanySiteId(Long companySiteId);
 
     List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
 
     @Query(value="SELECT max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
     Short findByMaxCompanySiteId(Long companySiteId);
-
-    //    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
-
-    //    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
+    @Modifying
+    @Query("update CampaignCompleteCode c set c.status = 0 where c.campaignCompleteCodeId=:p_campaignCompleteCode_list_id and c.companySiteId=:p_company_site_id")
+    int deleteCampaignCompleteCodeBy(@Param("p_campaignCompleteCode_list_id") Long p_campaignCompleteCode_list_id, @Param("p_company_site_id") Long p_company_site_id);
 
     @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue = :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
     List<CampaignCompleteCode> getCustomerStatus(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
 
     @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue <> :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
     List<CampaignCompleteCode> getCustomerStatusWithoutValue(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
+
+    @Query("select c from CampaignCompleteCode c where c.companySiteId =:p_company_site_id")
+    List<CampaignCompleteCode> findAllCampaignCompleteCode();
 }

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

@@ -9,7 +9,7 @@ import java.util.Map;
 
 public interface CampaignCompleteCodeService {
 
-    Map listAllCompleteCode(int page, int pageSize, String sort);
+    ResultDTO listAllCompleteCode(int page, int pageSize, String sort,Long companySiteId);
 
     Map listCompleteCodeByName(int page, int pageSize, String sort, String name);
 
@@ -17,7 +17,7 @@ public interface CampaignCompleteCodeService {
 
     ResultDTO updateCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
 
-    ResultDTO deleteCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
+    ResultDTO deleteCompleteCode(CampaignCompleteCodeRequestDTO completeCodeDTO);
 
     ResultDTO deleteList(CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO);
 

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
 
 import com.viettel.campaign.model.ccms_full.CampaignCompleteCode;
@@ -16,14 +17,14 @@ import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
+import org.hibernate.type.DateType;
 import org.hibernate.type.LongType;
+import org.hibernate.type.ShortType;
 import org.hibernate.type.StringType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,15 +39,77 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     CampaignCompleteCodeRepository completeCodeRepository;
 
     @Override
-    public Map listAllCompleteCode(int page, int pageSize, String sort) {
-        Map result = new HashMap();
-        Page<CampaignCompleteCode> pg = completeCodeRepository.findAll(PageRequest.of(page, pageSize, Sort.by(sort)));
-        result.put("totalItems", pg.getTotalElements());
-        result.put("data", pg.iterator());
-        return result;
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO listAllCompleteCode(int page, int pageSize, String sort,Long companySiteId) {
+        ResultDTO resultDTO = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        if (DataUtil.isNullOrZero(companySiteId)) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
+        }
+
+        try {
+            StringBuilder sqlStrBuilder = new StringBuilder();
+            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "findAll-CampaignCompleteCode"));
+
+            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+
+            query.setParameter("p_company_site_id", companySiteId);
+
+            query.addScalar("campaignCompleteCodeId", new LongType());
+            query.addScalar("campaignId", new LongType());
+            query.addScalar("completeName", new StringType());
+            query.addScalar("completeValue", new StringType());
+            query.addScalar("description", new StringType());
+            query.addScalar("status", new ShortType());
+            query.addScalar("completeType", new ShortType());
+            query.addScalar("isRecall", new ShortType());
+            query.addScalar("updateAt", new DateType());
+            query.addScalar("updateBy", new StringType());
+            query.addScalar("createBy", new StringType());
+            query.addScalar("createAt", new DateType());
+            query.addScalar("campaignType", new StringType());
+            query.addScalar("isFinish", new ShortType());
+            query.addScalar("isLock", new ShortType());
+            query.addScalar("companySiteId", new LongType());
+            query.addScalar("durationLock", new LongType());
+            query.addScalar("chanel", new LongType());
+            query.setResultTransformer(Transformers.aliasToBean(CampaignCompleteCodeDTO.class));
+            int count = 0;
+            List<CampaignCompleteCodeDTO> dtoList = query.list();
+            if (dtoList.size() > 0) {
+                count = query.list().size();
+            }
+
+            Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Order.desc(sort)));
+            if (pageable != null) {
+                query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+                query.setMaxResults(pageable.getPageSize());
+            }
+
+            List<CampaignCompleteCodeDTO>data = query.list();
+            Page<CampaignCompleteCodeDTO> dataPage = new PageImpl<>(data, pageable, count);
+            resultDTO.setData(dataPage);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            logger.error(e.getMessage(), e);
+        } finally {
+            session.close();
+        }
+
+        return resultDTO;
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public Map listCompleteCodeByName(int page, int pageSize, String sort, String name) {
         Map result = new HashMap();
         List<CampaignCompleteCode> lst = new ArrayList<>();
@@ -62,6 +125,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO createCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
         CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
@@ -88,6 +152,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO updateCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
         CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
@@ -114,23 +179,22 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     }
 
     @Override
-    public ResultDTO deleteCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO deleteCompleteCode(CampaignCompleteCodeRequestDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
-        CampaignCompleteCodeMapper compCodeMapper = new CampaignCompleteCodeMapper();
-        Date today = new Date();
-        CampaignCompleteCode compCode = new CampaignCompleteCode();
 
         try {
-            if (completeCodeDTO != null) {
             // delete
-                completeCodeRepository.deleteById(completeCodeDTO.getCampaignCompleteCodeId());
+            if (completeCodeDTO != null) {
+                completeCodeRepository.deleteCampaignCompleteCodeBy(completeCodeDTO.getCampaignCompleteCodeID(), completeCodeDTO.getCompanySiteId());
 
-                resultDTO.setErrorCode("0");
-                resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " deleted!");
+                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             } else {
-                resultDTO.setErrorCode("-2");
-                resultDTO.setDescription("CompleteCodeDTO null");
+                resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             }
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -138,13 +202,14 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         return resultDTO;
     }
 
-    @Transactional
+
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO deleteList(CampaignCompleteCodeRequestDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
             if (completeCodeDTO != null) {
-                    completeCodeRepository.deleteds(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId());
+                    completeCodeRepository.deletedList(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId());
 
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                     resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -159,6 +224,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO deleteById(Long id) {
         ResultDTO result = new ResultDTO();
 
@@ -177,6 +243,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
 
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
@@ -203,7 +270,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
 
             List<CampaignCompleteCodeDTO> data = query.list();
             if (data != null && data.size() > 0) {
-                int tmp = 4;
+                int tmp = 5;
                 String completeValue = data.get(0).getCompleteValue();
                 if (completeValue != null && !completeValue.trim().equals("")) {
                     tmp = Integer.parseInt(completeValue) + 1;
@@ -226,6 +293,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getListStatus(String completeValue, Short completeType, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         try {
@@ -242,6 +310,7 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getListStatusWithoutType(String completeValue, Short completeType, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         try {

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

@@ -7,7 +7,7 @@ import java.util.List;
 @Getter
 @Setter
 public class CampaignCompleteCodeRequestDTO {
-    List<Long> ListId;
+    List<Long> listId;
     Long companySiteId;
     Long campaignCompleteCodeID;
 }

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

@@ -25,8 +25,8 @@ public class CampaignCompleteCodeController {
 
     @GetMapping("/findAll")
     @ResponseBody
-    public ResponseEntity findAllCompleteCode(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
-        Map result = completeCodeService.listAllCompleteCode(page, pageSize, sort);
+    public ResponseEntity findAllCompleteCode(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort,@RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = completeCodeService.listAllCompleteCode(page, pageSize, sort,companySiteId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -73,14 +73,14 @@ public class CampaignCompleteCodeController {
 
     @PostMapping("/delete")
     @ResponseBody
-    public ResultDTO deleteCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO) {
+    public ResultDTO deleteCompleteCode(@RequestBody @Valid CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = completeCodeService.deleteCompleteCode(completeCodeDTO);
+        result = completeCodeService.deleteCompleteCode(campaignCompleteCodeRequestDTO);
         return result;
     }
     @PostMapping("/listDelete")
     @ResponseBody
-    public ResponseEntity<ResultDTO> deleteList(@RequestBody @Valid CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO){
+    public ResponseEntity<ResultDTO> deleteLists(@RequestBody @Valid CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO){
         ResultDTO resultDTO = completeCodeService.deleteList(campaignCompleteCodeRequestDTO);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }

src/main/resources/sql/campaign-status-mng/findAll-CampaignCompleteCode.sql

+SELECT
+    CAMPAIGN_COMPLETE_CODE_ID campaignCompleteCodeId,
+    IS_RECALL isRecall ,
+    CAMPAIGN_ID campaignId,
+    COMPLETE_VALUE completeValue,
+    COMPLETE_NAME completeName,
+    COMPLETE_TYPE completeType,
+    CAMPAIGN_TYPE campaignType,
+    DESCRIPTION description,
+    STATUS  status,
+    COMPANY_SITE_ID companySiteId,
+    UPDATE_BY updateBy ,
+    UPDATE_AT updateAt,
+    CREATE_BY createBy,
+    CREATE_AT createAt,
+    IS_FINISH isFinish,
+    IS_LOCK isLock,
+    DURATION_LOCK durationLock,
+    CHANEL chanel
+
+
+FROM CAMPAIGN_COMPLETE_CODE
+where 1 = 1
+  AND STATUS = 1
+  and COMPANY_SITE_ID = :p_company_site_id
+

src/main/resources/sql/campaign-status-mng/search-campaign-status-by-params.sql

@@ -17,3 +17,4 @@ LEFT JOIN AP_PARAM c ON a.CAMPAIGN_TYPE = to_char(c.AP_PARAM_ID);
 
 
 
+