anhvd commit accept merge

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

@@ -5,9 +5,7 @@ import com.viettel.campaign.model.ccms_full.CustomerList;
 import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.web.dto.*;
-import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 
@@ -66,6 +64,8 @@ public interface CustomerService {
 
     ResultDTO addCustomerToCampaign(CampaignCustomerDTO campaignCustomerDTO);
 
+    ResultDTO getDataForCombobox(CampaignCustomerDTO campaignCustomerDTO);
+
 
     // ------------ customer  ------------ //
 

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

@@ -1750,6 +1750,32 @@ public class CustomerServiceImpl implements CustomerService {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO getDataForCombobox(CampaignCustomerDTO campaignCustomerDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        List<ComboboxDTO> list = new ArrayList<>();
+        Map<String, Object> params = new HashMap<>();
+        try {
+            StringBuilder sb = new StringBuilder();
+            sb.append(" select distinct name value, value key from customize_field_option_value a");
+            sb.append(" inner join customize_field_object b on a.field_option_value_id = b.field_option_value_id");
+            sb.append(" where a.field_option_id = :p_field_id");
+
+            params.put("p_field_id", campaignCustomerDTO.getField());
+
+            list = namedParameterJdbcTemplate.query(sb.toString(), params, BeanPropertyRowMapper.newInstance(ComboboxDTO.class));
+            resultDTO.setListData(list);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
+
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
@@ -1850,6 +1876,44 @@ public class CustomerServiceImpl implements CustomerService {
                 lstCustomizeFields.add(datafill);
             }
 
+//        try {
+//            stringBuilder.append(" with column_name_temp as (");
+//            stringBuilder.append("    select 'CUSTOMER_ID customerId'  , from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("    select 'CUSTOMER_NAME customerName' , from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'CUSTOMER_TYPE customerType'  , from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'NAME name'   , from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'CURRENT_ADDRESS currentAddress',  from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'PLACE_OF_BIRTH placeOfBirth',  from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'DATE_OF_BIRTH dateOfBirth',  from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'MOBILE_NUMBER mobileNumber',  from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'EMAIL email',  from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'USERNAME username',  from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'CUSTOMER_TYPE customerType',  from user_tab_columns, dual");
+//            stringBuilder.append("     where table_name = 'CUSTOMER'");
+//            stringBuilder.append(" )");
+//
+//            stringBuilder.append(" select * from column_name_temp");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append(" select title columnName, 0 isFix ");
+//            stringBuilder.append(" from customize_fields, dual");
+//            stringBuilder.append(" where function_code = 'CUSTOMER'");
+//            stringBuilder.append("     and site_id = :p_company_site_id");
+//            stringBuilder.append("     and STATUS = 1");
+//            stringBuilder.append("   and active = 1 ");
+//            params.put("p_company_site_id", customizeFields.getSiteId());
+//            params.put("p_customer_id", customizeFields.getCustomerId());
+//            LOGGER.info("SQL statement: " + stringBuilder);
+//            list = namedParameterJdbcTemplate.query(stringBuilder.toString(), params, BeanPropertyRowMapper.newInstance(CustomizeFielObjectDTO.class));
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             resultDTO.setListData(lstCustomizeFields);

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

@@ -30,6 +30,6 @@ public class CampaignCustomerDTO extends BaseDTO{
     private Long complainId;
     private String lstCustomerId;
     private List<CustomerQueryDTO>  listQuery;
-
+    private Long field;
 
 }

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

+package com.viettel.campaign.web.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ComboboxDTO {
+    private String key;
+    private String value;
+}

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

@@ -259,6 +259,13 @@ public class CustomerController {
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
+    @PostMapping("/getDataForCombobox")
+    @ResponseBody
+    public ResponseEntity<?> getDataForCombobox(@RequestBody CampaignCustomerDTO dto) {
+        ResultDTO resultDTO = customerService.getDataForCombobox(dto);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
 
 
     private String saveUploadFile(MultipartFile file) {
@@ -301,6 +308,7 @@ public class CustomerController {
         return  ResponseEntity.status(HttpStatus.OK)
                 .body(result);
     }
+
     @PostMapping("/getCustomizeFields")
     @ResponseBody
     public ResponseEntity<?> getListCustomer(@RequestBody CustomizeFieldsDTO customizeRequestDTo) {