fixed

src/main/java/cn/cslg/pas/common/vo/CompareLiteratureVO.java

@@ -77,4 +77,45 @@ public class CompareLiteratureVO  {
     private Date createTime;
     private SystemFile systemFile;
     private String authorName;
+
+    //查新报告信息
+    private Integer compareFileId;
+    /**
+     * 对比记录id
+     */
+    private Integer retrieveRecordId;
+    /**
+     * 相关度
+     */
+    private String relevance;
+
+    /**
+     * 影响新创新
+     */
+    private Integer ifEffectinv;
+
+    /**
+     *  备注
+     */
+    private String fileRemark;
+
+    /**
+     * 总说明
+     */
+    private String generalRemark;
+
+    /**
+     * 现有技术要点
+     */
+    private String technicalPoints;
+
+    /**
+     * 实施方案
+     */
+    private String excuteCase;
+
+    /**
+     * 有益效果
+     */
+    private String beneficialEffect;
 }

src/main/java/cn/cslg/pas/controller/NoveltyProjectController.java

@@ -158,7 +158,7 @@ public class NoveltyProjectController {
         return Response.success(compareFileId);
     }
 
-    @Operation(summary = "查询查新报告对比专利")
+    @Operation(summary = "查询查新报告对比专利详情")
     @PostMapping("/queryCompareFile")
     public Response queryCompareFile(@RequestBody QueryCompareFileDTO fileDTO) throws Exception {
         List<QueryCompareFileVO> queryCompareFileVOS = new ArrayList<>();

src/main/java/cn/cslg/pas/service/business/CompareLiteratureService.java

@@ -15,10 +15,12 @@ import cn.cslg.pas.common.vo.WebSocketMessageVO;
 import cn.cslg.pas.domain.business.CompareLiterature;
 import cn.cslg.pas.common.dto.CompareLiteratureDTO;
 import cn.cslg.pas.domain.business.ReportProject;
+import cn.cslg.pas.domain.business.novelty.NoveltyCompareLiterature;
 import cn.cslg.pas.domain.es.Patent;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.CompareLiteratureMapper;
+import cn.cslg.pas.mapper.novelty.NoveltyCompareLiteratureMapper;
 import cn.cslg.pas.service.business.es.EsPatentService;
 import cn.cslg.pas.service.business.es.EsService;
 import cn.cslg.pas.service.common.FileManagerService;
@@ -76,6 +78,8 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
     private MessageService messageService;
     @Autowired
     private CompareLiteratureMapper compareLiteratureMapper;
+    @Autowired
+    private NoveltyCompareLiteratureMapper noveltyCompareLiteratureMapper;
 
     //添加专利对比文献
     public Integer addPatentCompareLiterature(Patent patent, Integer projectId, String createId) {
@@ -201,12 +205,29 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
 
         compareLiteratureVOS = this.loadCompareLiterature(compareLiteratures, reportProject);
         //装载不同的类型的对比文献
+        this.loadCompareLiteratureVOS(compareLiteratureVOS);
 
         records.setData(compareLiteratureVOS);
 
         return records;
     }
 
+    public void loadCompareLiteratureVOS(List<CompareLiteratureVO> compareLiteratureVOS) {
+        if (!CollectionUtils.isEmpty(compareLiteratureVOS)) {
+            List<Integer> literatureIds = new ArrayList<>();
+            compareLiteratureVOS.forEach(item -> {
+                literatureIds.add(item.getId());
+            });
+            List<NoveltyCompareLiterature> noveltyCompareLiteratureList = noveltyCompareLiteratureMapper.selectList(new LambdaQueryWrapper<NoveltyCompareLiterature>()
+                    .in(NoveltyCompareLiterature::getCompareLitertureId, literatureIds));
+            for (CompareLiteratureVO literatureVO : compareLiteratureVOS) {
+                NoveltyCompareLiterature noveltyCompareLiterature = noveltyCompareLiteratureList.stream().filter(i -> literatureVO.getId().equals(i.getCompareLitertureId())).findFirst().orElse(null);
+                BeanUtils.copyProperties(noveltyCompareLiterature, literatureVO);
+                literatureVO.setCompareFileId(noveltyCompareLiterature.getId());
+                literatureVO.setFileRemark(noveltyCompareLiterature.getRemark());
+            }
+        }
+    }
 
     public List<CompareLiteratureVO> loadCompareLiterature(List<CompareLiterature> compareLiteratures, ReportProject reportProject) {
         String signPatentNo = reportProject.getSignPatentNo();