tubn campaign execute customer list update

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListColumnRepository.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Repository
 @Transactional(DataSourceQualify.CCMS_FULL)
-public interface CampaignCustomerListColumnRepository extends JpaRepository<CampaignCustomerListColumn, Long> {
+public interface CampaignCustomerListColumnRepository extends JpaRepository<CampaignCustomerListColumn, Long>, CampaignCustomerListColumnRepositoryCustom {
 
     List<CampaignCustomerListColumn> findByCampaignIdAndCompanySiteId(Long campaignId, Long companaySiteId);
 

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignCustomerListColumnRepositoryImpl.java

@@ -41,12 +41,9 @@ public class CampaignCustomerListColumnRepositoryImpl implements CampaignCustome
             sb.append("    c.TYPE type,");
             sb.append("    d.NAME valueCombobox");
             sb.append(" FROM CAMPAIGN_CUSTOMERLIST_COLUMN a");
-            sb.append("    JOIN CUSTOMIZE_FIELD_OBJECT b");
-            sb.append("     ON a.CUSTOMIZE_FIELD_ID = b.CUSTOMIZE_FIELDS_ID");
-            sb.append("    JOIN CUSTOMIZE_FIELDS c");
-            sb.append("     ON a.CUSTOMIZE_FIELD_ID = c.CUSTOMIZE_FIELD_ID");
-            sb.append("    LEFT JOIN CUSTOMIZE_FIELD_OPTION_VALUE d");
-            sb.append("     ON b.FIELD_OPTION_VALUE_ID = d.FIELD_OPTION_VALUE_ID");
+            sb.append("    JOIN CUSTOMIZE_FIELD_OBJECT b ON a.CUSTOMIZE_FIELD_ID = b.CUSTOMIZE_FIELDS_ID");
+            sb.append("    JOIN CUSTOMIZE_FIELDS c ON a.CUSTOMIZE_FIELD_ID = c.CUSTOMIZE_FIELD_ID");
+            sb.append("    LEFT JOIN CUSTOMIZE_FIELD_OPTION_VALUE d ON b.FIELD_OPTION_VALUE_ID = d.FIELD_OPTION_VALUE_ID");
             sb.append(" WHERE 1 = 1");
             sb.append("    AND b.FUNCTION_CODE = 'CUSTOMER'");
             sb.append("    AND a.COMPANY_SITE_ID = :p_company_site_id");

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

@@ -63,7 +63,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     TimeRangeDialModeRepository rangeDialModeRepository;
 
     @Autowired
-    CampaignCustomerListColumnRepositoryCustom campaignCustomerListColumnRepositoryCustom;
+    CampaignCustomerListColumnRepository campaignCustomerListColumnRepository;
 
     //<editor-fold: hungtt>
     @Override
@@ -277,6 +277,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                 a.setAgentId(requestDto.getAgentId());
                 a.setCampaignSystemStatus("AVAILABLE");
                 a.setCurrentCampaignId(Long.parseLong(requestDto.getCampaignId()));
+                a.setUpdateDate(new Date());
                 agentsRepository.save(a);
                 // update ccms_full.campaign_agent table
                 campaignAgentRepository.updateCampaignAgentSetStatus(Long.parseLong(requestDto.getAgentId()), Long.parseLong(requestDto.getCampaignId()), 1);
@@ -589,7 +590,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         }
 
         try {
-            List<CampaignCustomerListColumnRequestDTO> data = campaignCustomerListColumnRepositoryCustom.getCustomerInfor(companySiteId, customerId, campaignId);
+            List<CampaignCustomerListColumnRequestDTO> data = campaignCustomerListColumnRepository.getCustomerInfor(companySiteId, customerId, campaignId);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             resultDTO.setData(data);