zero před 11 měsíci
rodič
revize
be80e4d110

+ 13 - 0
src/main/java/cn/cslg/pas/common/dto/DelSearchRecordDTO.java

@@ -0,0 +1,13 @@
+package cn.cslg.pas.common.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DelSearchRecordDTO {
+
+    private Integer projectId;
+
+    private List<Integer> retrieveIds;
+}

+ 2 - 2
src/main/java/cn/cslg/pas/controller/NoveltyProjectController.java

@@ -249,8 +249,8 @@ public class NoveltyProjectController {
 
     @Operation(summary = "删除检索记录")
     @PostMapping("/deleteSearchRecord")
-    public Response deleteSearchRecord(@RequestBody List<Integer> retrieveIds){
-        List<Integer> ids = noveltySearchRecordService.deleteSearchRecord(retrieveIds);
+    public Response deleteSearchRecord(@RequestBody DelSearchRecordDTO vo){
+        List<Integer> ids = noveltySearchRecordService.deleteSearchRecord(vo);
         Records records = new Records();
         records.setData(ids);
         return Response.success(records);

+ 0 - 5
src/main/java/cn/cslg/pas/service/novelty/NoveltyCompareLiteratureService.java

@@ -232,11 +232,6 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
                 .eq(NoveltyCompareLiterature::getCompareLitertureId, vo.getCompareLitertureId()));
         if (ObjectUtils.isNotEmpty(noveltyCompareLiterature)) {
             //TODO  缺少对比记录方法,判断是否有对比记录,有的话则提示
-            Integer recordId = noveltyCompareLiterature.getRetrieveRecordId();
-            if (recordId != null) {
-                retrieveRecordMapper.deleteById(recordId);
-            }
-
             noveltyCompareLiteratureMapper.deleteById(noveltyCompareLiterature.getId());
         }
 

+ 4 - 1
src/main/java/cn/cslg/pas/service/novelty/NoveltySearchRecordService.java

@@ -234,11 +234,14 @@ public class NoveltySearchRecordService extends ServiceImpl<RetrieveRecordMapper
      *
      * @return
      */
-    public List<Integer> deleteSearchRecord(List<Integer> retrieveIds) {
+    public List<Integer> deleteSearchRecord(DelSearchRecordDTO vo) {
+        List<Integer> retrieveIds = vo.getRetrieveIds();
+        Integer projectId = vo.getProjectId();
         if (!retrieveIds.isEmpty()) {
             //删除关联关系
             LambdaQueryWrapper<AssoRetrieveRecordProject> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.in(AssoRetrieveRecordProject::getRetrieveRecordId, retrieveIds);
+            queryWrapper.eq(projectId != null, AssoRetrieveRecordProject::getProjectId, projectId);
             assoRetrieveRecordProjectService.remove(queryWrapper);
             }
         return retrieveIds;