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
3b3adc21
Commit
3b3adc21
authored
Apr 03, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(JG):单位办理-导出功能修改
parent
4c68d44a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+5
-5
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 @
3b3adc21
...
...
@@ -1313,9 +1313,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
exportParamsMap
.
put
(
"manageType"
,
useRegistration
.
getManageType
());
LambdaQueryWrapper
<
JgUseRegistrationEq
>
useEqLambda
=
new
QueryWrapper
<
JgUseRegistrationEq
>().
lambda
();
useEqLambda
.
eq
(
JgUseRegistrationEq:
:
getEquipTransferId
,
sequenceNbr
);
JgUseRegistrationEq
useRegistrationEq
=
jgRelationEquipMapper
.
selectOne
(
useEqLambda
);
List
<
JgUseRegistrationEq
>
useRegistrationEqList
=
jgRelationEquipMapper
.
selectList
(
useEqLambda
);
if
(
ValidationUtil
.
isEmpty
(
useRegistration
)
||
ValidationUtil
.
isEmpty
(
useRegistrationEq
))
{
if
(
ValidationUtil
.
isEmpty
(
useRegistration
)
||
ValidationUtil
.
isEmpty
(
useRegistrationEq
List
))
{
throw
new
BadRequest
(
"使用登记证导出失败,请稍后重试!"
);
}
// 登记机关
...
...
@@ -1341,7 +1341,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
getAuditPassedDate
(
useRegistration
.
getAuditPassDate
(),
exportParamsMap
);
// 查询设备注册信息
IdxBizJgRegisterInfo
registerInfo
=
idxBizJgRegisterInfoService
.
getOne
(
new
QueryWrapper
<
IdxBizJgRegisterInfo
>().
eq
(
"RECORD"
,
useRegistrationEq
.
getEquId
()));
IdxBizJgRegisterInfo
registerInfo
=
idxBizJgRegisterInfoService
.
getOne
(
new
QueryWrapper
<
IdxBizJgRegisterInfo
>().
eq
(
"RECORD"
,
useRegistrationEq
List
.
get
(
0
)
.
getEquId
()));
if
(!
ValidationUtil
.
isEmpty
(
registerInfo
))
{
// 设备种类、类别、品种
String
equList
=
registerInfo
.
getEquList
();
// 设备种类
...
...
@@ -1375,7 +1375,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
exportParamsMap
.
put
(
"equCode"
,
registerInfo
.
getEquCode
());
}
IdxBizJgUseInfo
useInfo
=
idxBizJgUseInfoService
.
getOneData
(
useRegistrationEq
.
getEquId
());
IdxBizJgUseInfo
useInfo
=
idxBizJgUseInfoService
.
getOneData
(
useRegistrationEq
List
.
get
(
0
)
.
getEquId
());
if
(!
ValidationUtil
.
isEmpty
(
useInfo
))
{
if
(
ValidationUtil
.
isEmpty
(
useInfo
.
getUseInnerCode
()))
{
throw
new
BadRequest
(
"使用登记证导出失败,设备单位内部编码为空!"
);
...
...
@@ -1404,7 +1404,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
exportParamsMap
.
put
(
"fullAddress"
,
fullAddress
);
}
IdxBizJgFactoryInfo
factoryInfo
=
idxBizJgFactoryInfoService
.
getOneData
(
useRegistrationEq
.
getEquId
());
IdxBizJgFactoryInfo
factoryInfo
=
idxBizJgFactoryInfoService
.
getOneData
(
useRegistrationEq
List
.
get
(
0
)
.
getEquId
());
// 产品编号(出厂编号)
if
(!
ValidationUtil
.
isEmpty
(
factoryInfo
))
{
if
(
ValidationUtil
.
isEmpty
(
factoryInfo
.
getFactoryNum
()))
{
...
...
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