|
@@ -15,6 +15,7 @@ import cn.cslg.wdc.entity.Discrepancy;
|
|
|
import cn.cslg.wdc.entity.DiscrepancyDetail;
|
|
|
import cn.cslg.wdc.entity.common.PatentData;
|
|
|
import cn.cslg.wdc.entity.common.Records;
|
|
|
+import cn.cslg.wdc.entity.common.SystemFile;
|
|
|
import cn.cslg.wdc.mapper.AssoCaseFileMapper;
|
|
|
import cn.cslg.wdc.mapper.CaseFileMapper;
|
|
|
import cn.cslg.wdc.mapper.DiscrepancyDetailMapper;
|
|
@@ -1102,7 +1103,7 @@ public class CaseFileService extends ServiceImpl<CaseFileMapper, CaseFile> {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public String selectCaseInfoList(SelectCaseInfoDTO vo) {
|
|
|
+ public String selectCaseInfoList(SelectCaseInfoDTO vo) throws Exception {
|
|
|
List<SelectCaseInfoVO> caseInfoVOS = caseFileMapper.selectCaseInfoList(vo);
|
|
|
if (!CollectionUtils.isEmpty(caseInfoVOS)) {
|
|
|
for (SelectCaseInfoVO caseInfoVO : caseInfoVOS) {
|
|
@@ -1110,16 +1111,28 @@ public class CaseFileService extends ServiceImpl<CaseFileMapper, CaseFile> {
|
|
|
List<AssoCaseFile> caseFiles = assoCaseFileMapper.selectList(new LambdaQueryWrapper<AssoCaseFile>()
|
|
|
.eq(AssoCaseFile::getCaseId, caseId));
|
|
|
if (!CollectionUtils.isEmpty(caseFiles)) {
|
|
|
+ List<String> list = caseFiles.stream().map(AssoCaseFile::getFileGuid).collect(Collectors.toList());
|
|
|
+ List<SystemFile> systemFiles = new ArrayList<>();
|
|
|
+ if (!CollectionUtils.isEmpty(list)) {
|
|
|
+ String res = fileManagerService.getSystemFileFromFMS(list);
|
|
|
+ if (StringUtils.isNotEmpty(res)) {
|
|
|
+ systemFiles = JSON.parseArray(res, SystemFile.class);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
List<SelectAssoCaseFileVO> fileVOS = new ArrayList<>();
|
|
|
- caseFiles.forEach(i -> {
|
|
|
+ for (AssoCaseFile caseFile : caseFiles) {
|
|
|
SelectAssoCaseFileVO fileVO = new SelectAssoCaseFileVO();
|
|
|
- fileVO.setAssoCaseFileId(i.getId());
|
|
|
- fileVO.setCaseId(i.getCaseId());
|
|
|
- fileVO.setFileType(i.getFileType());
|
|
|
- fileVO.setFileName(i.getFileName());
|
|
|
- fileVO.setFileGuid(i.getFileGuid());
|
|
|
+ fileVO.setAssoCaseFileId(caseFile.getId());
|
|
|
+ fileVO.setCaseId(caseFile.getCaseId());
|
|
|
+ fileVO.setFileType(caseFile.getFileType());
|
|
|
+ fileVO.setFileName(caseFile.getFileName());
|
|
|
+ fileVO.setFileGuid(caseFile.getFileGuid());
|
|
|
+ if (!CollectionUtils.isEmpty(systemFiles)) {
|
|
|
+ systemFiles.stream().filter(item -> item.getGuid().equals(caseFile.getFileGuid())).findFirst().ifPresent(fileVO::setSystemFile);
|
|
|
+ }
|
|
|
fileVOS.add(fileVO);
|
|
|
- });
|
|
|
+ }
|
|
|
caseInfoVO.setAssoCaseFileVOList(fileVOS);
|
|
|
}
|
|
|
}
|