fixed

src/main/java/cn/cslg/pas/service/business/es/EsScratchWordsService.java

@@ -514,4 +514,15 @@ public class EsScratchWordsService {
 
         return vos;
     }
+
+    public Integer delete(List<String> ids) {
+        Query query = QueryBuilders.ids(n -> n.values(ids));
+        DeleteByQueryRequest request = DeleteByQueryRequest.of(i -> i.index("patent_marking").refresh(true).query(query));
+        try {
+            client.deleteByQuery(request);
+            return 1;
+        } catch (IOException e) {
+            throw new XiaoShiException("删除失败");
+        }
+    }
 }

src/main/java/cn/cslg/pas/service/novelty/NoveltyCompareLiteratureService.java

@@ -44,10 +44,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -230,7 +227,7 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
         return literature.getId();
     }
 
-    public void delCompareFile(CompareFileIdDTO vo) {
+    public void delCompareFile(CompareFileIdDTO vo) throws Exception {
         NoveltyCompareLiterature noveltyCompareLiterature = noveltyCompareLiteratureMapper.selectOne(new QueryWrapper<NoveltyCompareLiterature>()
                 .lambda()
                 .eq(NoveltyCompareLiterature::getCompareLitertureId, vo.getCompareLitertureId()));
@@ -238,7 +235,16 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
             //TODO  缺少对比记录方法，判断是否有对比记录，有的话则提示
             noveltyCompareLiteratureMapper.deleteById(noveltyCompareLiterature.getId());
         }
-
+        //删除该对比文件的标注
+        CompareLiterature compareLiterature = compareLiteratureMapper.selectById(vo.getCompareLitertureId());
+        String literatureNo = compareLiterature.getLiteratureNo();
+        if (StringUtils.isNotEmpty(literatureNo)) {
+            List<NoveltyCompareRecordVO> markingList = esScratchWordsService.queryMarkingByNo(compareLiterature.getProjectId(), Arrays.asList(literatureNo));
+            if (!CollectionUtils.isEmpty(markingList)) {
+                List<String> list = markingList.stream().map(NoveltyCompareRecordVO::getId).collect(Collectors.toList());
+                esScratchWordsService.delete(list);
+            }
+        }
         compareLiteratureMapper.deleteById(vo.getCompareLitertureId());
     }
 

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

@@ -191,7 +191,7 @@ public class NoveltyProjectTest {
     }
 
     @Test
-    public void delCompareFile() {
+    public void delCompareFile() throws Exception {
         CompareFileIdDTO vo = new CompareFileIdDTO();
         vo.setCompareLitertureId(237);
         noveltyCompareLiteratureService.delCompareFile(vo);