tubn merge anhvd

src/main/java/com/viettel/campaign/dto/request_dto/CampaignRequestDTO.java

 package com.viettel.campaign.dto.request_dto;
 
-import com.viettel.campaign.dto.BaseDTO;
+import com.viettel.campaign.web.dto.BaseDTO;
 import lombok.Getter;
 import lombok.Setter;
 

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 com.viettel.campaign.web.dto.ResultDTO;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

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

-package com.viettel.campaign.repository;
-
-import com.viettel.campaign.web.dto.CampaignDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
-
-    @Autowired
-    EntityManager entityManager;
-
-    @Override
-    public List<CampaignDTO> searchCampaignExecute(String agentId, Pageable pageable) {
-        List<CampaignDTO> lst = new ArrayList<>();
-        String expression = new StringBuilder()
-                //.append(" SELECT C.CODECAMPAIGN_ID, C.CAMPAIGN_NAME, C.CONTENT, C.START_TIME, C.END_TIME, C.STATUS ")
-                .append(" SELECT CAMPAIGN_ID, COMPLETE_NAME AS CAMPAIGN_NAME, DESCRIPTION AS CONTENT, UPDATE_BY AS START_TIME, UPDATE_BY AS END_TIME, STATUS ")
-                .append(" FROM CAMPAIGN_COMPLETE_CODE C ")
-                //.append(" INNER JOIN CAMPAIGN_AGENT CA ON C.CAMPAIGN_ID = CA.CAMPAIGN_ID ")
-                //.append(" WHERE 1 = 1 ")
-                //.append(" AND CA.AGENT_ID = :pAgentId ")
-                //.append(" AND C.STATUS IN (2,3) ")
-                .toString();
-
-        Query query = entityManager.createNativeQuery(expression);
-        //query.setParameter("pAgentId", agentId);
-
-        List<Object[]> data = query.getResultList();
-
-        for (Object[] obj : data) {
-            CampaignDTO item = new CampaignDTO();
-            item.setCampaignId((BigDecimal) obj[0]);
-            item.setCampaignName((String)obj[1]);
-            item.setContent((String)obj[2]);
-            item.setStartTime((Date)obj[3]);
-            item.setEndTime((Date)obj[4]);
-            item.setStatus((BigDecimal) obj[5]);
-
-            lst.add(item);
-        }
-
-        return lst;
-    }
-}

src/main/java/com/viettel/campaign/repository/AppParamRepositoryImpl.java → src/main/java/com/viettel/campaign/repository/impl/AppParamRepositoryImpl.java

-package com.viettel.campaign.repository;
+package com.viettel.campaign.repository.impl;
 
 import com.viettel.campaign.model.ApParam;
+import com.viettel.campaign.repository.ApParamRepositoryCustom;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

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

 package com.viettel.campaign.repository.impl;
 
-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.CampaignRepositoryCustom;
 import com.viettel.campaign.utils.*;
+import com.viettel.campaign.web.dto.CampaignDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.hql.internal.ast.util.SessionFactoryHelper;
 import org.hibernate.transform.Transformers;
 import org.hibernate.type.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.*;
-import org.springframework.jdbc.object.SqlQuery;
 import org.springframework.stereotype.Repository;
-import sun.jvm.hotspot.ui.action.ShowAction;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,9 +45,9 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
         for (Object[] obj : data) {
             CampaignDTO item = new CampaignDTO();
-            item.setCampaignId((Long) obj[0]);
+            item.setCampaignId((BigDecimal) obj[0]);
             item.setCampaignName((String) obj[1]);
-            item.setStatus((Short) obj[0]);
+            item.setStatus((BigDecimal) obj[0]);
 
             lst.add(item);
         }
@@ -178,7 +175,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         }
         result.setErrorCode(Constants.ApiErrorCode.ERROR);
         result.setDescription(Constants.ApiErrorDesc.ERROR);
-        return null;
+        return result;
     }
 
     private Pageable buildPageable(CampaignRequestDTO obj) {

src/main/java/com/viettel/campaign/service/ApParamServiceImpl.java → src/main/java/com/viettel/campaign/service/impl/ApParamServiceImpl.java

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.service.ApParamService;
 import com.viettel.campaign.web.dto.ApParamDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.ApParamMapper;

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

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.service.CampaignCompleteCodeService;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;

src/main/java/com/viettel/campaign/service/CustomerServiceImpl.java → src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.web.dto.CustomerDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CustomerMapper;