merge code

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

 package com.viettel.campaign.config;
 
 //import com.viettel.campaign.job.CampaignJob;
+import com.viettel.campaign.job.CampaignJob;
 import com.viettel.campaign.service.ApParamService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -25,8 +25,8 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     List<CampaignCompleteCode> findByCompleteNameContains(String name, Pageable pageable);
 
     @Modifying
-    @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:ids)")
-    int deleteds(@Param("ids") List<Long> ids);
+    @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);
 
     //    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
     //    Short findByMaxCompanySiteId(Long companySiteId);

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

@@ -2,6 +2,7 @@ package com.viettel.campaign.service;
 
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.request_dto.CampaignCompleteCodeRequestDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +19,7 @@ public interface CampaignCompleteCodeService {
 
     ResultDTO deleteCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
 
-    ResultDTO deleteList(List<Long> completeCodeDtos);
+    ResultDTO deleteList(CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO);
 
     ResultDTO deleteById(Long id);
 

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

@@ -40,12 +40,8 @@ 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

@@ -10,6 +10,7 @@ import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.request_dto.CampaignCompleteCodeRequestDTO;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -138,20 +139,21 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
 
     @Transactional
     @Override
-    public ResultDTO deleteList(List<Long> completeCodeDtos) {
+    public ResultDTO deleteList(CampaignCompleteCodeRequestDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
-            completeCodeRepository.deleteds(completeCodeDtos);
-            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            if (completeCodeDTO != null) {
+                    completeCodeRepository.deleteds(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId());
 
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            } else {
+                resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            }
         } catch (Exception e) {
-            resultDTO.setErrorCode("-1");
-            return resultDTO;
+            e.printStackTrace();
         }
-//        }
-        resultDTO.setErrorCode("0");
-
         return resultDTO;
     }
 

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

+package com.viettel.campaign.web.dto.request_dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+@Getter
+@Setter
+public class CampaignCompleteCodeRequestDTO {
+    List<Long> ListId;
+    Long companySiteId;
+    Long campaignCompleteCodeID;
+}

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

@@ -3,6 +3,7 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
+import com.viettel.campaign.web.dto.request_dto.CampaignCompleteCodeRequestDTO;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -79,8 +80,8 @@ public class CampaignCompleteCodeController {
     }
     @PostMapping("/listDelete")
     @ResponseBody
-    public ResponseEntity<ResultDTO> deleteList(@RequestBody @Valid List<Long>completeCodeDtos ){
-        ResultDTO resultDTO = completeCodeService.deleteList(completeCodeDtos);
+    public ResponseEntity<ResultDTO> deleteList(@RequestBody @Valid CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO){
+        ResultDTO resultDTO = completeCodeService.deleteList(campaignCompleteCodeRequestDTO);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
     @PostMapping("/deleteById")