文件处理

This commit is contained in:
zhn
2023-09-06 10:34:34 +08:00
parent f83c03c2da
commit 7d9315967c
@@ -11,6 +11,8 @@ import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.BussDocumentLibraryEO;
import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.entity.ProblemManagementEO; import com.jero.modules.project.entity.ProblemManagementEO;
import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO; import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
@@ -85,6 +87,8 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
private ProblemManagementEOMapper problemManagementEOMapper; private ProblemManagementEOMapper problemManagementEOMapper;
@Autowired @Autowired
private IBussDocumentLibraryEOService bussDocumentLibraryEOService; private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
@Autowired
private IOSSFileService iOSSFileService;
@Override @Override
public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) { public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
@@ -370,9 +374,30 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
}else{ }else{
managementEOList = problemManagementEOService.list(); managementEOList = problemManagementEOService.list();
} }
//法规
List<String> lawsIdList = managementEOList.stream() List<String> lawsIdList = managementEOList.stream()
.filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList()); .filter(e->StringUtils.isNotBlank(e.getLawsId())).map(ProblemManagementEO::getLawsId).collect(Collectors.toList());
List<String> projectIdList = managementEOList.stream().filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList()); //项目
List<String> projectIdList = managementEOList.stream()
.filter(e->StringUtils.isNotBlank(e.getProjectId())).map(ProblemManagementEO::getProjectId).collect(Collectors.toList());
//相关文件
List<String> fileList = managementEOList.stream()
.filter(e -> StringUtils.isNotBlank(e.getFile())).map(ProblemManagementEO::getFile).collect(Collectors.toList());
//审批证据
List<String> approvalEvidenceList = managementEOList.stream()
.filter(e -> StringUtils.isNotBlank(e.getApprovalEvidence())).map(ProblemManagementEO::getApprovalEvidence).collect(Collectors.toList());
List<String> connectList = new ArrayList<>();
if(!fileList.isEmpty()){
connectList.addAll(fileList);
}
if(!approvalEvidenceList.isEmpty()){
connectList.addAll(approvalEvidenceList);
}
List<OSSFile> fileInfoList = new ArrayList<>();
if(!connectList.isEmpty()){
fileInfoList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(connectList,","));
}
List<BussDocumentLibraryEO> documentLibraryEOList = new ArrayList<>(); List<BussDocumentLibraryEO> documentLibraryEOList = new ArrayList<>();
if(!lawsIdList.isEmpty()){ if(!lawsIdList.isEmpty()){
Set<String> lawIdSet = new HashSet<>(); Set<String> lawIdSet = new HashSet<>();
@@ -472,7 +497,18 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
} }
problemManagementEO.setProgressTrackingList(list); problemManagementEO.setProgressTrackingList(list);
} }
//相关文件
if(StringUtils.isNotBlank(problemManagementEO.getFile())){
List<OSSFile> collect = fileInfoList.stream()
.filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList());
problemManagementEO.setFileList(collect);
}
//审批证据
if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){
List<OSSFile> collect = fileInfoList.stream()
.filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList());
problemManagementEO.setApprovalEvidenceFileList(collect);
}
NcrTrackVO ncrTrackVOTemp = new NcrTrackVO(); NcrTrackVO ncrTrackVOTemp = new NcrTrackVO();
BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp); BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp);
ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId()); ncrTrackVOTemp.setUuid(ncrTrackVOTemp.getId());