fixed

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

@@ -36,11 +36,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -226,9 +226,17 @@ public class CompareLiteratureService extends ServiceImpl<CompareLiteratureMappe
                     .in(NoveltyCompareLiterature::getCompareLitertureId, literatureIds));
             for (CompareLiteratureVO literatureVO : compareLiteratureVOS) {
                 NoveltyCompareLiterature noveltyCompareLiterature = noveltyCompareLiteratureList.stream().filter(i -> literatureVO.getId().equals(i.getCompareLitertureId())).findFirst().orElse(new NoveltyCompareLiterature());
-                BeanUtils.copyProperties(noveltyCompareLiterature, literatureVO);
-                literatureVO.setCompareFileId(noveltyCompareLiterature.getId());
-                literatureVO.setFileRemark(noveltyCompareLiterature.getRemark());
+                if (!ObjectUtils.isEmpty(noveltyCompareLiterature)) {
+                    literatureVO.setCompareFileId(noveltyCompareLiterature.getId());
+                    literatureVO.setRetrieveRecordId(noveltyCompareLiterature.getRetrieveRecordId());
+                    literatureVO.setRelevance(noveltyCompareLiterature.getRelevance());
+                    literatureVO.setIfEffectinv(noveltyCompareLiterature.getIfEffectinv());
+                    literatureVO.setFileRemark(noveltyCompareLiterature.getRemark());
+                    literatureVO.setGeneralRemark(noveltyCompareLiterature.getGeneralRemark());
+                    literatureVO.setTechnicalPoints(noveltyCompareLiterature.getTechnicalPoints());
+                    literatureVO.setExcuteCase(noveltyCompareLiterature.getExcuteCase());
+                    literatureVO.setBeneficialEffect(noveltyCompareLiterature.getBeneficialEffect());
+                }
                 if (CollectionUtils.isEmpty(recordVOS)) {
                     NoveltyCompareRecordVO recordVO = recordVOS.stream().filter(i -> i.getPatentNo().equals(literatureVO.getLiteratureNo())).findFirst().orElse(new NoveltyCompareRecordVO());
                     literatureVO.setNoveltyCompareRecordVO(recordVO);

src/test/java/cn/cslg/pas/service/NoveltyProjectTest.java

@@ -1,13 +1,18 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.dto.*;
+import cn.cslg.pas.common.dto.business.LiteratureQueryDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.vo.CompareLiteratureVO;
 import cn.cslg.pas.common.vo.QueryCompareFileVO;
 import cn.cslg.pas.common.vo.QueryInventionPointVO;
 import cn.cslg.pas.common.vo.TechnicalCaseVO;
+import cn.cslg.pas.service.business.CompareLiteratureService;
 import cn.cslg.pas.service.business.NoveltyProjectService;
 import cn.cslg.pas.service.business.TechnicalCaseService;
 import cn.cslg.pas.service.novelty.NoveltyCompareLiteratureService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +36,9 @@ public class NoveltyProjectTest {
     @Autowired
     private NoveltyCompareLiteratureService noveltyCompareLiteratureService;
 
+    @Autowired
+    private CompareLiteratureService compareLiteratureService;
+
     @Test
     public void addNoveltyProject() {
         AddNoveltyProjectDTO projectDTO = new AddNoveltyProjectDTO();
@@ -180,4 +188,15 @@ public class NoveltyProjectTest {
         vo.setCompareLitertureId(237);
         noveltyCompareLiteratureService.delCompareFile(vo);
     }
+
+    @Test
+    public void queryCompareLiterature() throws Exception {
+        LiteratureQueryDTO vo = new LiteratureQueryDTO();
+        vo.setCurrent(1);
+        vo.setSize(10);
+        vo.setProjectId(271);
+        Records records = compareLiteratureService.queryCompareLiterature(vo);
+        String s = records.getData().toString();
+        System.out.println(s);
+    }
 }