2/27

src/main/java/cn/cslg/pas/common/vo/business/ReportVO.java

@@ -14,6 +14,8 @@ public class ReportVO {
      */
     private Integer projectId;
 
+    private String reportName;
+
     /**
      *标的专利号
      */

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

@@ -241,6 +241,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                     //带出报告信息
                     ReportVO reportVO = new ReportVO();
                     BeanUtils.copyProperties(item, reportVO);
+                    Integer projectId = item.getProjectId();
+                    Project reportProject = projectService.getById(projectId);
+                    reportVO.setReportName(reportProject.getName());
                     invalidRecordVO.setReportVO(reportVO);
                     finalVOS.add(invalidRecordVO);
                 } else if (type.equals(7)) {
@@ -262,6 +265,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                     //带出报告信息
                     ReportVO reportVO = new ReportVO();
                     BeanUtils.copyProperties(item, reportVO);
+                    Integer projectId = item.getProjectId();
+                    Project reportProject = projectService.getById(projectId);
+                    reportVO.setReportName(reportProject.getName());
                     invalidRecordVO.setReportVO(reportVO);
                     finalVOS.add(invalidRecordVO);
                 }