hungtt-commit get data combobox field

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

@@ -1758,7 +1758,7 @@ public class CustomerServiceImpl implements CustomerService {
         Map<String, Object> params = new HashMap<>();
         try {
             StringBuilder sb = new StringBuilder();
-            sb.append(" select distinct name, field_option_value_id key from customize_field_option_value");
+            sb.append(" select distinct name value, field_option_value_id key from customize_field_option_value");
             sb.append(" where field_option_id = :p_field_id");
 
             params.put("p_field_id", campaignCustomerDTO.getField());
@@ -1823,29 +1823,7 @@ public class CustomerServiceImpl implements CustomerService {
         return query;
     }
 
-//        params.put('1', ["AND","AGE",">=","30"] )
-//        lst.push(params);
-//        StringBuilder sql = "Select ..... WHERE 1 = 1 "
-//        for(lst){
-//            String[] data = lst[i].value
-//            sql.append(data[0] + data[1] + data[2] + data[3]);
-//        }
-
-
-//    Map<String, String> params = new HashMap<>();
-
 
-    //    public ResultDTO searchCustomize(List<CustomizeFields> customizeFields) {
-//        Map<String, CustomizeRequestDTo> hashCustomer = new HashMap<>();
-//        CustomizeRequestDTo customizeRequestDTo = new CustomizeRequestDTo();
-//        hashCustomer.put("1", customizeRequestDTo);
-//        hashCustomer.put("2", customizeRequestDTo);
-//        hashCustomer.put("3", customizeRequestDTo);
-//        StringBuilder sb = new StringBuilder();
-//        sb.append("");
-//        sb.append("");
-//        sb.append("");
-//        sb.append("");
     @Override
     public ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields) {
         ResultDTO resultDTO = new ResultDTO();
@@ -1922,31 +1900,6 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append("  AND  CF.FUNCTION_CODE = 'CUSTOMER' ");
 
             List<CustomerQueryDTO> customerDTOList = campaignCustomerDTO.getListQuery();
-//            sb.append(
-//                    customerDTOList.get(0).getField() + " "
-//                            + customerDTOList.get(0).getOperator() + " "
-//                            + customerDTOList.get(0).getCondition() + " ");
-//            for (int i = 1; i < campaignCustomerDTO.getListQuery().size(); i++) {
-//                sb.append(campaignCustomerDTO.getListQuery().get(i).getJoin() + "  "
-//                        + campaignCustomerDTO.getListQuery().get(i).getField() + "  "
-//                        + campaignCustomerDTO.getListQuery().get(i).getOperator() + "  "
-//                        + campaignCustomerDTO.getListQuery().get(i).getCondition() + "  ");
-//           Map<String, String> requestCustomer = new HashMap<>();
-//           requestCustomer.put("-1" ,"Mã Khách Hàng");
-//           requestCustomer.put("-2" ,"Tên khách hàng");
-//           requestCustomer.put("-3" ,"Tên công ty");
-//           requestCustomer.put("-4" ,"Giới tính");
-//           requestCustomer.put("-5" ,"Địa chỉ");
-//           requestCustomer.put("-6" ,"Nơi sinh");
-//           requestCustomer.put("-7" ,"Ngày sinh");
-//           requestCustomer.put("-8" ,"Số điện thoại");
-//           requestCustomer.put("-9" ,"email");
-//           requestCustomer.put("-10" ,"Tên đăng nhập");
-//           requestCustomer.put("-11" ,"Loại Khách hàng");
-//           sb.append("and "+customerDTOList.get(0).getField());
-//            for (int i = 1; i < customerDTOList.size(); i++) {
-//
-//            }
 
 
             for (CustomerQueryDTO query : customerDTOList) {
@@ -1998,31 +1951,6 @@ public class CustomerServiceImpl implements CustomerService {
                 }
 
 
-//                if (query.getField() == -1) {
-//                    sb.append(query.getJoin() + " C.CUSTOMER_ID " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -2) {
-//                    sb.append(query.getJoin() + "C.NAME " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -3) {
-//                    sb.append(query.getJoin() + " C.COMPANY_NAME " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -4) {
-//                    sb.append(query.getJoin() + " C.GENDER " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -5) {
-//                    sb.append(query.getJoin() + " C.CURRENT_ADDRESS " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -6) {
-//                    sb.append(query.getJoin() + " C.PLACE_OF_BIRTH " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -7) {
-//                    sb.append(query.getJoin() + " C.DATE_OF_BIRTH " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -8) {
-//                    sb.append(query.getJoin() + " C.MOBILE_NUMBER " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -9) {
-//                    sb.append(query.getJoin() + " C.EMAIL " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -10) {
-//                    sb.append(query.getJoin() + " C.USER_NAME " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                } else if (query.getField() == -11) {
-//                    sb.append(query.getJoin() + " C.CUSTOMER_TYPE " + query.getOperator() + " %" + query.getCondition() + "% ");
-//                }
-
-
             }
             SQLQuery query = session.createSQLQuery(sb.toString());
             query.addScalar("customerId", new LongType());