代码合并

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

@@ -602,26 +602,29 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
      */
     public Integer addSingle(Integer reportId, String patentNo) throws IOException {
         CompareFiles compareFiles = new CompareFiles();
-        compareFiles.setFileId(reportId);
-        compareFiles.setPatentNo(patentNo);
-        List<CompareFiles> proofList = this.list(new LambdaQueryWrapper<CompareFiles>().eq(CompareFiles::getReportId, reportId).orderByDesc(CompareFiles::getSysOrder).last("limit 1"));
-        Integer biggestSort;
-        //若该报告目前没有证据，则最大排序序号设为0；若有则最大排序序号就是当前按序号倒序的第一个证据的排序序号
-        if (proofList == null || proofList.size() == 0) {
-            biggestSort = 0;
-        } else {
-            if (proofList.get(0).getSysOrder() == null) {
+        try {
+            compareFiles.setPatentNo(patentNo);
+            List<CompareFiles> proofList = this.list(new LambdaQueryWrapper<CompareFiles>().eq(CompareFiles::getReportId, reportId).orderByDesc(CompareFiles::getSysOrder).last("limit 1"));
+            Integer biggestSort;
+            //若该报告目前没有证据，则最大排序序号设为0；若有则最大排序序号就是当前按序号倒序的第一个证据的排序序号
+            if (proofList == null || proofList.size() == 0) {
                 biggestSort = 0;
-            }
-            else {
-                biggestSort = proofList.get(0).getSysOrder();
-            }
+            } else {
+                if (proofList.get(0).getSysOrder() == null) {
+                    biggestSort = 0;
+                } else {
+                    biggestSort = proofList.get(0).getSysOrder();
+                }
 
+            }
+            compareFiles.setSysOrder(biggestSort);
+            compareFiles.setFileType(1);
+            compareFiles.setReportId(reportId);
+            compareFiles.insert();
+        }
+        catch (Exception e){
+            return -1;
         }
-
-        compareFiles.setSysOrder(biggestSort);
-        compareFiles.setFileType(1);
-        compareFiles.insert();
         return compareFiles.getId();
     }