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

src/main/java/cn/cslg/pas/mapper/novelty/NoveltyCompareLiteratureMapper.java

@@ -21,7 +21,7 @@ public interface NoveltyCompareLiteratureMapper extends BaseMapper<NoveltyCompar
 
     List<QueryCompareFileVO> queryCompareFile(@Param("vo") QueryCompareFileDTO vo);
 
-    List<NoveltyCompareLiteratureVO> getPatentNoByRetrieveId(Integer RetrieveId);
+    List<NoveltyCompareLiteratureVO> getPatentNoByRetrieveId(Integer RetrieveId, Integer projectId);
 }
 
 

src/main/java/cn/cslg/pas/service/novelty/NoveltyCompareLiteratureService.java

@@ -392,10 +392,10 @@ public class NoveltyCompareLiteratureService extends ServiceImpl<NoveltyCompareL
      * @param retrieveIds
      * @return
      */
-    public Map<Integer, List<NoveltyCompareLiteratureVO>> getPatentNoByRetrieveIds(List<Integer> retrieveIds) {
+    public Map<Integer, List<NoveltyCompareLiteratureVO>> getPatentNoByRetrieveIds(List<Integer> retrieveIds, Integer projectId) {
         Map<Integer, List<NoveltyCompareLiteratureVO>> noveltyMap = new HashMap<>();
         for (Integer retrieveId : retrieveIds) {
-            List<NoveltyCompareLiteratureVO> noveltyCompareLiteratureVOS = noveltyCompareLiteratureMapper.getPatentNoByRetrieveId(retrieveId);
+            List<NoveltyCompareLiteratureVO> noveltyCompareLiteratureVOS = noveltyCompareLiteratureMapper.getPatentNoByRetrieveId(retrieveId, projectId);
             if (noveltyCompareLiteratureVOS != null && noveltyCompareLiteratureVOS.size() != 0) {
                 noveltyMap.put(retrieveId, noveltyCompareLiteratureVOS);
             }

src/main/java/cn/cslg/pas/service/novelty/NoveltySearchRecordService.java

@@ -84,7 +84,7 @@ public class NoveltySearchRecordService extends ServiceImpl<RetrieveRecordMapper
                         .collect(Collectors.toList());
 
                 //根据检索记录ids查询专利信息集合
-                Map<Integer, List<NoveltyCompareLiteratureVO>> noveltyMap = noveltyCompareLiteratureService.getPatentNoByRetrieveIds(retrieveIds);
+                Map<Integer, List<NoveltyCompareLiteratureVO>> noveltyMap = noveltyCompareLiteratureService.getPatentNoByRetrieveIds(retrieveIds, projectId);
 
                 QueryWrapper<RetrieveRecord> queryWrapper = new QueryWrapper<>();
                 queryWrapper.lambda().in(RetrieveRecord::getId, retrieveIds);

src/main/resources/mapper/NoveltyCompareLiteratureMapper.xml

@@ -60,6 +60,10 @@
             <if test="retrieveId != null">
                 A.retrieve_record_id = #{retrieveId}
             </if>
+            AND
+            <if test="projectId != null">
+                B.project_id = #{projectId}
+            </if>
         </where>
     </select>