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
338033d7
Commit
338033d7
authored
Aug 28, 2019
by
đinh thị đầm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
searchCustomize
parent
ce797e37
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
94 deletions
+52
-94
src/main/java/com/viettel/campaign/service/CustomerService.java
...in/java/com/viettel/campaign/service/CustomerService.java
+1
-1
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
...om/viettel/campaign/service/impl/CustomerServiceImpl.java
+32
-93
src/main/java/com/viettel/campaign/web/dto/CampaignCustomerDTO.java
...ava/com/viettel/campaign/web/dto/CampaignCustomerDTO.java
+5
-0
src/main/java/com/viettel/campaign/web/dto/CustomizeFieldsDTO.java
...java/com/viettel/campaign/web/dto/CustomizeFieldsDTO.java
+3
-0
src/main/java/com/viettel/campaign/web/dto/request_dto/CustomerQueryDTO.java
...iettel/campaign/web/dto/request_dto/CustomerQueryDTO.java
+1
-0
src/main/java/com/viettel/campaign/web/rest/CustomerController.java
...ava/com/viettel/campaign/web/rest/CustomerController.java
+10
-0
No files found.
src/main/java/com/viettel/campaign/service/CustomerService.java
View file @
338033d7
...
@@ -86,6 +86,6 @@ public interface CustomerService {
...
@@ -86,6 +86,6 @@ public interface CustomerService {
//// List<CustomizeFields> searchCustomize();
//// List<CustomizeFields> searchCustomize();
ResultDTO
listCustomizeFields
(
CustomizeFieldsDTO
customizeFields
);
ResultDTO
listCustomizeFields
(
CustomizeFieldsDTO
customizeFields
);
ResultDTO
searchCustomizeFields
(
int
page
,
int
pageSize
,
long
companySiteId
,
long
campaignId
,
CustomerQueryDTO
customerQuery
DTO
);
ResultDTO
searchCustomizeFields
(
CampaignCustomerDTO
campaignCustomer
DTO
);
}
}
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
View file @
338033d7
This diff is collapsed.
Click to expand it.
src/main/java/com/viettel/campaign/web/dto/CampaignCustomerDTO.java
View file @
338033d7
package
com.viettel.campaign.web.dto
;
package
com.viettel.campaign.web.dto
;
import
com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
@Getter
@Getter
@Setter
@Setter
...
@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{
...
@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{
private
Long
companySiteId
;
private
Long
companySiteId
;
private
Long
complainId
;
private
Long
complainId
;
private
String
lstCustomerId
;
private
String
lstCustomerId
;
private
List
<
CustomerQueryDTO
>
listQuery
;
}
}
src/main/java/com/viettel/campaign/web/dto/CustomizeFieldsDTO.java
View file @
338033d7
package
com.viettel.campaign.web.dto
;
package
com.viettel.campaign.web.dto
;
import
com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
@Getter
@Getter
@Setter
@Setter
...
@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO {
...
@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO {
private
Long
min
;
private
Long
min
;
private
Long
max
;
private
Long
max
;
private
Long
active
;
private
Long
active
;
}
}
src/main/java/com/viettel/campaign/web/dto/request_dto/CustomerQueryDTO.java
View file @
338033d7
...
@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO {
...
@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO {
String
field
;
String
field
;
String
operator
;
String
operator
;
String
condition
;
String
condition
;
}
}
src/main/java/com/viettel/campaign/web/rest/CustomerController.java
View file @
338033d7
...
@@ -12,6 +12,7 @@ import com.viettel.campaign.utils.Config;
...
@@ -12,6 +12,7 @@ import com.viettel.campaign.utils.Config;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.Constants
;
import
com.viettel.campaign.utils.RedisUtil
;
import
com.viettel.campaign.utils.RedisUtil
;
import
com.viettel.campaign.web.dto.*
;
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.CustomerRequestDTO
;
import
com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo
;
import
com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo
;
import
com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO
;
import
com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO
;
...
@@ -308,4 +309,13 @@ public class CustomerController {
...
@@ -308,4 +309,13 @@ public class CustomerController {
ResultDTO
resultDTO
=
customerService
.
listCustomizeFields
(
customizeRequestDTo
);
ResultDTO
resultDTO
=
customerService
.
listCustomizeFields
(
customizeRequestDTo
);
return
new
ResponseEntity
<>(
resultDTO
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
resultDTO
,
HttpStatus
.
OK
);
}
}
@PostMapping
(
"/searchCustomizeFields"
)
@ResponseBody
public
ResponseEntity
searchCustomizeFields
(
@RequestBody
CampaignCustomerDTO
campaignCustomerDTO
)
{
ResultDTO
result
=
customerService
.
searchCustomizeFields
(
campaignCustomerDTO
);
return
new
ResponseEntity
<>(
result
,
HttpStatus
.
OK
);
}
}
}
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