|
@@ -401,8 +401,8 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
|
|
LambdaQueryWrapper<AssoHandleResultFile> queryWrapper4 = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<AssoHandleResultFile> queryWrapper4 = new LambdaQueryWrapper<>();
|
|
queryWrapper4.in(AssoHandleResultFile::getTaskHandleResultId, resultIds);
|
|
queryWrapper4.in(AssoHandleResultFile::getTaskHandleResultId, resultIds);
|
|
List<AssoHandleResultFile> assoHandleResultFiles = assoHandleResultFileService.list(queryWrapper4);
|
|
List<AssoHandleResultFile> assoHandleResultFiles = assoHandleResultFileService.list(queryWrapper4);
|
|
-
|
|
|
|
for (TaskHandleResult taskHandleResult : taskHandleResults) {
|
|
for (TaskHandleResult taskHandleResult : taskHandleResults) {
|
|
|
|
+ ProjectTask projectTask = projectTasks.stream().filter(item -> item.getId().equals(taskHandleResult.getTaskId())).findFirst().orElse(null);
|
|
Integer resultId = taskHandleResult.getId();
|
|
Integer resultId = taskHandleResult.getId();
|
|
List<AssoHandleResultFile> assoHandleResultFiletemps = assoHandleResultFiles.stream().filter(item -> item.getTaskHandleResultId().equals(resultId)).collect(Collectors.toList());
|
|
List<AssoHandleResultFile> assoHandleResultFiletemps = assoHandleResultFiles.stream().filter(item -> item.getTaskHandleResultId().equals(resultId)).collect(Collectors.toList());
|
|
assoHandleResultFiletemps.forEach(item -> {
|
|
assoHandleResultFiletemps.forEach(item -> {
|
|
@@ -411,7 +411,9 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
|
|
patentDigProjectFilesVO.setProjectId(projectId);
|
|
patentDigProjectFilesVO.setProjectId(projectId);
|
|
patentDigProjectFilesVO.setFileGuid(item.getFileGuid());
|
|
patentDigProjectFilesVO.setFileGuid(item.getFileGuid());
|
|
patentDigProjectFilesVO.setCreateId(item.getCreateId());
|
|
patentDigProjectFilesVO.setCreateId(item.getCreateId());
|
|
- patentDigProjectFilesVO.setProcessId(processId);
|
|
|
|
|
|
+ if (projectTask != null) {
|
|
|
|
+ patentDigProjectFilesVO.setProcessId(projectTask.getProcessId());
|
|
|
|
+ }
|
|
patentDigProjectFilesVO.setCreateTime(item.getCreateTime());
|
|
patentDigProjectFilesVO.setCreateTime(item.getCreateTime());
|
|
patentDigProjectFilesVO.setSource(2);
|
|
patentDigProjectFilesVO.setSource(2);
|
|
patentDigProjectFilesVOS.add(patentDigProjectFilesVO);
|
|
patentDigProjectFilesVOS.add(patentDigProjectFilesVO);
|