修改导入功能申请人部分 3/21

PAS/src/main/java/cn/cslg/pas/service/PatentSimpleFamilyService.java

@@ -91,7 +91,6 @@ public class PatentSimpleFamilyService extends ServiceImpl<PatentSimpleFamilyMap
     }
 
     public void updateData(List<String> familyNo, String patentNo, Integer patentId, Integer type) {
-        long start =System.currentTimeMillis();
         //0.合并专利号
         if (!familyNo.contains(patentNo)) {
             familyNo.add(patentNo);
@@ -172,8 +171,6 @@ public class PatentSimpleFamilyService extends ServiceImpl<PatentSimpleFamilyMap
 
             }
         }
-        long end =System.currentTimeMillis();
-        System.out.println("总共用时---"+(start-end));
     }
 
 }

PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -352,6 +352,7 @@ public class UploadPatentBatchService {
      */
     private void getOneOrInsertOne(UploadParamsVO uploadParamsVO) {
         if (uploadParamsVO.getPatent() != null) {
+            uploadParamsVO.getPatent().setPatentNo(uploadParamsVO.getPatent().getPatentNo().trim());
             //用专利号查询该条数据是否存在
             Patent patent = patentService.getByPatentNo(uploadParamsVO.getPatent().getPatentNo());
             //如果不存在就新增一条

PAS/src/main/resources/mapper/PatentMapper.xml

@@ -212,16 +212,16 @@
                 and (select count(*) from os_patent_right where a.id = patent_id and (${params.rightContentSql})) > 0
             </if>
             <if test="params.querySimpleFamily == true">
-                and (a.simple_family = (select id from os_patent_simplefamily where type = 1 and patent_no = a.patentno)
+                and (a.simple_family = (select id from os_patent_simplefamily where type = 1 and patent_no = a.patentno limit 1)
                 or a.simple_family is null)
             </if>
             <if test="params.queryInpadocFamily == true">
                 and (a.inpadoc_family = (select id from os_patent_simplefamily where type = 2 and patent_no =
-                a.patentno) or a.inpadoc_family is null)
+                a.patentno limit 1) or a.inpadoc_family is null)
             </if>
             <if test="params.queryPatSnapFamily == true">
                 and (a.patsnap_family = (select id from os_patent_simplefamily where type = 3 and patent_no =
-                a.patentno) or a.patsnap_family is null)
+                a.patentno limit 1) or a.patsnap_family is null)
             </if>
             <if test="params.whereClassNumberIpc != null">
                 and q1.type = 1 and