commit file

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

@@ -26,9 +26,9 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     @Query("delete from CampaignCompleteCode c where c.campaignCompleteCodeId in (:ids)")
     int deleteds(@Param("ids") List<Long> ids);
 
-//    @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);
 }

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

@@ -7,4 +7,5 @@ public interface CampaignCompleteCodeRepositoryCustom {
     ResultDTO updateStatusById(Long id);
     ResultDTO findMaxValueCampaignType(Long companySiteId);
 
+
 }

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

@@ -2,11 +2,14 @@ package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.service.CampaignCompleteCodeService;
 import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.utils.HibernateUtil;
 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.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -166,51 +169,54 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         return result;
     }
 
-    @Override
-    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
-        ResultDTO resultDTO = new ResultDTO();
-        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+= 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());
-        }
-        return resultDTO;
-    }
-
 //    @Override
 //    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
-//        ResultDTO result = new ResultDTO();
+//        ResultDTO resultDTO = 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;
+//        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());
+////                    }
+////                }
 ////            }
-//            result.setData(resultmaxValue);
-//            result.setErrorCode(Constants.Status.ACTIVE_STR);
-//            result.setDescription(Constants.Status.ACTIVE_STR);
-//        }
-//        catch (Exception e){
+//            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);
-//            result.setErrorCode("-1");
-//            return result;
 //        }
-//        result.setErrorCode("0");
-//        return result;
+//        return resultDTO;
 //    }
+
+    @Override
+    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
+        ResultDTO result = new ResultDTO();
+        CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
+        CampaignCompleteCode campaignCompleteCode = new CampaignCompleteCode();
+        try{
+            short resultValue = completeCodeRepository.findByMaxCompanySiteId(completeCodeDTO.getCompanySiteId());
+            campaignCompleteCode.setCompleteValue(String.valueOf(resultValue + 1));
+            result.setData(resultValue);
+            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;
+    }
 }

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

@@ -63,6 +63,7 @@ public class CampaignCompleteCodeController {
         ResultDTO result = new ResultDTO();
         try {
             result = completeCodeService.updateCompleteCode(completeCodeDTO);
+
         } catch (Exception e) {
             result.setErrorCode("-1");
             LOGGER.error(e);
@@ -96,7 +97,7 @@ public class CampaignCompleteCodeController {
     @PostMapping("/getMaxValue")
     @ResponseBody
     public ResultDTO findMaxValueCampaignType(@RequestBody CampaignCompleteCodeDTO completeCodeDTO){
-        return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
+         return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
     }
 
 

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

@@ -16,3 +16,4 @@ SELECT max(COMPLETE_VALUE) ,COMPANY_SITE_ID from CAMPAIGN_COMPLETE_CODE where CO
 
 
 
+