|
@@ -378,8 +378,24 @@ public class FirstController extends BladeController {
|
|
|
if (pdfUrls.size() > 0) {
|
|
|
try {
|
|
|
//关联的数据
|
|
|
- if (StringUtils.isNotEmpty(firstJson.getString("linkMergePdfUrl"))) {
|
|
|
- pdfUrls.add(firstJson.getString("linkMergePdfUrl"));
|
|
|
+// if (StringUtils.isNotEmpty(firstJson.getString("linkMergePdfUrl"))) {
|
|
|
+// pdfUrls.add(firstJson.getString("linkMergePdfUrl"));
|
|
|
+// }
|
|
|
+ //获取所有工序节点的最新pdf
|
|
|
+ String ids = firstJson.getString("sjRecordIds");
|
|
|
+ if (StringUtils.isNotEmpty(ids)) {
|
|
|
+ String[] strings = ids.split(",");
|
|
|
+ for (String id : strings) {
|
|
|
+ JSONObject info = informationQueryClient.queryFirstBusinessDataByFirstId(id);
|
|
|
+ if (StringUtils.isNotEmpty(info.getString("eVisaPdfUrl"))){
|
|
|
+ pdfUrls.add(info.getString("eVisaPdfUrl"));
|
|
|
+ }else if (StringUtils.isNotEmpty(info.getString("pdfUrl"))){
|
|
|
+ pdfUrls.add(info.getString("pdfUrl"));
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(info.getString("uploadFile"))) {
|
|
|
+ pdfUrls.add(info.getString("uploadFile"));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
//总结报告
|
|
|
if (StringUtils.isNotEmpty(firstJson.getString("uploadFile"))) {
|