Excel导入检查合法性逻辑完善、拆分权要保证权要完整性

PAS/src/main/java/cn/cslg/pas/common/utils/ReadExcelUtils.java

@@ -58,18 +58,21 @@ public class ReadExcelUtils {
             ThrowException.throwXiaoShiException("文件内容格式不正确，请检查总行数是否有专利内容");
         }
 
-        //获取第一行
+        //获取第一行抬头
         Row firstRow = sheet.getRow(0);
-        boolean flag = false;
-        //遍历第一行单元格，若第一行有单元格内容是 "公开(公告)号" 则文件合法
+        boolean flag1 = false;  //是否有 "公开(公告)号"
+        boolean flag2 = false;  //是否有 "申请号"
+        //遍历第一行单元格抬头
         for (Cell cell : firstRow) {
             if (cell.getStringCellValue().equals("公开(公告)号")) {
-                flag = true;
-                break;
+                flag1 = true;
+            }
+            if (cell.getStringCellValue().equals("申请号")) {
+                flag2 = true;
             }
         }
-        if (!flag) {
-            ThrowException.throwXiaoShiException("文件内容格式不正确，第一行抬头未找到【公开(公告)号】");
+        if (!flag1 || !flag2) {
+            ThrowException.throwXiaoShiException("文件内容格式不正确，第一行抬头必须有【公开(公告)号】和【申请号】");
         }
 
         //返回文件总行数-1（即专利总数量）

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

@@ -45,18 +45,18 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
         LambdaQueryWrapper<PatentRight> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PatentRight::getPatentId, patentId);
         queryWrapper.orderByAsc(PatentRight::getSort);
-        List<PatentRight> patentRights = this.list(queryWrapper);
-        if (patentRights != null && patentRights.size() > 0) {
-            PatentRight patentRight = patentRights.get(0);
-            //创建PatentRightParams对象保存权要基本信息
-            PatentRightParams patentRightParams = new PatentRightParams();
-            patentRightParams.setPatentId(patentId);  //装载专利id
-            patentRightParams.setPatentNo(patentService.getById(patentId).getPatentNo());
-            patentRightParams.setContent(patentRight.getContent());  //装载权利要求原文
-            patentRightParams.setContentOut(patentRight.getContentOut());  //装载权利要求译文
-            patentRights = PatentRightUtils.formatPatentRight(patentRightParams);
-            return patentRights;
-        }
+//        List<PatentRight> patentRights = this.list(queryWrapper);
+//        if (patentRights != null && patentRights.size() > 0) {
+//            PatentRight patentRight = patentRights.get(0);
+//            //创建PatentRightParams对象保存权要基本信息
+//            PatentRightParams patentRightParams = new PatentRightParams();
+//            patentRightParams.setPatentId(patentId);  //装载专利id
+//            patentRightParams.setPatentNo(patentService.getById(patentId).getPatentNo());
+//            patentRightParams.setContent(patentRight.getContent());  //装载权利要求原文
+//            patentRightParams.setContentOut(patentRight.getContentOut());  //装载权利要求译文
+//            patentRights = PatentRightUtils.formatPatentRight(patentRightParams);
+//            return patentRights;
+//        }
         return this.list(queryWrapper);
     }