2/8

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

@@ -93,20 +93,24 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         patentNos.addAll(compareFilesVO.getIsAdd());
         //获取对比文件对比表的专利号
         patentNos.removeAll(patentNoList);
+        List<String> flags =new ArrayList<>();
         for (int i = 0; i < patentNos.size(); i++) {
             CompareFiles compareFiles1 = new CompareFiles();
-            //根据专利号和报告id造对象
-            compareFiles1.setPatentNo(patentNos.get(i));
-            compareFiles1.setReportId(compareFilesVO.getReportId());
-            //区分对比文件的类型
-            if (familyPatentNos != null && quotes.size() != 0 && quotes.contains(patentNos.get(i))) {
-                compareFiles1.setRemark("引");
-            }
-            if (familyPatentNos != null && familyPatentNos.size() != 0 && familyPatentNos.contains(patentNos.get(i))) {
-                compareFiles1.setRemark("同");
+            if(!flags.contains(patentNos.get(i))){
+                //根据专利号和报告id造对象
+                compareFiles1.setPatentNo(patentNos.get(i));
+                compareFiles1.setReportId(compareFilesVO.getReportId());
+                //区分对比文件的类型
+                if (familyPatentNos != null && quotes.size() != 0 && quotes.contains(patentNos.get(i))) {
+                    compareFiles1.setRemark("引");
+                }
+                if (familyPatentNos != null && familyPatentNos.size() != 0 && familyPatentNos.contains(patentNos.get(i))) {
+                    compareFiles1.setRemark("同");
+                }
+                compareFiles.add(compareFiles1);
+                flags.add(patentNos.get(i));
             }
 
-            compareFiles.add(compareFiles1);
         }
         // 批量添加
         this.saveBatch(compareFiles);

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

@@ -346,15 +346,41 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
                 .eq(CompareFiles::getState, 0);
         List<CompareFiles> compareFiles = compareFilesService.list(wrapper);
         List<String> AllpatentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
+        List<String> patentNos1 =new ArrayList<>();
         //无查询条件
         if (patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) {
-            patentVO.setPatentNos(AllpatentNos);
+            patentNos1 =AllpatentNos;
         }
         //有查询条件时，自定义字段的专利号和任务的专利号取交集
         else {
             List<String> temPatentNos = reportFieldService.getPatentNo1(patentVO.getFiledOptions(), patentVO.getReportId(), patentVO.getTaskId(), patentVO.getTaskStatus());
-            patentVO.setPatentNos(temPatentNos);
+            patentNos1=temPatentNos;
+        }
+        //如果有任务过滤条件
+        List<String> patentNosTask = new ArrayList<>();
+        if (patentVO.getTaskSources() != null && patentVO.getTaskSources().size() != 0) {
+            patentNosTask = assoTaskPersonelService.getBaseMapper().getPatents(patentVO.getTaskSources());
+        }
+        List<String> allPatentsCopy = new ArrayList<>();
+        if (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0) {
+            for(Integer types :patentVO.getNotAssignTypes())
+            {
+                List<String>  PatentsCopy = new ArrayList<>(AllpatentNos);
+                LambdaQueryWrapper<AssoTaskPersonel> assoWrapper = new LambdaQueryWrapper<>();
+                assoWrapper.eq(AssoTaskPersonel::getReportId, patentVO.getReportId())
+                        .eq(AssoTaskPersonel::getTaskType, types);
+                List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(assoWrapper);
+                List<String> tem = assoTaskPersonels.stream().map(AssoTaskPersonel::getPatentNo).collect(Collectors.toList());
+                PatentsCopy.removeAll(tem);
+                allPatentsCopy.addAll(PatentsCopy);
+            }
+
+        }
+        if ((patentVO.getTaskSources() != null && patentVO.getTaskSources().size() != 0) || (patentVO.getNotAssignTypes() != null && patentVO.getNotAssignTypes().size() != 0)) {
+            patentNosTask.addAll(allPatentsCopy);
+            patentNos1 = new ArrayList<>(CollectionUtils.intersection(patentNosTask, patentNos1));
         }
+        patentVO.setPatentNos(patentNos1);
         String res = outInterfaceService.getConPantentNos(patentVO, 1);
         JSONObject jsonObject1 = JSONObject.parseObject(res);
         List<String> patentNos = JSONArray.parseArray(jsonObject1.get("data").toString(), String.class);