Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
Grievance
Commits
8d8f6dd2
Commit
8d8f6dd2
authored
1 year ago
by
shishir suman
Browse files
Options
Download
Patches
Plain Diff
superadmin search related fixes
parent
1b3f60c2
main
Escalate_ticket_send_mail_to_raiser
UAT
UPHRH_7903_mobile_otp
UPHRH_quartz_scheduler
Velocity_template_changes
admin_config_changes
bug_fixes_01_11
github/fork/vky25/patch-1
rahu_test
shishir_dynamic_schedular
shishir_ticket_statistics_by_user
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/upsmf/grievance/service/impl/SearchServiceImpl.java
+15
-1
...a/org/upsmf/grievance/service/impl/SearchServiceImpl.java
with
15 additions
and
1 deletion
+15
-1
src/main/java/org/upsmf/grievance/service/impl/SearchServiceImpl.java
+
15
−
1
View file @
8d8f6dd2
...
...
@@ -518,7 +518,11 @@ public class SearchServiceImpl implements SearchService {
getPriority
(
String
.
valueOf
(
searchRequest
.
getPriority
()),
finalQuery
);
}
if
(
searchRequest
.
getFilter
().
get
(
"cc"
)
!=
null
)
{
getCCRangeQuery
(
String
.
valueOf
(
searchRequest
.
getFilter
().
get
(
"cc"
)),
finalQuery
);
if
(
String
.
valueOf
(
searchRequest
.
getFilter
().
get
(
"cc"
)).
equals
(
"0"
))
{
getCCRangeQueryNot
(
String
.
valueOf
(-
1
),
finalQuery
);
}
else
{
getCCRangeQuery
(
String
.
valueOf
(
searchRequest
.
getFilter
().
get
(
"cc"
)),
finalQuery
);
}
}
getDateRangeQuery
(
searchRequest
,
finalQuery
);
if
(
searchRequest
.
getFilter
().
get
(
"status"
)
!=
null
)
{
...
...
@@ -549,6 +553,16 @@ public class SearchServiceImpl implements SearchService {
return
finalQuery
;
}
private
BoolQueryBuilder
getCCRangeQueryNot
(
String
cc
,
BoolQueryBuilder
finalQuery
)
{
if
(
cc
!=
null
)
{
MatchQueryBuilder
ccMatchQuery
=
QueryBuilders
.
matchQuery
(
"assigned_to_id"
,
cc
);
BoolQueryBuilder
ccSearchQuery
=
QueryBuilders
.
boolQuery
();
ccSearchQuery
.
mustNot
(
ccMatchQuery
);
finalQuery
.
must
(
ccSearchQuery
);
}
return
finalQuery
;
}
private
BoolQueryBuilder
getJunkQuery
(
Boolean
isJunk
,
BoolQueryBuilder
finalQuery
)
{
if
(
isJunk
!=
null
)
{
MatchQueryBuilder
junkMatchQuery
=
QueryBuilders
.
matchQuery
(
"is_junk"
,
isJunk
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets