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
9a092c40
Commit
9a092c40
authored
Feb 26, 2025
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交查询详情时 安装信息在历史表有值的情况,使用历史表的数据
parent
be87073b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+5
-3
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 @
9a092c40
...
@@ -2830,11 +2830,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2830,11 +2830,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 基本信息 + 制造信息 + 设计信息
// 基本信息 + 制造信息 + 设计信息
fillLastEquipBaseInfo
(
jsonObject
,
record
);
fillLastEquipBaseInfo
(
jsonObject
,
record
);
// 安装信息
// 安装信息
if
(!
jsonObject
.
containsKey
(
"installationIsComplete"
))
{
Map
<
String
,
Object
>
installDetail
=
this
.
baseMapper
.
getiInstallDetail
(
record
);
Map
<
String
,
Object
>
installDetail
=
this
.
baseMapper
.
getiInstallDetail
(
record
);
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿
if
(
ValidationUtil
.
isEmpty
(
installDetail
))
{
if
(
ValidationUtil
.
isEmpty
(
installDetail
))
{
installDetail
=
this
.
baseMapper
.
getiInstallDetailByIdx
(
record
);
installDetail
=
this
.
baseMapper
.
getiInstallDetailByIdx
(
record
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
installDetail
))
{
jsonObject
.
putAll
(
installDetail
);
}
}
// 维保信息
// 维保信息
Map
<
String
,
Object
>
maintenanceDetail
=
this
.
baseMapper
.
getMaintenanceDetail
(
record
);
Map
<
String
,
Object
>
maintenanceDetail
=
this
.
baseMapper
.
getMaintenanceDetail
(
record
);
// 历史设备登记来的数据没有维保业务信息 从一码通数据拿
// 历史设备登记来的数据没有维保业务信息 从一码通数据拿
...
@@ -2844,9 +2849,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2844,9 +2849,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
if
(!
ObjectUtils
.
isEmpty
(
maintenanceDetail
))
{
if
(!
ObjectUtils
.
isEmpty
(
maintenanceDetail
))
{
jsonObject
.
putAll
(
maintenanceDetail
);
jsonObject
.
putAll
(
maintenanceDetail
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
installDetail
))
{
jsonObject
.
putAll
(
installDetail
);
}
}
}
public
void
fillLastEquipBaseInfo
(
JSONObject
jsonObject
,
String
record
)
{
public
void
fillLastEquipBaseInfo
(
JSONObject
jsonObject
,
String
record
)
{
...
...
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