质检任务审批-查看节点附件

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

@@ -70,6 +70,8 @@ public class TaskApprovalVO {
             this.fileUrl = fileUrl;
         }
 
+        public ApprovalFile() {
+        }
     }
 
     /**

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

@@ -41,10 +41,7 @@ import org.springblade.flow.core.feign.NewFlowClient;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.utils.TaskUtil;
 import org.springblade.flow.core.vo.FlowProcessVO;
-import org.springblade.manager.entity.ContractInfo;
-import org.springblade.manager.entity.ProjectInfo;
-import org.springblade.manager.entity.TabBusstimeInfo;
-import org.springblade.manager.entity.WbsTreeContract;
+import org.springblade.manager.entity.*;
 import org.springblade.manager.feign.*;
 import org.springblade.manager.vo.AppWbsTreeContractVO;
 import org.springblade.resource.feign.CommonFileClient;
@@ -279,6 +276,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         }
                         vo.setApprovalFileList(query.getName() + "（关联试验工程部位信息文件）", StringUtils.isNotEmpty(query.getPdfTrialUrlPosition()) ? query.getPdfTrialUrlPosition() : null);
                     }
+
+                    /** 任务审批查看时，把节点附件列表跟在上报文件后面*/
+                    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),query.getWbsId());
+                    if (ObjectUtil.isNotEmpty(files)){
+                        List<TaskApprovalVO.ApprovalFile> fileList = vo.getApprovalFileList();
+                        fileList.addAll(files);
+
+                    }
                 }
             } else if (new Integer("2").equals(query.getType())) {
                 //试验