报告增删改查添加案件梳理栏位

RMS/src/main/java/cn/cslg/report/common/model/dto/ReportDTO.java

@@ -191,6 +191,9 @@ public class ReportDTO {
      * 后续事项
      */
     private List<FollowUpDTO> followUps;
+    /**
+     * 是否添加追踪报告
+     */
     private Boolean track;
 
     //以下是无效应对报告使用的字段 ↓
@@ -214,5 +217,9 @@ public class ReportDTO {
      * 无效宣告请求人
      */
     private String invalidApplication;
+    /**
+     * 案件梳理意见
+     */
+    private String suggestion;
 
 }

RMS/src/main/java/cn/cslg/report/common/model/vo/ReportDeVO.java

@@ -203,4 +203,9 @@ public class ReportDeVO {
      * 无效宣告请求人
      */
     private String invalidApplication;
+    /**
+     * 案件梳理意见
+     */
+    private String suggestion;
+
 }

RMS/src/main/java/cn/cslg/report/entity/invalidReReport/InvalidReReport.java

@@ -47,6 +47,11 @@ public class InvalidReReport extends BaseEntity<InvalidReReport> {
     @TableField("INVALID_APPLICATION")
     private String invalidApplication;
     /**
+     * 案件梳理意见
+     */
+    @TableField("SUGGESTION")
+    private String suggestion;
+    /**
      * 创建人
      */
     @TableField("CREATE_ID")

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

@@ -193,12 +193,27 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                     copyService.CopyPatentLabels(oldFields, fields);
                 }
             }
+            if (report.getType() == 7) {
+                invalidReasonFieldService.addDefault(report.getId());
+                // 当是无效应对报告时，在无效应对报告里插入信息
+                InvalidReReport invalidReReport = new InvalidReReport();
+                invalidReReport.setReportId(report.getId());
+                invalidReReport.setCreateId(loginUtils.getId());
+                invalidReReport.setInvalidApplication(reportDto.getInvalidApplication());
+                invalidReReport.setCaseNumber(reportDto.getCaseNumber());
+                invalidReReport.setIssueNumber(reportDto.getIssueNumber());
+                invalidReReport.setInventionName(reportDto.getInventionName());
+                invalidReReport.setCurrentApplication(reportDto.getCurrentApplication());
+                invalidReReport.setInvalidApplication(reportDto.getInvalidApplication());
+                invalidReReport.setSuggestion(reportDto.getSuggestion());
+                invalidReReport.insert();
+            }
         } else {
             if (report.getType() != 7) {
                 reportFieldService.addDefaultField(report.getId(), report.getType());
             } else {
                 invalidReasonFieldService.addDefault(report.getId());
-// 当是无效应对报告时，在无效应对报告里插入信息
+                // 当是无效应对报告时，在无效应对报告里插入信息
                 InvalidReReport invalidReReport = new InvalidReReport();
                 invalidReReport.setReportId(report.getId());
                 invalidReReport.setCreateId(loginUtils.getId());
@@ -208,6 +223,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 invalidReReport.setInventionName(reportDto.getInventionName());
                 invalidReReport.setCurrentApplication(reportDto.getCurrentApplication());
                 invalidReReport.setInvalidApplication(reportDto.getInvalidApplication());
+                invalidReReport.setSuggestion(reportDto.getSuggestion());
                 invalidReReport.insert();
             }
         }
@@ -486,6 +502,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 invalidReReport.setInventionName(reportDto.getInventionName());
                 invalidReReport.setCurrentApplication(reportDto.getCurrentApplication());
                 invalidReReport.setInvalidApplication(reportDto.getInvalidApplication());
+                invalidReReport.setSuggestion(reportDto.getSuggestion());
                 invalidReReport.updateById();
 
             }