Commit 3f176f4a authored by tianyiming's avatar tianyiming

使用登记详情查询设备信息修改

parent db2d8b09
...@@ -1624,6 +1624,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1624,6 +1624,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jsonObject.put("applyNo", jgUseRegistration.getApplyNo()); jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
jsonObject.remove("submit"); jsonObject.remove("submit");
jsonObject.remove("instanceId"); jsonObject.remove("instanceId");
if (!ObjectUtils.isEmpty(jsonObject.get("factoryUseSiteStreet"))) {
jsonObject.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(jsonObject.get("factoryUseSiteStreet").toString())));
}
if (!"unit".equals(jgUseRegistration.getManageType())) { if (!"unit".equals(jgUseRegistration.getManageType())) {
// 作废时(完成时)equipId 为空 // 作废时(完成时)equipId 为空
record = setDefaultRecord(jgUseRegistration, record); record = setDefaultRecord(jgUseRegistration, record);
...@@ -1676,6 +1679,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1676,6 +1679,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
detail.putAll(inspectDetail); detail.putAll(inspectDetail);
} }
if (!ObjectUtils.isEmpty(useDetail)) { if (!ObjectUtils.isEmpty(useDetail)) {
if (!ObjectUtils.isEmpty(useDetail.get("factoryUseSiteStreet"))) {
useDetail.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(useDetail.get("factoryUseSiteStreet").toString())));
}
detail.putAll(useDetail); detail.putAll(useDetail);
} }
if (!ObjectUtils.isEmpty(desDetail)) { if (!ObjectUtils.isEmpty(desDetail)) {
......
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