1.13 陈宇

RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java

@@ -441,9 +441,9 @@ List<Integer> Ids =features.stream().map(Features::getId).collect(Collectors.toL
     /**
      * funtion:删除报告时删除
      */
-    public String deleteByFeatureId(List<Integer> list){
+    public String deleteByreportID(Integer repotID){
         LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.in(CompareMessage ::getFeatureId,list);
+        queryWrapper.eq(CompareMessage::getReportId,repotID);
         remove(queryWrapper);
         return Response.success();
 

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -532,9 +532,6 @@ List<Map<String,Object>> mapList =new ArrayList<Map<String,Object>>();
     public Integer delByReportId(int reportId) {
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Features::getReportId, reportId);
-        List<Features> features = this.list(queryWrapper);
-        List<Integer> collect = features.stream().map(Features::getId).collect(Collectors.toList());
-        compareMessageService.deleteByFeatureId(collect);
         this.remove(queryWrapper);
         return 1;
     }

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -291,6 +291,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         reportDocumentService.deleteByReportId(id);
         //删除报告参考资料
         reportReferencesService.deleteByReportId(id);
+       //删除对比信息
+        compareMessageService.deleteByreportID(id);