Merge branch 'zhuwei' into test-merge

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TaskApprovalVO.java

@@ -54,8 +54,8 @@ public class TaskApprovalVO {
     @ApiModelProperty("附件信息")
     private List<ApprovalFile> approvalFileList = new ArrayList<>();
 
-    public void setApprovalFileList(String fileName, String fileUrl) {
-        this.approvalFileList.add(new ApprovalFile(fileName, fileUrl));
+    public void setApprovalFileList(String fileName, String fileUrl, String nodeld, String classify, String projectId, String contractId) {
+        this.approvalFileList.add(new ApprovalFile(fileName, fileUrl, nodeld, classify, projectId, contractId));
     }
 
     @Data
@@ -65,9 +65,19 @@ public class TaskApprovalVO {
 
         private String fileUrl;
 
-        public ApprovalFile(String fileName, String fileUrl) {
+        // 由于质检任务需要查看附件pdf 需要假 4个字段
+        private String nodeld;
+        private String classify;
+        private String projectId;
+        private String contractId;
+
+        public ApprovalFile(String fileName, String fileUrl, String nodeld, String classify, String projectId, String contractId) {
             this.fileName = fileName;
             this.fileUrl = fileUrl;
+            this.nodeld = nodeld;
+            this.classify = classify;
+            this.projectId = projectId;
+            this.contractId = contractId;
         }
 
         public ApprovalFile() {

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -222,7 +222,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         ProjectInfo projectInfo = this.projectClient.getById(log.getProjectId() + "");
         vo.setRemarkType(projectInfo.getRemarkType() + "");
         if (log != null && (StringUtils.isNotEmpty(log.getPdfUrl()) || StringUtils.isNotEmpty(log.getEVisaPdfUrl()))) {
-            vo.setApprovalFileList(log.getFileName(), StringUtils.isNotEmpty(log.getEVisaPdfUrl()) ? log.getEVisaPdfUrl() : log.getPdfUrl());
+            vo.setApprovalFileList(log.getFileName(), StringUtils.isNotEmpty(log.getEVisaPdfUrl()) ? log.getEVisaPdfUrl() : log.getPdfUrl(), "", "", log.getProjectId() + "", log.getContractId() + "");
+
         }
 
         return vo;
@@ -247,17 +248,17 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     //封面
                     String url = StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl();
                     String s = getHppsToHttp(url);
-                    vo.setApprovalFileList(query.getName(), s);
+                    vo.setApprovalFileList(query.getName(), s, query.getWbsId()+"", query.getClassify() + "", query.getProjectId() + "", query.getContractId() + "");
                 }
                 //不是签章时再查关联资料，因为关联资料都是审批好的pdf，存在关键字，不能再执行签 字/章
                 if (!isTask) {
                     //关联资料
                     if (StringUtils.isNotEmpty(query.getLinkMergePdfUrl())) {
-                        vo.setApprovalFileList("首件关联资料", this.getHppsToHttp(query.getLinkMergePdfUrl()));
+                        vo.setApprovalFileList("首件关联资料", this.getHppsToHttp(query.getLinkMergePdfUrl()), "", "", query.getProjectId() + "", query.getContractId() + "");
                     }
                     InformationQueryFile queryFile = this.informationQueryFileService.getOne(Wrappers.<InformationQueryFile>lambdaQuery().eq(InformationQueryFile::getQueryId, query.getId()));
                     if (queryFile != null) {
-                        vo.setApprovalFileList(queryFile.getName(), getHppsToHttp(queryFile.getPdfUrl()));
+                        vo.setApprovalFileList(queryFile.getName(), getHppsToHttp(queryFile.getPdfUrl()),query.getWbsId()+"", query.getClassify() + "", query.getProjectId() + "", query.getContractId() + "");
                     }
                 }
 
@@ -282,11 +283,11 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     /** 修改需求，任务查看时，附件不在列表中显示，需要拼接在电签后面。如果此处修改影响其他地方，则到时候再说*/
                     if(isTask){
                         String approvalPdf = StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl();
-                        vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf));
+                        vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf), query.getWbsId()+"", query.getClassify()+"", query.getProjectId()+"", query.getContractId()+"");
                     }else{
                         String approvalPdf = StringUtils.isNotEmpty(query.getNodePdfUrl()) ? query.getNodePdfUrl() : query.getEVisaPdfUrl();
                         String approvalPdf2 = StringUtils.isNotEmpty(approvalPdf) ? approvalPdf : query.getPdfUrl();
-                        vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf2));
+                        vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf2), query.getWbsId()+"", query.getClassify()+"", query.getProjectId()+"", query.getContractId()+"");
                     }
 
                     //试验关联文件合并pdf
