Commit b894b0c0 authored by suhuiguang's avatar suhuiguang

1.修改注释

parent 30c33ca9
...@@ -706,18 +706,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -706,18 +706,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jsonObject.remove("instanceId"); jsonObject.remove("instanceId");
return jsonObject; return jsonObject;
} }
// 基本信息 + 制造信息
Map<String, Object> detail = this.baseMapper.getDetail(id); Map<String, Object> detail = this.baseMapper.getDetail(id);
// 检验信息
Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id); Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
// 使用信息
Map<String, Object> useDetail = this.baseMapper.getUseDetail(id); Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
Map<String, Object> useDestail = this.baseMapper.getDesDetail(id); // 设计信息
Map<String, Object> degDestail = this.baseMapper.getDesDetail(id);
if (!ObjectUtils.isEmpty(inspectDetail)) { if (!ObjectUtils.isEmpty(inspectDetail)) {
detail.putAll(inspectDetail); detail.putAll(inspectDetail);
} }
if (!ObjectUtils.isEmpty(useDetail)) { if (!ObjectUtils.isEmpty(useDetail)) {
detail.putAll(useDetail); detail.putAll(useDetail);
} }
if (!ObjectUtils.isEmpty(useDestail)) { if (!ObjectUtils.isEmpty(degDestail)) {
detail.putAll(useDestail); detail.putAll(degDestail);
} }
detail.remove("safetyManager"); detail.remove("safetyManager");
detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto")))); detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
......
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