调整批次报批的附件上传

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeAttachmentController.java

@@ -58,11 +58,14 @@ public class NodeAttachmentController extends BaseController {
             ProjectWorkflow projectWorkflow = projectService.getProjectWorkflowByNodeId(projectId,nodeId);
 
             String gdType = "";
-            if(AloneWorkFlowEnum.NODE_2.getTableName().equals(projectWorkflow.getNodeTableName())){
-                TdgyRes tdgy = tdgyService.getById(nodeId);
-                gdType = tdgy.getGdType();
-                gdType= "出让".equals(gdType) ? "1" : "划拨".equals(gdType)? "2":"1";
+            if(Objects.isNull(projectWorkflow)){
+                if(AloneWorkFlowEnum.NODE_2.getTableName().equals(projectWorkflow.getNodeTableName())){
+                    TdgyRes tdgy = tdgyService.getById(nodeId);
+                    gdType = tdgy.getGdType();
+                    gdType= "出让".equals(gdType) ? "1" : "划拨".equals(gdType)? "2":"1";
+                }
             }
+
             String id = nodeAttachmentService.processFileAndSave(filePath,projectWorkflow.getNodeTableName(),gdType);
             nodeAttachmentService.modifyAttachmentInfo(projectId,nodeId,id);
             if (id != null) {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/NodeAttachmentImpl.java

@@ -644,28 +644,32 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
                         ProjectWorkflow projectWorkflow = landOneCodeService.getProjectWorkflowByNodeId(nodeId);
                         projectId = projectWorkflow.getProjectId();
                     }
-                    String rootPath = String.valueOf(nodeAttachment.getAttachment().get("path"));
-                    logger.info("全文检索根目录路径，rootPath: {}", rootPath);
-                    //先进行删除
-                    List<ProjectAttachmentInfo> projectAttachmentInfoList =  projectAttachmentInfoMapper.selectByProjectIdNodeId(projectId,nodeId);
-                    if(CollectionUtils.isNotEmpty(projectAttachmentInfoList)){
-                        List<String> ids =  projectAttachmentInfoList.stream().map(BaseId::getId).collect(Collectors.toList());
-                        projectAttachmentInfoMapper.deleteByIds(ids);
-                    }
-                    //再进行更新
-                    List<Path> fileList = ServiceFileUtil.getDirectoryFileList(rootPath);
-                    if(CollectionUtils.isNotEmpty(fileList)){
-                        for(Path path : fileList){
-                            ProjectAttachmentInfo projectAttachmentInfo = new ProjectAttachmentInfo();
-                            projectAttachmentInfo.generateId();
-                            projectAttachmentInfo.setProjectId(projectId);
-                            projectAttachmentInfo.setNodeId(nodeId);
-                            projectAttachmentInfo.setFilePath(path.toString());
-                            String  baseName = FilenameUtils.getBaseName(path.getFileName().toString());
-                            projectAttachmentInfo.setFileName(baseName);
-                            projectAttachmentInfoMapper.insert(projectAttachmentInfo);
+                    //项目id，在报批数据集成入参时候可能为空，这情况不入库（在确认上链时候入库）
+                    if(StringUtils.isNotBlank(projectId)){
+                        String rootPath = String.valueOf(nodeAttachment.getAttachment().get("path"));
+                        logger.info("全文检索根目录路径，rootPath: {}", rootPath);
+                        //先进行删除
+                        List<ProjectAttachmentInfo> projectAttachmentInfoList =  projectAttachmentInfoMapper.selectByProjectIdNodeId(projectId,nodeId);
+                        if(CollectionUtils.isNotEmpty(projectAttachmentInfoList)){
+                            List<String> ids =  projectAttachmentInfoList.stream().map(BaseId::getId).collect(Collectors.toList());
+                            projectAttachmentInfoMapper.deleteByIds(ids);
+                        }
+                        //再进行更新
+                        List<Path> fileList = ServiceFileUtil.getDirectoryFileList(rootPath);
+                        if(CollectionUtils.isNotEmpty(fileList)){
+                            for(Path path : fileList){
+                                ProjectAttachmentInfo projectAttachmentInfo = new ProjectAttachmentInfo();
+                                projectAttachmentInfo.generateId();
+                                projectAttachmentInfo.setProjectId(projectId);
+                                projectAttachmentInfo.setNodeId(nodeId);
+                                projectAttachmentInfo.setFilePath(path.toString());
+                                String  baseName = FilenameUtils.getBaseName(path.getFileName().toString());
+                                projectAttachmentInfo.setFileName(baseName);
+                                projectAttachmentInfoMapper.insert(projectAttachmentInfo);
+                            }
                         }
                     }
+
                 } catch (IOException e) {
                     throw new ServiceException("全文检索附件材料--保存失败");
                 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java

@@ -202,6 +202,7 @@ public class TdgyImpl implements TdgyService {
                 }
             }
 
+            //todo 这里需要调用附件信息全文检索方法维护列表附件名称数据
             if(Objects.nonNull(projectWorkflow.getId())){
                 projectWorkflow.setParentId(id);
                 //projectWorkflow.setWorkflowId(workflow.getId());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/utils/ServiceUtil.java

@@ -38,7 +38,7 @@ public class ServiceUtil {
 
 
     public static   Map<String,Object>  getDirChildrenMap(String dirName, NodeAttachment nodeAttachment) {
-        Map<String,Object> retMap = new LinkedHashMap<>();
+        Map<String,Object> retMap = null;
         if (Objects.nonNull(nodeAttachment) && Objects.nonNull(nodeAttachment.getAttachment())) {
             Map<String, Object> attachment = nodeAttachment.getAttachment();
             //第一曾经children 所有目录list