1.10 lrj

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

@@ -76,6 +76,10 @@ public class SyneryVO extends BaseVO {
     @TableField(value = "HANDLE_PERSON_ID")
     private Integer handlePersonId;
 
+    @Schema(description = "对比结果")
+    private Integer compareResult;
+    @Schema(description = "专利号")
+    private String patentNo;
 
     /**
      * 备注

RMS/src/main/java/cn/cslg/report/common/model/vo/queryVo/QueryCMVO.java

@@ -22,4 +22,6 @@ public class QueryCMVO extends BaseVO {
     private Integer reportId;
     @Schema(description = "对比结果")
     private Integer compareResult;
+    @Schema(description = "专利号")
+    private String patentNo;
 }

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

@@ -703,6 +703,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
     @Transactional(rollbackFor = Exception.class)
     public String addSyneryTask(SyneryVO syneryVO) throws ParseException, IOException {
+        //任务保存部分
         Report report =reportService.getById(syneryVO.getReportId());
         PatentVO patentVO = new PatentVO();
       List<Synery_CC> synery_ccs= syneryVO.getSyneryCCList();
@@ -725,8 +726,12 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         }
         task.setCreateID(loginUtils.getId());
         task.insert();
+
+
         QueryCMVO queryCMVO = new QueryCMVO();
         queryCMVO.setReportId(syneryVO.getReportId());
+        queryCMVO.setPatentNo(syneryVO.getPatentNo());
+        queryCMVO.setCompareResult(syneryVO.getCompareResult());
         List<String> AllpatentNos = compareMessageService.getBaseMapper().getComparedMessageAll(queryCMVO);
         //无查询条件
         if (patentVO == null || patentVO.getFiledOptions() == null || patentVO.getFiledOptions().size() == 0) {
@@ -761,7 +766,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             });
             syneryCCService.saveBatch(synery_ccs);
         }
-
+         //发送邮件部分
         String code =DataUtils.generateShortUuid();
         SyneryCode syneryCode =new SyneryCode();
         syneryCode.setCode(code);

RMS/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: test
   jackson:
     default-property-inclusion: non_null
     serialization:

RMS/src/main/resources/mapper/CompareMessageMapper.xml

@@ -24,9 +24,11 @@
         <where>
             and f.REPORT_ID=#{params.reportId}
             and cm.ID is not null
+            <if test="params.patentNo !=null">
+                and f.SIGN_PATENT_NO=#{params.patentNo}
+            </if>
             <if test="params.compareResult !=null">
                 and   cm.COMPARE_RESULT=#{params.compareResult}
-
             </if>
         </where>