移除附件

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

@@ -253,7 +253,8 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
         List<Long> childList = this.getChildList(id, new ArrayList<>());
         //父节点id
         childList.add(id);
-        DxContextProjectVO dxContextProjectVO = (DxContextProjectVO) extDxContextProjectServiceFeign.get(id);
+        SearchQueryCondition contextIdBuild = SearchQueryBuilder.openBuild().openFilterBuilder().setEq("id", id).closeFilterBuilder().setPropName("objFileLinks").build();
+        DxContextProjectVO dxContextProjectVO = (DxContextProjectVO) extDxContextProjectServiceFeign.findRecursion(contextIdBuild).getContent().get(0);
         //查询项目群下所有案卷
         SearchQueryCondition searchProgram = SearchUtil.buildQuery("dxContextId", SearchItem.Operator.IN, childList);
         List<V> content = this.findRecursion(searchProgram).getContent();
@@ -268,22 +269,23 @@ public class ExtFilesServiceImpl<V extends ExtFilesVO> implements ExtFilesServic
         int jjNumber = 0;
         int sbNumber = 0;
         int jsNumber = 0;
-        int countNumber = 0;
-        for (ExtFilesDocLinkVO extFilesDocLinkVO : extFilesDocLinkVOList) {
+        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("number", countNumber);
+            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);
@@ -295,6 +297,10 @@ 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) {
         if (categoryNumber.contains("ZH")) {