Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-store
Commits
f1368f57
Commit
f1368f57
authored
Sep 11, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
storeinfoId notin
parent
42519621
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletions
+21
-1
StoreSearchDTO.java
...e-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
+9
-0
StoreApiServiceImpl.java
...com/gic/store/service/outer/impl/StoreApiServiceImpl.java
+12
-1
No files found.
gic-store-api/src/main/java/com/gic/store/dto/StoreSearchDTO.java
View file @
f1368f57
...
...
@@ -24,6 +24,7 @@ public class StoreSearchDTO implements Serializable {
private
String
storeIds
;
private
String
storeInfoIds
;
private
String
storeIdsOfNot
;
private
String
storeInfoIdsOfNot
;
private
Integer
storeBrandId
;
private
String
searchJson
;
private
String
authSearchJson
;
...
...
@@ -294,6 +295,14 @@ public class StoreSearchDTO implements Serializable {
this
.
storeTags
=
storeTags
;
}
public
String
getStoreInfoIdsOfNot
()
{
return
storeInfoIdsOfNot
;
}
public
void
setStoreInfoIdsOfNot
(
String
storeInfoIdsOfNot
)
{
this
.
storeInfoIdsOfNot
=
storeInfoIdsOfNot
;
}
@Override
public
String
toString
()
{
return
"StoreSearchDTO{"
+
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
View file @
f1368f57
...
...
@@ -1561,7 +1561,7 @@ public class StoreApiServiceImpl implements StoreApiService {
}
}
enterpriseJson
=
QueryConditionAssemblyUtil
.
createListQueryNode
(
jsonObjectList
,
OperateEnum
.
OPERATE_AND
);
/***build notIn s
earch
****/
/***build notIn s
toreId
****/
if
(
StringUtils
.
isNotBlank
(
storeSearchDTO
.
getStoreIdsOfNot
())){
List
<
JSONObject
>
list
=
new
ArrayList
<>();
json
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
StoreESFieldsEnum
.
STOREID
.
getField
(),
OperateEnum
.
OPERATE_ARR_CONTAIN
,
storeSearchDTO
.
getStoreIdsOfNot
());
...
...
@@ -1572,6 +1572,17 @@ public class StoreApiServiceImpl implements StoreApiService {
list1
.
add
(
notJson
);
enterpriseJson
=
QueryConditionAssemblyUtil
.
createListQueryNode
(
list1
,
OperateEnum
.
OPERATE_AND
);
}
/****build notIn storeInfoId*****/
if
(
StringUtils
.
isNotBlank
(
storeSearchDTO
.
getStoreInfoIdsOfNot
())){
List
<
JSONObject
>
list
=
new
ArrayList
<>();
json
=
QueryConditionAssemblyUtil
.
createSimpleQueryNode
(
StoreESFieldsEnum
.
STOREINFOID
.
getField
(),
OperateEnum
.
OPERATE_ARR_CONTAIN
,
storeSearchDTO
.
getStoreInfoIdsOfNot
());
list
.
add
(
json
);
JSONObject
notJson
=
QueryConditionAssemblyUtil
.
createListQueryNode
(
list
,
OperateEnum
.
OPERATE_AND_NOT
);
List
<
JSONObject
>
list1
=
new
ArrayList
<>();
list1
.
add
(
enterpriseJson
);
list1
.
add
(
notJson
);
enterpriseJson
=
QueryConditionAssemblyUtil
.
createListQueryNode
(
list1
,
OperateEnum
.
OPERATE_AND
);
}
return
enterpriseJson
;
}
...
...
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