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
0b02f7c3
Commit
0b02f7c3
authored
Apr 19, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):车用气瓶数据查询兼容个人
parent
59f7ab95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
JgVehicleInformationController.java
...ule/jg/biz/controller/JgVehicleInformationController.java
+6
-1
JgVehicleInformationServiceImpl.java
.../jg/biz/service/impl/JgVehicleInformationServiceImpl.java
+8
-2
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/JgVehicleInformationController.java
View file @
0b02f7c3
...
...
@@ -126,8 +126,13 @@ public class JgVehicleInformationController extends BaseController {
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
Map
<
String
,
Object
>>
page
=
new
Page
<>(
current
,
size
);
ReginParams
info
=
getSelectedOrgInfo
();
String
companyCode
=
info
.
getCompany
().
getCompanyCode
();
// 使用单位为个人时候 特殊处理
if
(
companyCode
.
split
(
"_"
).
length
>
1
)
{
companyCode
=
companyCode
.
split
(
"_"
)[
1
];
}
dto
.
setCurrentUserId
(
info
.
getUserModel
().
getUserId
());
dto
.
setUseUnitCreditCode
(
info
.
getCompany
().
getCompanyCode
()
);
dto
.
setUseUnitCreditCode
(
companyCode
);
if
(
info
.
getCompany
().
getLevel
().
equals
(
BaseController
.
COMPANY_TYPE_COMPANY
))
{
dto
.
setDataType
(
BaseController
.
COMPANY_TYPE_COMPANY
);
}
else
{
...
...
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/JgVehicleInformationServiceImpl.java
View file @
0b02f7c3
...
...
@@ -176,8 +176,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
}
// 使用单位信息
vehicleInfoDto
.
setUseUnitName
(
company
.
getCompanyName
());
vehicleInfoDto
.
setUseUnitCreditCode
(
company
.
getCompanyCode
());
if
(
"个人主体"
.
equals
(
company
.
getCompanyType
())){
vehicleInfoDto
.
setUseUnitName
(
company
.
getCompanyName
().
split
(
"_"
)[
1
]);
vehicleInfoDto
.
setUseUnitCreditCode
(
company
.
getCompanyCode
().
split
(
"_"
)[
1
]);
}
else
{
vehicleInfoDto
.
setUseUnitName
(
company
.
getCompanyName
());
vehicleInfoDto
.
setUseUnitCreditCode
(
company
.
getCompanyCode
());
}
// 接收单位信息
if
(!
StringUtils
.
isEmpty
(
vehicleInfoDto
.
getReceiveOrgCode
()))
{
...
...
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