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
05f60272
Commit
05f60272
authored
Apr 06, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加应用复选字段
parent
bdafcd3b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
.../java/com/mortals/xhx/module/site/web/SiteController.java
+9
-4
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
...test/java/com/mortals/httpclient/site/SiteController.http
+1
-2
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @
05f60272
...
...
@@ -158,11 +158,16 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
JSONObject
jsonObject
=
new
JSONObject
();
String
busiDesc
=
"根据区域编码查询站点列表"
+
this
.
getModuleDesc
();
try
{
AreaEntity
areaEntity
=
areaService
.
selectOne
(
new
AreaQuery
().
name
(
site
.
getAreaName
()));
if
(!
ObjectUtils
.
isEmpty
(
areaEntity
)){
site
.
setAreaCode
(
areaEntity
.
getAreaCode
());
}
//
AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
//
if(!ObjectUtils.isEmpty(areaEntity)){
//
site.setAreaCode(areaEntity.getAreaCode());
//
}
List
<
SiteEntity
>
siteEntityList
=
this
.
service
.
getFlatSitesByAreaCode
(
site
.
getAreaCode
(),
getContext
());
if
(!
ObjectUtils
.
isEmpty
(
site
.
getSiteName
())){
siteEntityList
=
siteEntityList
.
stream
().
filter
(
item
->
site
.
getSiteName
().
equals
(
item
.
getSiteName
())).
collect
(
Collectors
.
toList
());
}
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
siteEntityList
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
...
...
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @
05f60272
...
...
@@ -79,8 +79,7 @@ POST {{baseUrl}}/site/getFlatSitesByAreaCode
Content-Type: application/json
{
"areaCode":"510105521000",
"areaName":"宜宾市"
"areaCode":"511502000000"
}
###根据区域等级获取站点列表
...
...
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