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
2052d254
Commit
2052d254
authored
Aug 28, 2019
by
=
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hungtt-commit individual-customer campaign-mng
parent
1d784ca9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
3 deletions
+48
-3
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java
...aign/repository/ccms_full/CampaignCustomerRepository.java
+5
-0
src/main/java/com/viettel/campaign/service/CustomerService.java
...in/java/com/viettel/campaign/service/CustomerService.java
+2
-0
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
...om/viettel/campaign/service/impl/CustomerServiceImpl.java
+32
-3
src/main/java/com/viettel/campaign/web/dto/CampaignCustomerDTO.java
...ava/com/viettel/campaign/web/dto/CampaignCustomerDTO.java
+1
-0
src/main/java/com/viettel/campaign/web/rest/CustomerController.java
...ava/com/viettel/campaign/web/rest/CustomerController.java
+8
-0
No files found.
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepository.java
View file @
2052d254
...
@@ -88,4 +88,9 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
...
@@ -88,4 +88,9 @@ public interface CampaignCustomerRepository extends JpaRepository<CampaignCustom
" and customer_list_id = :p_cus_list_id\n"
+
" and customer_list_id = :p_cus_list_id\n"
+
" and (status = 0 or status in (select * from status_customer))"
,
nativeQuery
=
true
)
" and (status = 0 or status in (select * from status_customer))"
,
nativeQuery
=
true
)
List
<
CampaignCustomer
>
findListCustomerToDel
(
@Param
(
"p_company_site_id"
)
Long
companySiteId
,
@Param
(
"p_campaign_id"
)
Long
campaignId
,
@Param
(
"p_cus_list_id"
)
Long
customerListId
);
List
<
CampaignCustomer
>
findListCustomerToDel
(
@Param
(
"p_company_site_id"
)
Long
companySiteId
,
@Param
(
"p_campaign_id"
)
Long
campaignId
,
@Param
(
"p_cus_list_id"
)
Long
customerListId
);
CampaignCustomer
findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId
(
Long
campaignId
,
Long
companySiteId
,
Long
customerId
);
@Query
(
value
=
"select complete_value from campaign_complete_code where status = 1 and is_finish = 0 and is_recall = 0"
,
nativeQuery
=
true
)
List
<
Short
>
getStatus
();
}
}
src/main/java/com/viettel/campaign/service/CustomerService.java
View file @
2052d254
...
@@ -58,6 +58,8 @@ public interface CustomerService {
...
@@ -58,6 +58,8 @@ public interface CustomerService {
List
<
CustomerDTO
>
getIndividualCustomerInfo
(
CampaignCustomerDTO
campaignCustomerDTO
);
List
<
CustomerDTO
>
getIndividualCustomerInfo
(
CampaignCustomerDTO
campaignCustomerDTO
);
ResultDTO
deleteCustomerFromCampaign
(
CampaignCustomerDTO
campaignCustomerDTO
);
// ------------ customer ------------ //
// ------------ customer ------------ //
...
...
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
View file @
2052d254
...
@@ -1635,6 +1635,35 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -1635,6 +1635,35 @@ public class CustomerServiceImpl implements CustomerService {
return
customerList
;
return
customerList
;
}
}
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
ResultDTO
deleteCustomerFromCampaign
(
CampaignCustomerDTO
campaignCustomerDTO
)
{
ResultDTO
resultDTO
=
new
ResultDTO
();
Long
companySiteId
=
campaignCustomerDTO
.
getCompanySiteId
();
Long
campaignId
=
campaignCustomerDTO
.
getCampaignId
();
String
[]
lstCusId
=
campaignCustomerDTO
.
getLstCustomerId
().
split
(
","
);
List
<
Short
>
lstStatus
=
campaignCustomerRepository
.
getStatus
();
try
{
for
(
String
cusId:
lstCusId
)
{
CampaignCustomer
entity
=
campaignCustomerRepository
.
findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId
(
campaignId
,
companySiteId
,
Long
.
parseLong
(
cusId
));
if
(
entity
.
getStatus
()
==
0
)
{
campaignCustomerRepository
.
delete
(
entity
);
}
else
if
(
lstStatus
.
contains
(
entity
.
getStatus
())){
entity
.
setInCampaignStatus
((
short
)
0
);
campaignCustomerRepository
.
save
(
entity
);
}
}
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
@Override
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
List
<
Customer
>
findAllByCondition
(
Long
siteId
,
Date
endTime
)
{
public
List
<
Customer
>
findAllByCondition
(
Long
siteId
,
Date
endTime
)
{
...
@@ -1750,20 +1779,20 @@ public class CustomerServiceImpl implements CustomerService {
...
@@ -1750,20 +1779,20 @@ public class CustomerServiceImpl implements CustomerService {
" C.CURRENT_ADDRESS currentAddress,"
+
" C.CURRENT_ADDRESS currentAddress,"
+
" C.USERNAME username,"
+
" C.USERNAME username,"
+
" C.GENDER gender,"
+
" C.GENDER gender,"
+
" C.COMPANY_NAME companyName"
+
" C.COMPANY_NAME companyName
,
"
+
" C.DATE_OF_BIRTH dateOfBirth,"
+
" C.DATE_OF_BIRTH dateOfBirth,"
+
" C.COMPANY_NAME companyName,"
+
" C.COMPANY_NAME companyName,"
+
" C.CUSTOMER_TYPE customerType,"
+
" C.CUSTOMER_TYPE customerType,"
+
" C.PLACE_OF_BIRTH placeOfBirth,"
+
" C.PLACE_OF_BIRTH placeOfBirth,"
+
" C.CUSTOMER_TYPE customerType,"
+
" C.CUSTOMER_TYPE customerType,"
+
" C.EMAIL email,"
+
" C.EMAIL email,"
+
" C.USERNAME username"
+
" C.USERNAME username
,
"
+
" C.NAME name,"
+
" C.NAME name,"
+
" C.MOBILE_NUMBER mobileNumber,"
+
" C.MOBILE_NUMBER mobileNumber,"
+
" C.SITE_ID siteId,"
+
" C.SITE_ID siteId,"
+
" C.STATUS status,"
+
" C.STATUS status,"
+
" CF.FUNCTION_CODE functionCode,"
+
" CF.FUNCTION_CODE functionCode,"
+
" CFO.ACTIVE active"
+
" CFO.ACTIVE active
,
"
+
" CFO.*"
);
" CFO.*"
);
stringBuilder
.
append
(
"FROM CUSTOMER C"
);
stringBuilder
.
append
(
"FROM CUSTOMER C"
);
stringBuilder
.
append
(
" INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID"
);
stringBuilder
.
append
(
" INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID"
);
...
...
src/main/java/com/viettel/campaign/web/dto/CampaignCustomerDTO.java
View file @
2052d254
...
@@ -26,4 +26,5 @@ public class CampaignCustomerDTO extends BaseDTO{
...
@@ -26,4 +26,5 @@ public class CampaignCustomerDTO extends BaseDTO{
private
Long
callStatus
;
private
Long
callStatus
;
private
Long
companySiteId
;
private
Long
companySiteId
;
private
Long
complainId
;
private
Long
complainId
;
private
String
lstCustomerId
;
}
}
src/main/java/com/viettel/campaign/web/rest/CustomerController.java
View file @
2052d254
package
com.viettel.campaign.web.rest
;
package
com.viettel.campaign.web.rest
;
import
com.viettel.campaign.model.ccms_full.CampaignCustomer
;
import
com.viettel.campaign.model.ccms_full.Customer
;
import
com.viettel.campaign.model.ccms_full.Customer
;
import
com.viettel.campaign.model.ccms_full.CustomizeFieldObject
;
import
com.viettel.campaign.model.ccms_full.CustomizeFieldObject
;
import
com.viettel.campaign.model.ccms_full.CustomizeFields
;
import
com.viettel.campaign.model.ccms_full.CustomizeFields
;
...
@@ -252,6 +253,13 @@ public class CustomerController {
...
@@ -252,6 +253,13 @@ public class CustomerController {
return
new
ResponseEntity
<>(
data
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
data
,
HttpStatus
.
OK
);
}
}
@PostMapping
(
"/deleteCustomerFromCampaign"
)
@ResponseBody
public
ResponseEntity
<?>
deleteCustomerFromCampaign
(
@RequestBody
CampaignCustomerDTO
dto
)
{
ResultDTO
resultDTO
=
customerService
.
deleteCustomerFromCampaign
(
dto
);
return
new
ResponseEntity
<>(
resultDTO
,
HttpStatus
.
OK
);
}
private
String
saveUploadFile
(
MultipartFile
file
)
{
private
String
saveUploadFile
(
MultipartFile
file
)
{
...
...
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