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
2e7a87d1
Commit
2e7a87d1
authored
5 years ago
by
Tu Bach
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tubn campaign execute customer list update
parent
d7b32eea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListColumnRepository.java
...itory/ccms_full/CampaignCustomerListColumnRepository.java
+1
-1
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignCustomerListColumnRepositoryImpl.java
...s_full/impl/CampaignCustomerListColumnRepositoryImpl.java
+3
-6
src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java
...ttel/campaign/service/impl/CampaignExecuteServiceImp.java
+3
-2
No files found.
src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerListColumnRepository.java
View file @
2e7a87d1
...
...
@@ -10,7 +10,7 @@ import java.util.List;
@Repository
@Transactional
(
DataSourceQualify
.
CCMS_FULL
)
public
interface
CampaignCustomerListColumnRepository
extends
JpaRepository
<
CampaignCustomerListColumn
,
Long
>
{
public
interface
CampaignCustomerListColumnRepository
extends
JpaRepository
<
CampaignCustomerListColumn
,
Long
>
,
CampaignCustomerListColumnRepositoryCustom
{
List
<
CampaignCustomerListColumn
>
findByCampaignIdAndCompanySiteId
(
Long
campaignId
,
Long
companaySiteId
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignCustomerListColumnRepositoryImpl.java
View file @
2e7a87d1
...
...
@@ -41,12 +41,9 @@ public class CampaignCustomerListColumnRepositoryImpl implements CampaignCustome
sb
.
append
(
" c.TYPE type,"
);
sb
.
append
(
" d.NAME valueCombobox"
);
sb
.
append
(
" FROM CAMPAIGN_CUSTOMERLIST_COLUMN a"
);
sb
.
append
(
" JOIN CUSTOMIZE_FIELD_OBJECT b"
);
sb
.
append
(
" ON a.CUSTOMIZE_FIELD_ID = b.CUSTOMIZE_FIELDS_ID"
);
sb
.
append
(
" JOIN CUSTOMIZE_FIELDS c"
);
sb
.
append
(
" ON a.CUSTOMIZE_FIELD_ID = c.CUSTOMIZE_FIELD_ID"
);
sb
.
append
(
" LEFT JOIN CUSTOMIZE_FIELD_OPTION_VALUE d"
);
sb
.
append
(
" ON b.FIELD_OPTION_VALUE_ID = d.FIELD_OPTION_VALUE_ID"
);
sb
.
append
(
" JOIN CUSTOMIZE_FIELD_OBJECT b ON a.CUSTOMIZE_FIELD_ID = b.CUSTOMIZE_FIELDS_ID"
);
sb
.
append
(
" JOIN CUSTOMIZE_FIELDS c ON a.CUSTOMIZE_FIELD_ID = c.CUSTOMIZE_FIELD_ID"
);
sb
.
append
(
" LEFT JOIN CUSTOMIZE_FIELD_OPTION_VALUE d ON b.FIELD_OPTION_VALUE_ID = d.FIELD_OPTION_VALUE_ID"
);
sb
.
append
(
" WHERE 1 = 1"
);
sb
.
append
(
" AND b.FUNCTION_CODE = 'CUSTOMER'"
);
sb
.
append
(
" AND a.COMPANY_SITE_ID = :p_company_site_id"
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java
View file @
2e7a87d1
...
...
@@ -63,7 +63,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
TimeRangeDialModeRepository
rangeDialModeRepository
;
@Autowired
CampaignCustomerListColumnRepository
Custom
campaignCustomerListColumnRepositoryCustom
;
CampaignCustomerListColumnRepository
campaignCustomerListColumnRepository
;
//<editor-fold: hungtt>
@Override
...
...
@@ -277,6 +277,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
a
.
setAgentId
(
requestDto
.
getAgentId
());
a
.
setCampaignSystemStatus
(
"AVAILABLE"
);
a
.
setCurrentCampaignId
(
Long
.
parseLong
(
requestDto
.
getCampaignId
()));
a
.
setUpdateDate
(
new
Date
());
agentsRepository
.
save
(
a
);
// update ccms_full.campaign_agent table
campaignAgentRepository
.
updateCampaignAgentSetStatus
(
Long
.
parseLong
(
requestDto
.
getAgentId
()),
Long
.
parseLong
(
requestDto
.
getCampaignId
()),
1
);
...
...
@@ -589,7 +590,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
}
try
{
List
<
CampaignCustomerListColumnRequestDTO
>
data
=
campaignCustomerListColumnRepository
Custom
.
getCustomerInfor
(
companySiteId
,
customerId
,
campaignId
);
List
<
CampaignCustomerListColumnRequestDTO
>
data
=
campaignCustomerListColumnRepository
.
getCustomerInfor
(
companySiteId
,
customerId
,
campaignId
);
resultDTO
.
setErrorCode
(
Constants
.
ApiErrorCode
.
SUCCESS
);
resultDTO
.
setDescription
(
Constants
.
ApiErrorDesc
.
SUCCESS
);
resultDTO
.
setData
(
data
);
...
...
This diff is collapsed.
Click to expand it.
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