Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yichengstreet-be
Project
Project
Details
Activity
Releases
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
yichengstreet
yichengstreet-be
Commits
3874ebfb
Commit
3874ebfb
authored
Mar 05, 2025
by
luben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
71575f2c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
LabelsController.java
...java/com/ruoyi/web/controller/other/LabelsController.java
+2
-0
GridCompanyEconomyInfoServiceImpl.java
.../service/grid/impl/GridCompanyEconomyInfoServiceImpl.java
+6
-1
No files found.
ruoyi-admin/src/main/java/com/ruoyi/web/controller/other/LabelsController.java
View file @
3874ebfb
...
@@ -44,6 +44,8 @@ public class LabelsController extends BaseController {
...
@@ -44,6 +44,8 @@ public class LabelsController extends BaseController {
LabelsExample
.
Criteria
criteria
=
example
.
createCriteria
();
LabelsExample
.
Criteria
criteria
=
example
.
createCriteria
();
if
(
StringUtils
.
isNotEmpty
(
bsCommonVO
.
getParentId
()))
{
if
(
StringUtils
.
isNotEmpty
(
bsCommonVO
.
getParentId
()))
{
criteria
.
andParentIdEqualTo
(
bsCommonVO
.
getParentId
());
criteria
.
andParentIdEqualTo
(
bsCommonVO
.
getParentId
());
}
else
{
criteria
.
andParentIdIsNull
();
}
}
example
.
setOrderByClause
(
" sort + 0 asc "
);
example
.
setOrderByClause
(
" sort + 0 asc "
);
List
<
Labels
>
list
=
bsCommonService
.
selectByExample
(
example
);
List
<
Labels
>
list
=
bsCommonService
.
selectByExample
(
example
);
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/grid/impl/GridCompanyEconomyInfoServiceImpl.java
View file @
3874ebfb
...
@@ -79,7 +79,12 @@ public class GridCompanyEconomyInfoServiceImpl extends BaseServiceImpl<GridCompa
...
@@ -79,7 +79,12 @@ public class GridCompanyEconomyInfoServiceImpl extends BaseServiceImpl<GridCompa
}
}
criteria
.
andIsValidEqualTo
(
"1"
);
criteria
.
andIsValidEqualTo
(
"1"
);
example
.
setOrderByClause
(
" year desc "
);
example
.
setOrderByClause
(
" year desc "
);
return
gridCompanyEconomyInfoMapper
.
selectByExample
(
example
);
List
<
GridCompanyEconomyInfo
>
res
=
gridCompanyEconomyInfoMapper
.
selectByExample
(
example
);
for
(
GridCompanyEconomyInfo
info
:
res
)
{
info
.
setSales
(
Arrays
.
asList
(
info
.
getYearSales
().
substring
(
1
,
info
.
getYearSales
().
length
()-
1
).
split
(
","
)));
info
.
setTaxes
(
Arrays
.
asList
(
info
.
getYearTaxes
().
substring
(
1
,
info
.
getYearTaxes
().
length
()-
1
).
split
(
","
)));
}
return
res
;
}
}
@Override
@Override
...
...
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