新增互见号

inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/impl/ExtFilesServiceImpl.java

@@ -263,21 +263,22 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
         int sbNumber = 0;
         int jsNumber = 0;
         int countNumber=0;
+
         for (ExtFilesDocLinkVO extFilesDocLinkVO:extFilesDocLinkVOList){
             Map<String, Object> datas = new HashMap<>();
             ExtFilesVO target = extFilesDocLinkVO.getTarget();
-            datas.put("contextName",dxContextProjectVO.getName());
-            datas.put("serialNumber",serialNumber);
-            datas.put("categoryNumber",categoryNumber(target.getCategoryNumber(),zhNumber,jjNumber,sbNumber,jsNumber,countNumber));
-            datas.put("volumeNumber",target.getVolumeNumber());
-            datas.put("caseName",target.getCaseName());
-            datas.put("pageNumber",target.getPageNumber());
-            datas.put("remarks",target.getRemarks());
+            datas.put("serialNumber",ifNull(serialNumber));
+            datas.put("categoryNumber",ifNull(categoryNumber(target.getCategoryNumber(),zhNumber,jjNumber,sbNumber,jsNumber,countNumber)));
+            datas.put("volumeNumber",ifNull(target.getVolumeNumber()));
+            datas.put("caseName",ifNull(target.getCaseName()));
+            datas.put("pageNumber",ifNull(target.getPageNumber()));
+            datas.put("remarks",ifNull(target.getRemarks()));
             datas.put("number",countNumber);
             extFilesMap.add(datas);
             serialNumber++;
         }
         resultDatas.put("data", extFilesMap);
+        resultDatas.put("contextName", ifNull(dxContextProjectVO.getName()));
         String string = convertPdf("案卷目录模板.docx", resultDatas);
         /*File pdfFile = new File(string);*/
         MultipartFile multipartFile = DxObjFileUtils.createFile(string);
@@ -289,6 +290,9 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
         extDxContextProjectServiceFeign.saveRecursion(dxContextProjectVO);
     }
 
+   public static String ifNull(Object obj) {
+        return null == obj ? "" : obj.toString();
+    }
 
 
     public String categoryNumber(String categoryNumber,int zhNumber,int jjNumber,int sbNumber,int jsNumber,int countNumber){