Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
service-campaign
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nguyen Ha
service-campaign
Commits
0643f641
Commit
0643f641
authored
Aug 29, 2019
by
đinh thị đầm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
damdt searchFilter Customer
parent
3ec149b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
63 deletions
+55
-63
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
...om/viettel/campaign/service/impl/CustomerServiceImpl.java
+54
-62
src/main/java/com/viettel/campaign/web/dto/request_dto/CustomerQueryDTO.java
...iettel/campaign/web/dto/request_dto/CustomerQueryDTO.java
+1
-1
No files found.
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
View file @
0643f641
...
@@ -1814,70 +1814,32 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -1814,70 +1814,32 @@ public class CustomerServiceImpl implements CustomerService {
@Override
@Override
public
ResultDTO
listCustomizeFields
(
CustomizeFieldsDTO
customizeFields
)
{
public
ResultDTO
listCustomizeFields
(
CustomizeFieldsDTO
customizeFields
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
ResultDTO
resultDTO
=
new
ResultDTO
();
Map
<
String
,
String
>
params
=
new
HashMap
<>();
List
<
CustomizeFielObjectDTO
>
list
;
StringBuilder
stringBuilder
=
new
StringBuilder
();
try
{
try
{
List
<
CustomizeFields
>
lstCustomizeFields
=
customizeFieldsRepository
.
findByFunctionCodeAndActiveAndStatusAndSiteId
(
customizeFields
.
getFunctionCode
(),
customizeFields
.
getActive
(),
customizeFields
.
getStatus
()
,
customizeFields
.
getSiteId
());
List
<
CustomizeFields
>
lstCustomizeFields
=
customizeFieldsRepository
.
findByFunctionCodeAndActiveAndStatusAndSiteId
(
"CUSTOMER"
,
1L
,
1L
,
customizeFields
.
getSiteId
());
String
cf
[][]
=
{
String
cf
[][]
=
{
{
"-1"
,
"Mã Khách Hàng"
,
"
number
"
},
{
"-1"
,
"Mã Khách Hàng"
,
"
text
"
},
{
"-2"
,
"Tên khách hàng"
,
"text"
},
{
"-2"
,
"Tên khách hàng"
,
"text"
},
{
"-3"
,
"Tên công ty"
,
"text"
},
{
"-3"
,
"Tên công ty"
,
"text"
},
{
"-4"
,
"Giới tính"
,
"
number
"
},
{
"-4"
,
"Giới tính"
,
"
combobox
"
},
{
"-5"
,
"Địa chỉ"
,
"text"
},
{
"-5"
,
"Địa chỉ"
,
"text"
},
{
"-6"
,
"Nơi sinh"
,
"text"
},
{
"-6"
,
"Nơi sinh"
,
"text"
},
{
"-7"
,
"Ngày sinh"
,
"date"
},
{
"-7"
,
"Ngày sinh"
,
"date"
},
{
"-8"
,
"Số điện thoại"
,
"
number
"
},
{
"-8"
,
"Số điện thoại"
,
"
text
"
},
{
"-9"
,
"email"
,
"text"
},
{
"-9"
,
"email"
,
"text"
},
{
"-10"
,
"Tên đăng nhập"
,
"text"
},
{
"-10"
,
"Tên đăng nhập"
,
"text"
},
{
"-11"
,
"Loại Khách hàng"
,
"
number
"
},
{
"-11"
,
"Loại Khách hàng"
,
"
combobox
"
},
};
};
for
(
int
x
=
0
;
x
<
11
;
x
++)
{
for
(
int
x
=
0
;
x
<
11
;
x
++)
{
CustomizeFields
datafill
=
new
CustomizeFields
();
CustomizeFields
datafill
=
new
CustomizeFields
();
datafill
.
setCustomizeFieldId
(
Long
.
parseLong
(
cf
[
x
][
0
]));
datafill
.
setCustomizeFieldId
(
Long
.
parseLong
(
cf
[
x
][
0
]));
datafill
.
setTitle
(
cf
[
x
][
1
]);
datafill
.
setTitle
(
cf
[
x
][
1
]);
datafill
.
setType
(
cf
[
x
][
2
]);
datafill
.
setType
(
cf
[
x
][
2
]);
lstCustomizeFields
.
add
(
datafill
);
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
.
setErrorCode
(
Constants
.
ApiErrorCode
.
SUCCESS
);
resultDTO
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
resultDTO
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
resultDTO
.
setListData
(
lstCustomizeFields
);
resultDTO
.
setListData
(
lstCustomizeFields
);
...
@@ -1932,9 +1894,9 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -1932,9 +1894,9 @@ public class CustomerServiceImpl implements CustomerService {
sb
.
append
(
" INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID"
);
sb
.
append
(
" INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID"
);
sb
.
append
(
" INNER JOIN CUSTOMIZE_FIELDS CF ON CF.CUSTOMIZE_FIELD_ID = CFO.CUSTOMIZE_FIELDS_ID\n"
+
sb
.
append
(
" INNER JOIN CUSTOMIZE_FIELDS CF ON CF.CUSTOMIZE_FIELD_ID = CFO.CUSTOMIZE_FIELDS_ID\n"
+
" WHERE 1 = 1"
);
" WHERE 1 = 1"
);
sb
.
append
(
"
and
CFO.STATUS = 1"
);
sb
.
append
(
"
AND
CFO.STATUS = 1"
);
sb
.
append
(
"
and active
= 1 "
);
sb
.
append
(
"
AND ACTIVE
= 1 "
);
sb
.
append
(
"
and
CF.FUNCTION_CODE = 'CUSTOMER' "
);
sb
.
append
(
"
AND
CF.FUNCTION_CODE = 'CUSTOMER' "
);
List
<
CustomerQueryDTO
>
customerDTOList
=
campaignCustomerDTO
.
getListQuery
();
List
<
CustomerQueryDTO
>
customerDTOList
=
campaignCustomerDTO
.
getListQuery
();
// sb.append(
// sb.append(
...
@@ -1947,17 +1909,42 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -1947,17 +1909,42 @@ public class CustomerServiceImpl implements CustomerService {
// + campaignCustomerDTO.getListQuery().get(i).getOperator() + " "
// + campaignCustomerDTO.getListQuery().get(i).getOperator() + " "
// + campaignCustomerDTO.getListQuery().get(i).getCondition() + " ");
// + campaignCustomerDTO.getListQuery().get(i).getCondition() + " ");
for
(
CustomerQueryDTO
query
:
customerDTOList
)
{
for
(
CustomerQueryDTO
query
:
customerDTOList
)
{
if
(
query
.
getJoin
()
==
null
)
{
// if (query.getJoin() == null) {
sb
.
append
(
"AND "
);
// sb.append("AND ");
}
else
{
// } else {
sb
.
append
(
query
.
getJoin
()
+
" "
);
// sb.append(query.getJoin() + " ");
}
// }
sb
.
append
(
query
.
getField
()
+
" "
);
// sb.append(query.getField() + " ");
sb
.
append
(
query
.
getOperator
()
+
" "
);
// sb.append(query.getOperator() + " ");
if
(
"like"
.
equals
(
query
.
getOperator
())
||
"not like"
.
equals
(
query
.
getOperator
()))
{
// if ("like".equals(query.getOperator()) || "not like".equals(query.getOperator())) {
sb
.
append
(
"%"
+
query
.
getCondition
()
+
"% "
);
// sb.append("%"+ query.getCondition() + "% ");
}
else
{
// } else {
sb
.
append
(
query
.
getCondition
());
// sb.append(query.getCondition());
// }
// LIKE NOT
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
()
+
"% "
);
}
}
}
}
...
@@ -2004,8 +1991,13 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -2004,8 +1991,13 @@ public class CustomerServiceImpl implements CustomerService {
}
}
return
resultDTO
;
return
resultDTO
;
}
}
private
String
getCodition
(
String
join
,
String
operator
,
String
codition
)
{
// if (operator.equalsIgnoreCase("LIKE") || operator.equalsIgnoreCase("NOT_LIKE")) {
// } else {
// return " " + join + " " + operator + " " + codition + " ";
// }
return
null
;
}
}
}
src/main/java/com/viettel/campaign/web/dto/request_dto/CustomerQueryDTO.java
View file @
0643f641
...
@@ -8,7 +8,7 @@ import lombok.Setter;
...
@@ -8,7 +8,7 @@ import lombok.Setter;
@Setter
@Setter
public
class
CustomerQueryDTO
extends
BaseDTO
{
public
class
CustomerQueryDTO
extends
BaseDTO
{
String
join
;
String
join
;
Stri
ng
field
;
Lo
ng
field
;
String
operator
;
String
operator
;
String
condition
;
String
condition
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment