Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
3ec231ac
Commit
3ec231ac
authored
Apr 12, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改装备列表接口
parent
b4c4ad94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
FireFightingSystemController.java
.../equipmanage/controller/FireFightingSystemController.java
+4
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @
3ec231ac
...
...
@@ -465,8 +465,10 @@ public class FireFightingSystemController extends AbstractBaseController {
equipmentCategory
=
equipmentCategoryService
.
getById
(
equipmentCategory
.
getParentId
());
}
}
String
classificationCode
=
equipTypeAmountPage
.
getEquipmentClassificationCode
().
replaceAll
(
"0+$"
,
""
);
return
fireFightingSystemService
.
getColaCategoryAmountEquList
(
inhierarchy
,
classificationCode
.
length
()
%
2
==
0
?
classificationCode
:
classificationCode
+
"0"
,
equipTypeAmountPage
);
return
fireFightingSystemService
.
getColaCategoryAmountEquList
(
inhierarchy
,
equipTypeAmountPage
.
getEquipmentClassificationCode
().
replaceAll
(
"0+$"
,
""
),
equipTypeAmountPage
);
//String classificationCode = equipTypeAmountPage.getEquipmentClassificationCode().replaceAll("0+$", "");
//return fireFightingSystemService.getColaCategoryAmountEquList(inhierarchy, classificationCode.length() % 2 == 0 ? classificationCode : classificationCode + "0", equipTypeAmountPage);
}
else
{
if
(
null
!=
equipTypeAmountPage
.
getIsDefect
()
&&
1
==
equipTypeAmountPage
.
getIsDefect
())
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
...
...
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