Merge remote-tracking branch 'origin/dev2' into dev2

RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -8,9 +8,11 @@ import cn.cslg.report.common.model.vo.ReportVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.StringUtils;
 import cn.cslg.report.common.utils.auth.checkAuth;
+import cn.cslg.report.entity.Report;
 import cn.cslg.report.entity.ReportReferences;
 import cn.cslg.report.service.business.*;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -158,4 +160,12 @@ public class ReportController {
         }
         return Response.success(reportDeDTO);
     }
+
+    @Operation(summary = "根据报告ids获得报告详情")
+    @PostMapping(value = "/getReportsByIds")
+    public String getReportsByIds(@RequestBody List<Integer> reportIds) {
+        List<Report> reports = reportService.getReportsByReportIds(reportIds);
+        return Response.success(reports);
+    }
+
 }

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

@@ -71,6 +71,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final InvalidReReportService invalidReReportService;
     private final InvalidReasonFieldService invalidReasonFieldService;
     private final InvalidReasonService invalidReasonService;
+
     private Report loadReport(ReportDTO reportDto) {
         Report report = new Report();
         //装载基本信息
@@ -132,7 +133,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     @Transactional(rollbackFor = Exception.class)
     public Integer addReport(ReportDTO reportDto, List<MultipartFile> files) throws IOException {
         //侵权/回避报告，若状态不是审核/完成，则直接将报告状态置为2(处理中)
-        if (reportDto.getType().equals(4) || reportDto.getType().equals(5)||reportDto.getType().equals(7)) {
+        if (reportDto.getType().equals(4) || reportDto.getType().equals(5) || reportDto.getType().equals(7)) {
             if (reportDto.getStatus() != null && reportDto.getStatus() != 0 && reportDto.getStatus() != 3) {
                 reportDto.setStatus(2);
             }
@@ -185,10 +186,9 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 }
             }
         } else {
-            if(report.getType()!=7) {
+            if (report.getType() != 7) {
                 reportFieldService.addDefaultField(report.getId(), report.getType());
-            }
-            else {
+            } else {
                 invalidReasonFieldService.addDefault(report.getId());
 
             }
@@ -762,4 +762,10 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         }
         return reportDeVO;
     }
+
+    public List<Report> getReportsByReportIds(List<Integer> reportIds) {
+        List<Report> reports = this.list(new LambdaQueryWrapper<Report>().in(Report::getId, reportIds));
+        return reports;
+    }
+
 }