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
9440143b
Commit
9440143b
authored
Dec 20, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):工业管道汇总表打印的使用单位地址调整
parent
80592fb2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+2
-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/service/impl/JgUseRegistrationServiceImpl.java
View file @
9440143b
...
...
@@ -2444,7 +2444,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 使用单位地址
String
useUnitCreditCode
=
String
.
valueOf
(
jsonObject
.
get
(
"useUnitCreditCode"
));
TzBaseEnterpriseInfo
enterpriseInfo
=
tzBaseEnterpriseInfoMapper
.
selectOne
(
new
LambdaQueryWrapper
<
TzBaseEnterpriseInfo
>().
eq
(
TzBaseEnterpriseInfo:
:
getUseCode
,
useUnitCreditCode
));
exportParamsMap
.
put
(
"fullAddress"
,
this
.
spliceFullAddress
(
enterpriseInfo
));
exportParamsMap
.
put
(
"fullAddress"
,
enterpriseInfo
.
getAddress
(
));
// 工程(装置)名称 取第一个设备的技术参数”工程装置名称“
JSONObject
eqJSON
=
(
JSONObject
)
equipmentLists
.
get
(
0
);
String
eqId
=
!
ValidationUtil
.
isEmpty
(
eqJSON
)
?
String
.
valueOf
(
eqJSON
.
get
(
"record"
))
:
""
;
...
...
@@ -2484,7 +2484,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
boolean
hasProvince
=
address
.
contains
(
"省"
);
boolean
hasCity
=
address
.
contains
(
"市"
);
boolean
hasDistrict
=
address
.
contains
(
"区"
);
if
(
hasProvince
&&
hasCity
&&
hasDistrict
)
{
if
(
hasProvince
||
hasCity
||
hasDistrict
)
{
return
address
;
}
return
enterpriseInfo
.
getProvince
()
+
enterpriseInfo
.
getCity
()
+
enterpriseInfo
.
getDistrict
()
+
enterpriseInfo
.
getStreet
()
+
enterpriseInfo
.
getCommunity
()
+
enterpriseInfo
.
getAddress
();
...
...
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