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
ec9a6476
Commit
ec9a6476
authored
May 16, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):设备类别查询修改入参
parent
0120fffc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
IdxBizJqEquipmentRegisterController.java
...g/biz/controller/IdxBizJqEquipmentRegisterController.java
+1
-1
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java
View file @
ec9a6476
...
@@ -124,7 +124,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
...
@@ -124,7 +124,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
@GetMapping
(
value
=
"/equ-category/listByPersonAndEquList"
)
@GetMapping
(
value
=
"/equ-category/listByPersonAndEquList"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"按照人员身份、设备种类查询设备类别"
,
notes
=
"按照人员身份、设备种类查询设备类别"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"按照人员身份、设备种类查询设备类别"
,
notes
=
"按照人员身份、设备种类查询设备类别"
)
public
ResponseModel
<
List
<
DictionarieValueModel
>>
equCategoryList
(
@RequestParam
(
value
=
"equList"
)
String
equList
,
public
ResponseModel
<
List
<
DictionarieValueModel
>>
equCategoryList
(
@RequestParam
(
value
=
"equList"
)
String
equList
,
@RequestParam
(
value
=
"businessScenarios"
)
String
businessScenarios
)
{
@RequestParam
(
value
=
"businessScenarios"
,
required
=
false
)
String
businessScenarios
)
{
return
ResponseHelper
.
buildResponse
(
idxBizJgRegisterInfoService
.
equCategoryListByCompanyType
(
getSelectedOrgInfo
(),
equList
,
businessScenarios
));
return
ResponseHelper
.
buildResponse
(
idxBizJgRegisterInfoService
.
equCategoryListByCompanyType
(
getSelectedOrgInfo
(),
equList
,
businessScenarios
));
}
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @
ec9a6476
...
@@ -503,7 +503,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
...
@@ -503,7 +503,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
}
String
dictCode
=
String
.
format
(
"%s_%s"
,
dictCodePrefix
,
equipAddDictCodeSuffix
);
String
dictCode
=
String
.
format
(
"%s_%s"
,
dictCodePrefix
,
equipAddDictCodeSuffix
);
List
<
DictionarieValueModel
>
result
=
FeignUtil
.
remoteCall
(()
->
Systemctl
.
dictionarieClient
.
dictValues
(
dictCode
));
List
<
DictionarieValueModel
>
result
=
FeignUtil
.
remoteCall
(()
->
Systemctl
.
dictionarieClient
.
dictValues
(
dictCode
));
if
(
CompanyTypeEnum
.
CONSTRUCTION
.
getName
().
equals
(
companyType
)
){
if
(
CompanyTypeEnum
.
CONSTRUCTION
.
getName
().
equals
(
companyType
)
||
ValidationUtil
.
isEmpty
(
businessScenarios
)
){
return
result
;
return
result
;
}
}
// 初始化collect列表
// 初始化collect列表
...
...
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