Merge branch 'master' of http://git.myitsol.com/hanv/service-campaign

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

@@ -519,7 +519,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             stringBuilder.append("     where table_name = 'CUSTOMER'");
             stringBuilder.append(" )");
             stringBuilder.append(" select * from column_name_temp");
-            stringBuilder.append(" where columnName not in (select column_name from campaign_customerlist_column)");
+            stringBuilder.append(" where columnName not in (select column_name from campaign_customerlist_column where column_name is not null)");
             stringBuilder.append(" union all");
             stringBuilder.append(" select title columnName, 0 isFix ");
             stringBuilder.append(" from customize_fields, dual");
@@ -553,7 +553,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 //            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-list-fields-to-show");
             sqlBuilder.append(" select to_char(column_name) columnName, 1 isFix");
             sqlBuilder.append(" from campaign_customerlist_column, dual");
-            sqlBuilder.append(" where campaign_id = :p_campaign_id");
+            sqlBuilder.append(" where campaign_id = :p_campaign_id and column_name is not null");
             sqlBuilder.append(" union all");
             sqlBuilder.append(" select customize_field_title columnName, 0 isFix");
             sqlBuilder.append(" from campaign_customerlist_column");

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

@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -504,6 +505,9 @@ public class CampaignServiceImpl implements CampaignService {
         mapColumn.put("EMAIL_ALLOWED", BundleUtils.getLangString("EMAIL_ALLOWED", locale));
         mapColumn.put("SMS_ALLOWED", BundleUtils.getLangString("SMS_ALLOWED", locale));
         mapColumn.put("IPCC_STATUS", BundleUtils.getLangString("IPCC_STATUS", locale));
+        mapColumn.put("EMAIL", BundleUtils.getLangString("EMAIL", locale));
+        mapColumn.put("CUSTOMER_TYPE", BundleUtils.getLangString("CUSTOMER_TYPE", locale));
+        mapColumn.put("AVATAR_LINK", BundleUtils.getLangString("AVATAR_LINK", locale));
         return mapColumn;
     }
     private String generateCampaignCode(String campaignType, Short chanel) {

src/main/java/com/viettel/campaign/web/dto/FieldsToShowDTO.java

@@ -11,23 +11,23 @@ import java.io.Serializable;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class FieldsToShowDTO extends BaseDTO implements Serializable {
+public class FieldsToShowDTO implements Serializable {
 
-    private Long campaignCusListColId;
+//    private Long campaignCusListColId;
 
-    private Long companySiteId;
+//    private Long companySiteId;
 
-    private Long campaignId;
+//    private Long campaignId;
 
     private String columnName;
 
     private String columnTitle;
 
-    private Long orderIndex;
+//    private Long orderIndex;
 
-    private Long customizeFieldId;
+//    private Long customizeFieldId;
 
-    private String customizeFieldTitle;
+//    private String customizeFieldTitle;
 
     private Boolean isFix;
 }

src/main/resources/i18n/language_en.properties

@@ -64,3 +64,6 @@ CALL_ALLOWED = CALL_ALLOWED
 EMAIL_ALLOWED = EMAIL_ALLOWED
 SMS_ALLOWED = SMS_ALLOWED
 IPCC_STATUS = IPCC_STATUS
+EMAIL = EMAIL
+CUSTOMER_TYPE = CUSTOMER_TYPE
+AVATAR_LINK = AVATAR_LINK

src/main/resources/i18n/language_vi.properties

@@ -66,3 +66,6 @@ CALL_ALLOWED = CALL_ALLOWED
 EMAIL_ALLOWED = EMAIL_ALLOWED
 SMS_ALLOWED = SMS_ALLOWED
 IPCC_STATUS = IPCC_STATUS
+EMAIL = EMAIL
+CUSTOMER_TYPE = CUSTOMER_TYPE
+AVATAR_LINK = AVATAR_LINK

src/main/resources/sql/campaign-mng/get-list-fields-not-show.sql

@@ -2,7 +2,7 @@ with column_name_temp as (
     select column_name columnName, 1 isFix from user_tab_columns, dual
     where table_name = 'CUSTOMER'
 )
-select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column)
+select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column where column_name is not null)
 union all
 select title columnName, 0 isFix from customize_fields, dual
 where function_code = 'CUSTOMER'

src/main/resources/sql/campaign-mng/get-list-fields-to-show.sql

-select to_char(column_name) columnName, 1 isFix from campaign_customerlist_column, dual where campaign_id = :p_campaign_id
+select to_char(column_name) columnName, 1 isFix from campaign_customerlist_column, dual where campaign_id = :p_campaign_id and column_name is not null
 union all
 select customize_field_title columnName, 0 isFix from campaign_customerlist_column where campaign_id = :p_campaign_id