2/8

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

@@ -133,28 +133,9 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
                 AssoRecordsFeature assoRecordsFeature = assoRecordsFeatures.stream().filter(te->te.getFeatureId().equals(item.getId())).findFirst().orElse(new AssoRecordsFeature());
                 //筛选对比文件
                 CompareRecords compareRecords1 = compareRecords.stream().filter(tem -> tem.getId().equals(assoRecordsFeature.getRecordsId())).findFirst().orElse(new CompareRecords());
-                //根据对比记录的专利号和内容进行合并操作
-                if(assoRecordsFeatures1.size()!=0){
-                    //获得上一条的记录信息
-                    AssoRecordsFeature assoRecordsFeature2 = assoRecordsFeatures1.get(assoRecordsFeatures1.size()-1);
-                    CompareRecords compareRecords2 =assoRecordsFeature2.getCompareRecords();
-                    //进行合并
-                    if(compareRecords1.getId()!=null&&compareRecords1.getPatentNo().equals(compareRecords2.getPatentNo())
-                            &&compareRecords1.getContent().equals(compareRecords2.getContent()))
-                    {
-               assoRecordsFeature2.getFeatures().setContent(assoRecordsFeature2.getFeatures().getContent()+item.getContent());
-                    }
-                    else{
-                        assoRecordsFeature.setCompareRecords(compareRecords1);
-                        assoRecordsFeature.setFeatures(item);
-                        assoRecordsFeatures1.add(assoRecordsFeature);
-                    }
-                }
-               else {
                     assoRecordsFeature.setCompareRecords(compareRecords1);
                     assoRecordsFeature.setFeatures(item);
                     assoRecordsFeatures1.add(assoRecordsFeature);
-                }
             }
             }
             //过滤拿到特征id

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

@@ -410,6 +410,9 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             task.setSignPatentNo(signPatentNO);
             //发送邮件
             if (task.insert()) {
+                if(task.getPersonEmail()==null){
+                    task.setPersonEmail("");
+                }
                 Map<String, Object> map = new HashMap<>();
                 map.put("title", "任务通知");
                 map.put("template", "mail/eTask.html");

RMS/src/main/resources/application-prod2.0.yml

@@ -39,7 +39,7 @@ spring:
 springdoc:
   api-docs:
     enabled: false
-queueName: mail.queue
+queueName: emailProd.queue
 fileURL:  http://139.224.24.90:8011
 PASFile: http://139.224.24.90:8011
 PCSUrl: http://localhost:8871