damdt - commit code

src/main/java/com/viettel/campaign/model/Campaign.java

@@ -112,4 +112,5 @@ public class Campaign implements Serializable {
     private Integer timeWaitAgent;
     @Column(name = "QUEST_INDEX")
     private BigDecimal questIndex;
+
 }

src/main/java/com/viettel/campaign/model/CampaignCompleteCode.java

@@ -44,6 +44,7 @@ public class CampaignCompleteCode implements Serializable {
     @Column(name = "CREATE_AT")
     @Temporal(TemporalType.TIMESTAMP)
     private Date createAt;
+    @Transient
     @Column(name = "CAMPAIGN_TYPE")
     private String campaignType;
     @Column(name = "IS_FINISH")

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

@@ -10,7 +10,6 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-
 @Repository
 public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCompleteCode, Long> {
 

src/main/java/com/viettel/campaign/repository/impl/CampaignCompleteCodeRepositoryIpml.java

@@ -20,12 +20,14 @@ import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
 
 import javax.persistence.EntityManager;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+
 public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeRepository {
     @Autowired
     EntityManager entityManager;
@@ -35,7 +37,13 @@ public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeR
 
     @Override
     public Page<CampaignCompleteCode> findAll(Pageable pageable) {
-        return campaignCompleteCodeRepository.findAll(pageable);
+//        Page<CampaignCompleteCode>
+//        try {
+//
+//        } catch (Exception e) {
+//
+//        }
+        return  null;
     }
 
     @Override
@@ -76,7 +84,7 @@ public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeR
 
     @Override
     public List<CampaignCompleteCode> findByCompleteNameContains(String name, Pageable pageable) {
-        return  campaignCompleteCodeRepository.findByCompleteNameContains(name,pageable);
+        return campaignCompleteCodeRepository.findByCompleteNameContains(name, pageable);
     }
 
     @Override

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
 import com.viettel.campaign.model.CampaignCompleteCode;
 import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -131,7 +134,6 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
                 resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
 
             } catch (Exception e) {
-                log.error(e.getMessage(), e);
                 resultDTO.setErrorCode("-1");
                 return resultDTO;
             }

src/main/java/com/viettel/campaign/utils/Constants.java

@@ -17,4 +17,18 @@ public class Constants {
         String xls = "xls";
         String xlsx = "xlsx";
     }
+    public interface Status {
+        Long ACTIVE = 1L;
+        Long INACTIVE = 0L;
+
+        String ACTIVE_STR = "Hoạt động";
+        String INACTIVE_STR = "Không hoạt động";
+    }
+    public interface TypeStatus {
+        Long ACTIVE = 1L;
+        Long INACTIVE = 0L;
+
+        String ACTIVE_STR = "Trang thai ket noi(Khong thanh cong)";
+        String INACTIVE_STR = "Trang thai khao sat";
+    }
 }

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

@@ -13,3 +13,4 @@ FROM CAMPAIGN_COMPLETE_CODE a
 LEFT JOIN CAMPAIGN b ON a.CAMPAIGN_ID = b.CAMPAIGN_ID
 LEFT JOIN AP_PARAM c ON a.CAMPAIGN_TYPE = to_char(c.AP_PARAM_ID)
 
+