Commit 9a092c40 authored by hezhuozhi's avatar hezhuozhi

提交查询详情时 安装信息在历史表有值的情况,使用历史表的数据

parent be87073b
...@@ -2830,10 +2830,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2830,10 +2830,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 基本信息 + 制造信息 + 设计信息 // 基本信息 + 制造信息 + 设计信息
fillLastEquipBaseInfo(jsonObject, record); fillLastEquipBaseInfo(jsonObject, record);
// 安装信息 // 安装信息
Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record); if(!jsonObject.containsKey("installationIsComplete")) {
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿 Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
if (ValidationUtil.isEmpty(installDetail)) { // 历史设备登记来的数据没有安装业务信息 从一码通数据拿
installDetail = this.baseMapper.getiInstallDetailByIdx(record); if (ValidationUtil.isEmpty(installDetail)) {
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment