Merge remote-tracking branch 'origin/master'

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

@@ -134,7 +134,7 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
             List<TortRightVO> tortRightVOS = this.loadTortRightVO(patentNo, taskId, patentRightVos);
             tortCompareRecordVO.setTortRightVOS(tortRightVOS);
         } else {
-            throw new XiaoShiException("特征查询错误");
+            tortCompareRecordVO = new TortCompareRecordVO();
         }
         return tortCompareRecordVO;
     }

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

@@ -140,7 +140,7 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
         }
         List<TortDTO> tortDTOS = tortCompareRecordDTO.getTortDTOS();
         //不能将特征一次性全部删除，使用处理特征方法
-        if (!tortDTOS.isEmpty()) {
+        if (tortDTOS.isEmpty()) {
             throw new XiaoShiException("传入特征集合不能为空");
         }
         //查询出原来的特征id集合
@@ -324,7 +324,7 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
             List<TortRightVO> tortRightVOS = this.loadTortRightVO(projectId, patentRightVos);
             tortCompareRecordVO.setTortRightVOS(tortRightVOS);
         } else {
-            throw new XiaoShiException("特征查询错误");
+            tortCompareRecordVO = new TortCompareRecordVO();
         }
         return tortCompareRecordVO;
     }

src/main/java/cn/cslg/pas/service/business/invalidReport/PatentClaimHistoryService.java

@@ -124,7 +124,9 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
         patentClaimHistoryVO.setOriginalClaimVO(originalClaimVO);
         //装载权要历史
         Map<Integer, QueryPatentClaimHistoryVO> historyVOMap = this.loadHistoryVO(claimId);
+        //第一次修改
         QueryPatentClaimHistoryVO firstClaimVO = historyVOMap.get(1);
+        //第二次修改
         QueryPatentClaimHistoryVO secondClaimVO = historyVOMap.get(2);
         patentClaimHistoryVO.setFirstClaimVO(firstClaimVO);
         patentClaimHistoryVO.setSecondClaimVO(secondClaimVO);
@@ -153,11 +155,12 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
         Map<Integer, QueryPatentClaimHistoryVO> historyVOMap = new HashMap<>();
 
         LambdaQueryWrapper<PatentClaimHistory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PatentClaimHistory::getClaimId, claimId);
+        queryWrapper.eq(PatentClaimHistory::getClaimId, claimId)
+                .orderByDesc(PatentClaimHistory::getCreateTime);
         List<PatentClaimHistory> patentClaimHistoryList = this.list(queryWrapper);
         if (!patentClaimHistoryList.isEmpty()) {
-            PatentClaimHistory patentClaimHistory1 = patentClaimHistoryList.stream().filter(item -> item.getIfFirst().equals(true)).findFirst().orElse(null);
-            PatentClaimHistory patentClaimHistory2 = patentClaimHistoryList.stream().filter(item -> item.getIfFirst().equals(false)).findFirst().orElse(null);
+            PatentClaimHistory patentClaimHistory1 = patentClaimHistoryList.stream().filter(item -> !item.getOperateType().equals(2) && item.getIfFirst().equals(true)).findFirst().orElse(null);
+            PatentClaimHistory patentClaimHistory2 = patentClaimHistoryList.stream().filter(item -> !item.getOperateType().equals(2) && item.getIfFirst().equals(false)).findFirst().orElse(null);
             if (patentClaimHistory1 != null) {
                 QueryPatentClaimHistoryVO firstClaimVO = new QueryPatentClaimHistoryVO();
                 firstClaimVO.setClaimHistoryId(patentClaimHistory1.getId());

src/main/resources/mapper/AvoidDesignMapper.xml

@@ -7,9 +7,9 @@
                content,
                right_sort,
                explain_text,
-               direction,
+               direction
         from feature f
-                 left join avoid_design a on f.id = a.feature_id
+        left join avoid_design a on f.id = a.feature_id
         where f.project_id = #{projectId}
         order by f.sys_order
     </select>

src/main/resources/mapper/FTOCompareRecordMapper.xml

@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.FTOCompareRecordMapper">
+
     <select id="getComparedPatents" resultType="java.lang.String">
         select distinct compare_file_number
         from fto_compare_record
-        where project_id = ${projectId}
-<if test="compareResult!=null">
-    and compare_result=${compareResult}
-</if>
-    </select>
-
-
-    <select id="getSynergyTaskId" resultType="java.lang.String">
-        select distinct project_task_id
-        from fto_compare_record
-        where asso_task_id = ${taskId}
-       and
+        where project_id = #{projectId}
+        <if test="compareResult!=null">
+            and compare_result = #{compareResult};
+        </if>
     </select>
 
 </mapper>