|
@@ -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);
|
|
}
|
|
}
|
|
|
|
|