merge code

pom.xml

@@ -212,6 +212,24 @@
             <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/service/CustomerService.java

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.model.CustomerList;
+
+import com.viettel.campaign.model.ccms_full.CustomerList;
 import com.viettel.campaign.web.dto.CustomerContactDTO;
 import com.viettel.campaign.web.dto.CustomerDTO;
 import com.viettel.campaign.web.dto.CustomerListDTO;
@@ -40,11 +41,9 @@ public interface CustomerService {
 
     // ------------ customer contact ------------ //
 
-<<<<<<< HEAD
-=======
     ResultDTO getCustomerContact(CustomerContactDTO customer);
 
->>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3
+
     // danh sach khach hang cua chien dich //
 
     ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
-import com.viettel.campaign.model.CampaignCompleteCode;
-import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
+
+import com.viettel.campaign.model.ccms_full.CampaignCompleteCode;
+import com.viettel.campaign.repository.ccms_full.CampaignCompleteCodeRepository;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
@@ -174,35 +175,6 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         return result;
     }
 
-//    @Override
-//    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
-//        ResultDTO resultDTO = new ResultDTO();
-//        CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
-//        try {
-//            short maxValue = 0;
-////            List<CampaignCompleteCode> list = completeCodeRepository.findCampaignCompleteCodesByCompanySiteId(completeCodeDTO.getCompanySiteId());
-////            for (int i = 0; i<list.size();i++) {
-////                if (list.get(i).getCompleteValue() != null && !list.get(i).getCompleteValue().equals("")) {
-////                    if (maxValue < Short.parseShort(list.get(i).getCompleteValue())) {
-////                        maxValue = Short.parseShort(list.get(i).getCompleteValue());
-////                    }
-////                }
-////            }
-//            maxValue = completeCodeRepository.findByMaxCompanySiteId(completeCodeDTO.getCompanySiteId());
-//            if (maxValue < 4) {
-//                maxValue = 4;
-//            }
-//            maxValue+= 1;
-//            resultDTO.setData(maxValue);
-//            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-//            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
-//        } catch (Exception e) {
-//            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-//            resultDTO.setDescription(e.getMessage());
-//            logger.error(e.getMessage(), e);
-//        }
-//        return resultDTO;
-//    }
 
     @Override
     public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
@@ -284,28 +256,4 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         return resultDTO;
     }
 
-//    @Override
-//    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
-//        ResultDTO result = new ResultDTO();
-//        CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
-//        CampaignCompleteCode campaignCompleteCode = new CampaignCompleteCode();
-//        try{
-//            short resultmaxValue = completeCodeRepository.findByMaxCompanySiteId(completeCodeDTO.getCompanySiteId());
-//            campaignCompleteCode.setCompleteValue(String.valueOf(resultmaxValue + 1));
-////            if (resultmaxValue < 4) {
-////                resultmaxValue =4;
-////            }
-//            result.setData(resultmaxValue);
-//            result.setErrorCode(Constants.Status.ACTIVE_STR);
-//            result.setDescription(Constants.Status.ACTIVE_STR);
-//        }
-//        catch (Exception e){
-//            logger.error(e.getMessage(), e);
-//            result.setErrorCode("-1");
-//            return result;
-//        }
-//        result.setErrorCode("0");
-//        return result;
-//    }
-
 }