Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
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
赵啸非
smart_gov_platform
Commits
b7b2f2a8
Commit
b7b2f2a8
authored
Jan 25, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改大厅查询
parent
dd6abf42
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
base-manager/pom.xml
base-manager/pom.xml
+4
-0
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteHallServiceImpl.java
...als/xhx/module/site/service/impl/SiteHallServiceImpl.java
+1
-1
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+1
-1
base-manager/src/test/java/com/mortals/httpclient/site/SiteHallController.http
.../java/com/mortals/httpclient/site/SiteHallController.http
+1
-1
No files found.
base-manager/pom.xml
View file @
b7b2f2a8
...
@@ -278,6 +278,10 @@
...
@@ -278,6 +278,10 @@
<artifactId>
junit
</artifactId>
<artifactId>
junit
</artifactId>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
com.mortals.framework
</groupId>
<artifactId>
mortals-framework-annotation
</artifactId>
</dependency>
</dependencies>
</dependencies>
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteHallServiceImpl.java
View file @
b7b2f2a8
...
@@ -81,7 +81,7 @@ public class SiteHallServiceImpl extends AbstractCRUDServiceImpl<SiteHallDao, Si
...
@@ -81,7 +81,7 @@ public class SiteHallServiceImpl extends AbstractCRUDServiceImpl<SiteHallDao, Si
return
Rest
.
fail
(
"站点业务list不能为空!"
);
return
Rest
.
fail
(
"站点业务list不能为空!"
);
}
}
SiteBusinessQuery
siteBusinessQuery
=
new
SiteBusinessQuery
();
SiteBusinessQuery
siteBusinessQuery
=
new
SiteBusinessQuery
();
siteBusinessQuery
.
setIdList
(
siteBusinessIdList
);
siteBusinessQuery
.
set
Business
IdList
(
siteBusinessIdList
);
List
<
Long
>
businessIdList
=
siteBusinessService
.
find
(
siteBusinessQuery
).
parallelStream
().
map
(
i
->
i
.
getBusinessId
()).
distinct
().
collect
(
Collectors
.
toList
());
List
<
Long
>
businessIdList
=
siteBusinessService
.
find
(
siteBusinessQuery
).
parallelStream
().
map
(
i
->
i
.
getBusinessId
()).
distinct
().
collect
(
Collectors
.
toList
());
if
(
ObjectUtils
.
isEmpty
(
businessIdList
))
{
if
(
ObjectUtils
.
isEmpty
(
businessIdList
))
{
return
Rest
.
fail
(
"业务list不能为空!"
);
return
Rest
.
fail
(
"业务list不能为空!"
);
...
...
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
b7b2f2a8
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
},
},
"base-test1"
:
{
"base-test1"
:
{
"baseUrl"
:
"http://8.136.255.30:
21026
/base"
"baseUrl"
:
"http://8.136.255.30:
11071
/base"
},
},
"base-yibin-web"
:
{
"base-yibin-web"
:
{
...
...
base-manager/src/test/java/com/mortals/httpclient/site/SiteHallController.http
View file @
b7b2f2a8
...
@@ -29,7 +29,7 @@ POST {{baseUrl}}/site/hall/getBusinessByHall
...
@@ -29,7 +29,7 @@ POST {{baseUrl}}/site/hall/getBusinessByHall
Content-Type: application/json
Content-Type: application/json
{
{
"id":1
"id":1
3
}
}
...
...
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