Commit 79adfea7 authored by 刘林's avatar 刘林

fix(jg):超设计使用年限bug修改

parent 258a920e
...@@ -1063,6 +1063,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign ...@@ -1063,6 +1063,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
Optional.ofNullable(dataDictionaryServiceImpl.getByCode(info.getInspectConclusion(), "JYJL")) Optional.ofNullable(dataDictionaryServiceImpl.getByCode(info.getInspectConclusion(), "JYJL"))
.map(DataDictionary::getName) .map(DataDictionary::getName)
.orElse("")); .orElse(""));
result.put("inspectReport", Optional.ofNullable(info.getInspectReport()).orElse("{}"));
result.put("jySeq", info.getSequenceNbr()); result.put("jySeq", info.getSequenceNbr());
if (overDesignServiceLifeEq != null) { if (overDesignServiceLifeEq != null) {
result.put("safetyAssessmentName", overDesignServiceLifeEq.getSafetyAssessmentName()); result.put("safetyAssessmentName", overDesignServiceLifeEq.getSafetyAssessmentName());
......
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