@@ -296,7 +297,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                             query.setPdfTrialUrl(replaceHTTPURL);
                         }
                         String trialPdf = StringUtils.isNotEmpty(query.getPdfTrialUrl()) ? query.getPdfTrialUrl() : null;
-                        vo.setApprovalFileList(query.getName() + "（关联试验文件）", getHppsToHttp(trialPdf));
+                        vo.setApprovalFileList(query.getName() + "（关联试验文件）", getHppsToHttp(trialPdf), query.getWbsId()+"", query.getClassify()+"", query.getProjectId()+"", query.getContractId()+"");
                     }
 
                     //试验关联的工程部位信息合并pdf
@@ -307,9 +308,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         }
 
                         String trailpdf = StringUtils.isNotEmpty(query.getPdfTrialUrlPosition()) ? query.getPdfTrialUrlPosition() : null;
-                        vo.setApprovalFileList(query.getName() + "（关联试验工程部位信息文件）", getHppsToHttp(trailpdf));
+                        vo.setApprovalFileList(query.getName() + "（关联试验工程部位信息文件）", getHppsToHttp(trailpdf), query.getWbsId()+"", query.getClassify()+"", query.getProjectId()+"", query.getContractId()+"");
                     }
-
                 }
             } else if (new Integer("2").equals(query.getType())) {
                 //试验
@@ -357,7 +357,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     }catch (Exception e){
                         e.printStackTrace();
                     }
-                    vo.setApprovalFileList(query.getName(), getHppsToHttp(approvalPdf));
+                    vo.setApprovalFileList(query.getName(), getHppsToHttp(approvalPdf), query.getWbsId()+"", query.getClassify()+"", query.getProjectId()+"", query.getContractId()+"");
 
                     //试验关联的原材料检测报告合并pdf （wbsId=试验记录id）
                     String sqlRecord = "select old_pdf_url from u_trial_raw_material_self_record where self_record_id =" + query.getWbsId();
@@ -370,7 +370,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                             }
                         }
                         String clPdf = StringUtils.isNotEmpty(recordObj.getOldPdfUrl()) ? recordObj.getOldPdfUrl() : null;
-                        vo.setApprovalFileList(query.getName() + "（原材料检测报告）", getHppsToHttp(clPdf));
+                        vo.setApprovalFileList(query.getName() + "（原材料检测报告）", getHppsToHttp(clPdf), query.getWbsId()+"", query.getClassify()+"", query.getProjectId()+"", query.getContractId()+"");
                     }
                 }
             }
@@ -389,7 +389,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             ProjectInfo projectInfo = this.projectClient.getById(archiveFileList.get(0).getProjectId() + "");
             vo.setRemarkType(projectInfo.getRemarkType() + "");
             for (ArchiveFile archiveFile : archiveFileList) {
-                vo.setApprovalFileList(archiveFile.getFileName(), StringUtils.isEmpty(archiveFile.getPdfFileUrl()) ? archiveFile.getFileUrl() : archiveFile.getPdfFileUrl());
+                vo.setApprovalFileList(archiveFile.getFileName(), StringUtils.isEmpty(archiveFile.getPdfFileUrl()) ? archiveFile.getFileUrl() : archiveFile.getPdfFileUrl(), archiveFile.getId() + "", archiveFile.getClassify() + "", archiveFile.getProjectId() + "", archiveFile.getContractId() + "");
             }
             return vo;
         }