调整引用图形

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

@@ -54,6 +54,7 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
         Gyjsydscdj gyjsydscdj = new Gyjsydscdj();
         BeanUtils.copyProperties(gyjsydscdjVo, gyjsydscdj);
         gyjsydscdj.generateId();
+        //todo 这里上线需要结合登录用户获取登录用户id
         gyjsydscdj.setCreatorId(UserId);
         gyjsydscdjMapper.add(gyjsydscdj);
         // 添加项目流程（仿照YdbpImpl）

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

@@ -8,6 +8,7 @@ import com.siwei.apply.domain.vo.NodeVo;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
 import com.siwei.apply.domain.vo.ProjectUpdateVo;
 import com.siwei.apply.domain.vo.ProjectVo;
+import com.siwei.apply.enums.AloneWorkFlowEnum;
 import com.siwei.apply.enums.ProjectType;
 import com.siwei.apply.mapper.*;
 import com.siwei.apply.service.NodeAttachmentService;
@@ -16,6 +17,7 @@ import com.siwei.apply.service.ProjectService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,7 +95,6 @@ public class ProjectImpl implements ProjectService {
         return map;
     }
 
-
     @Override
     public Map<String, Object> getListAndGeom(ProjectFilterVo projectFilterVo) {
         List<Project> projects = projectMapper.getList(projectFilterVo);
@@ -108,18 +109,17 @@ public class ProjectImpl implements ProjectService {
                 String nodeId = currentProjectWorkflow.getNodeId();
                 String nodeTableName = currentProjectWorkflow.getNodeTableName();
                 Map<String, Object> geomInfo = null;
-                //单独时候，只有第一阶段使用t_ydysyxz的空间图形，其它节点都是继承t_ydbp用地报批的图形
-                if (ProjectType.ALONE.getCode().equals(String.valueOf(project.getProjectType()))) {
-                    //用地预审与选址
-                    if(!nodeTableName.equals("t_ydysyxz")){
-                        nodeTableName = "t_ydbp";
-                    }
-                    geomInfo = nodeLandService.getGeomByProjectAndNodeTable(project.getId(), nodeTableName);
-                }else if (ProjectType.BATCH.getCode().equals(String.valueOf(project.getProjectType()))) {
-                    //批次报批，只有一个图斑  （规划条件与用地红线出具	t_tjyydhx）
-                    nodeTableName = "t_tjyydhx";
-                    geomInfo = nodeLandService.getGeomByProjectAndNodeTable(project.getId(),nodeTableName);
+                String[] refArr = {
+                        AloneWorkFlowEnum.NODE_4.getTableName(),
+                        AloneWorkFlowEnum.NODE_5.getTableName(),
+                        AloneWorkFlowEnum.NODE_6.getTableName(),
+                        AloneWorkFlowEnum.NODE_7.getTableName()};
+
+                //这些节点都是继承t_gyjsydscdj用地报批的图形
+                if(ArrayUtils.contains(refArr,nodeTableName)){
+                    nodeTableName = "t_gyjsydscdj";
                 }
+                geomInfo = nodeLandService.getGeomByProjectAndNodeTable(project.getId(), nodeTableName);
                 if(Objects.nonNull(geomInfo)){
                     project.setEnvelope(String.valueOf(geomInfo.get("envelope")));
                     project.setShppath(String.valueOf(geomInfo.get("shppath")));
@@ -129,7 +129,6 @@ public class ProjectImpl implements ProjectService {
                 }
             }
         }
-
         Map<String, Object> map = new HashMap<>();
         map.put("projects", projects);
         map.put("count", count);