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