无效理由和证据返回权要内容

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

@@ -29,6 +29,11 @@ public class QueryInvalidReasonVO {
     private Integer content;
 
     /**
+     * 权要内容
+     */
+    private String rightContent;
+
+    /**
      * 陈述意见
      */
     private String argumentStr;

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java

@@ -9,13 +9,17 @@ import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.CompareFiles;
 import cn.cslg.report.entity.Features;
+import cn.cslg.report.entity.PatentRight;
 import cn.cslg.report.entity.Report;
 import cn.cslg.report.entity.invalidReReport.*;
 import cn.cslg.report.mapper.FeatureMapper;
 import cn.cslg.report.mapper.InvalidReReport.InvalidReasonMapper;
+import cn.cslg.report.service.OutInterfaceService;
 import cn.cslg.report.service.business.CompareFilesService;
 import cn.cslg.report.service.business.FeatureService;
 import cn.cslg.report.service.business.ReportService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,6 +54,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
     private final CompareFilesService compareFilesService;
     private final InvalidReasonFieldValueService invalidReasonFieldValueService;
     private final AssoProofGroupStrService assoProofGroupStrService;
+    private final OutInterfaceService outInterfaceService;
     /**
      * 判断特征是否有重复的方法
      *
@@ -401,7 +406,15 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public List<QueryInvalidReasonVO> queryInvalidReason(Integer reportId) {
+    public List<QueryInvalidReasonVO> queryInvalidReason(Integer reportId) throws IOException {
+       Report report = reportService.getById(reportId);
+       String patentNo =report.getSignPatentNo();
+        String resBody = outInterfaceService.getPatentRightFromPAS(patentNo);
+        JSONObject jsonObject = JSONObject.parseObject(resBody);
+        //解析jason获得标的专利的权要
+        List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
+        //给权要进行格式更改
+        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin, patentNo);
         List<QueryInvalidReasonVO> queryInvalidReasonVOS = new ArrayList<>();
         //根据报告id查询无效理由
         List<InvalidReason> invalidReasons = new ArrayList<>();
@@ -413,6 +426,10 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
         for (InvalidReason invalidReason : invalidReasons) {
             QueryInvalidReasonVO queryInvalidReasonVO = new QueryInvalidReasonVO();
             BeanUtils.copyProperties(invalidReason, queryInvalidReasonVO);
+       PatentRight patentRight =  patentRights.stream().filter(item->item.getSort().equals(invalidReason.getContent())).findFirst().orElse(null);
+            if(patentRight!=null){
+                queryInvalidReasonVO.setRightContent(patentRight.getContent());
+            }
             queryInvalidReasonVOS.add(queryInvalidReasonVO);
         }
         if (queryInvalidReasonVOS.size() > 0) {