|
@@ -289,7 +289,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
|
|
|
entrustPdfUrl = "";
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//关联原材料检测报告的pdf(合并后的dpf都一样,取其一)
|
|
|
String sqlRecord = "select old_pdf_url from u_trial_raw_material_self_record where self_record_id =" + nodeId;
|
|
|
TrialRawMaterialSelfRecord recordObj = jdbcTemplate.query(sqlRecord, new BeanPropertyRowMapper<>(TrialRawMaterialSelfRecord.class)).stream().findAny().orElse(null);
|
|
@@ -345,7 +345,9 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
|
|
|
return pdfUrl.toString();
|
|
|
}
|
|
|
}}
|
|
|
- return pdfUrl.toString();
|
|
|
+ if(ObjectUtil.isNotEmpty(pdfUrl)){
|
|
|
+ return pdfUrl.toString();
|
|
|
+ }
|
|
|
}
|
|
|
return "";
|
|
|
}
|