Browse Source

质检-修改需求,任务查看时,附件不在列表中显示,需要拼接在电签后面。如果此处修改影响其他地方,则到时候再说

qianxb 2 months ago
parent
commit
24e1af0a29

+ 7 - 7
blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -975,13 +975,13 @@ public class TaskController extends BladeController {
         //获取具体业务数据
         //获取具体业务数据
         TaskApprovalVO taskApprovalVO = this.taskService.queryBusinessData(vo);
         TaskApprovalVO taskApprovalVO = this.taskService.queryBusinessData(vo);
         /** 任务审批查看时,把节点附件列表跟在上报文件后面*/
         /** 任务审批查看时,把节点附件列表跟在上报文件后面*/
-        if(Func.isNull(approvalType) && approvalType==1){
-            List<TaskApprovalVO.ApprovalFile> files = jdbcTemplate.query("select name as fileName,domain_url as fileUrl from m_table_file where is_deleted = 0 and tab_id = ?",new BeanPropertyRowMapper<>(TaskApprovalVO.ApprovalFile.class),formDataId);
-            if (ObjectUtil.isNotEmpty(files)){
-                List<TaskApprovalVO.ApprovalFile> fileList = vo.getApprovalFileList();
-                fileList.addAll(files);
-            }
-        }
+//        if(Func.isNotEmpty(approvalType) && approvalType==1){
+//            List<TaskApprovalVO.ApprovalFile> files = jdbcTemplate.query("select name as fileName,domain_url as fileUrl from m_table_file where is_deleted = 0 and tab_id = (select wbs_id from u_information_query WHERE id = ?)",new BeanPropertyRowMapper<>(TaskApprovalVO.ApprovalFile.class),formDataId);
+//            if (ObjectUtil.isNotEmpty(files)){
+//                List<TaskApprovalVO.ApprovalFile> fileList = taskApprovalVO.getApprovalFileList();
+//                fileList.addAll(files);
+//            }
+//        }
         return R.data(taskApprovalVO);
         return R.data(taskApprovalVO);
     }
     }
 
 

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

@@ -255,7 +255,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     }
                     }
 
 
                     //资料填报原始pdf
                     //资料填报原始pdf
-                    String approvalPdf = StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl();
+//                    String approvalPdf = StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() : query.getPdfUrl();
+                    /** 修改需求,任务查看时,附件不在列表中显示,需要拼接在电签后面。如果此处修改影响其他地方,则到时候再说*/
+                    String approvalPdf = StringUtils.isNotEmpty(query.getNodePdfUrl()) ? query.getNodePdfUrl() : query.getPdfUrl();
                     vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf));
                     vo.setApprovalFileList(query.getName(), this.getHppsToHttp(approvalPdf));
 
 
                     //试验关联文件合并pdf
                     //试验关联文件合并pdf