Commit 5c0da1b9 authored by 刘林's avatar 刘林

fix(jg):历史管道导入报错修改,超设计使用年限附件报错问题修复

parent a99b99a4
...@@ -2055,7 +2055,7 @@ public class DataDockServiceImpl { ...@@ -2055,7 +2055,7 @@ public class DataDockServiceImpl {
.map(value -> value == null || "null".equals(value) ? "" : value) .map(value -> value == null || "null".equals(value) ? "" : value)
.collect(Collectors.joining())); .collect(Collectors.joining()));
manageLambdaUpdateWrapper.set(JgUseRegistrationManage::getRecDate, new Date()); manageLambdaUpdateWrapper.set(JgUseRegistrationManage::getRecDate, new Date());
manageLambdaUpdateWrapper.eq(BaseEntity::getSequenceNbr, jgUseRegistrationManages.stream().map(BaseEntity::getSequenceNbr).collect(Collectors.toList())); manageLambdaUpdateWrapper.in(BaseEntity::getSequenceNbr, jgUseRegistrationManages.stream().map(BaseEntity::getSequenceNbr).collect(Collectors.toList()));
jgUseRegistrationManageService.update(manageLambdaUpdateWrapper); jgUseRegistrationManageService.update(manageLambdaUpdateWrapper);
} }
} }
......
...@@ -1133,7 +1133,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign ...@@ -1133,7 +1133,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("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