|
|
@@ -3,6 +3,7 @@ package com.siwei.apply.service.impl;
|
|
|
import com.siwei.apply.domain.NodeLand;
|
|
|
import com.siwei.apply.domain.Project;
|
|
|
import com.siwei.apply.domain.ProjectWorkflow;
|
|
|
+import com.siwei.apply.enums.AloneWorkFlowEnum;
|
|
|
import com.siwei.apply.enums.ProjectType;
|
|
|
import com.siwei.apply.mapper.NodeLandMapper;
|
|
|
import com.siwei.apply.mapper.ProjectMapper;
|
|
|
@@ -172,15 +173,26 @@ public class NodeLandImpl implements NodeLandService {
|
|
|
// 获取地块ID
|
|
|
NodeLand nodeLand = nodeLandMapper.selectByNodeId(nodeId);
|
|
|
if(Objects.isNull(nodeLand)){
|
|
|
- //这里需要根据节点查出当前项目信息
|
|
|
- String nodeTableName = "t_gyjsydscdj";
|
|
|
- //获取当前项目下的固定节点
|
|
|
- List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId,nodeTableName);
|
|
|
- if(CollectionUtils.isNotEmpty(useProjectWorkflowList) && Objects.nonNull(useProjectWorkflowList.get(0))){
|
|
|
- String useNodeId = useProjectWorkflowList.get(0).getNodeId();
|
|
|
- nodeLand = nodeLandMapper.selectByNodeId(useNodeId);
|
|
|
+ //取当前节点对应的关联数据
|
|
|
+ List<ProjectWorkflow> nodeProjectWorkflow = projectWorkflowMapper.selectByNodeId(nodeId,null);
|
|
|
+ if(CollectionUtils.isNotEmpty(nodeProjectWorkflow)) {
|
|
|
+ ProjectWorkflow projectWorkflow = nodeProjectWorkflow.get(0);
|
|
|
+ String tmpNodeTableName = projectWorkflow.getNodeTableName();
|
|
|
+ if (AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(tmpNodeTableName)||
|
|
|
+ AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(tmpNodeTableName)||
|
|
|
+ AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(tmpNodeTableName)||
|
|
|
+ AloneWorkFlowEnum.NODE_7.getTableName().equalsIgnoreCase(tmpNodeTableName)) {
|
|
|
+ //这里需要根据节点查出当前项目信息
|
|
|
+ String nodeTableName = "t_gyjsydscdj";
|
|
|
+ //获取当前项目下的固定节点
|
|
|
+ List<ProjectWorkflow> useProjectWorkflowList = projectWorkflowMapper.selectProjectOneNodeId(nodeId, nodeTableName);
|
|
|
+ if (CollectionUtils.isNotEmpty(useProjectWorkflowList) && Objects.nonNull(useProjectWorkflowList.get(0))) {
|
|
|
+ String useNodeId = useProjectWorkflowList.get(0).getNodeId();
|
|
|
+ nodeLand = nodeLandMapper.selectByNodeId(useNodeId);
|
|
|
+ }
|
|
|
+ logger.info("未找到项目----固定节点对应的地块信息,nodeId={}", nodeId);
|
|
|
+ }
|
|
|
}
|
|
|
- logger.info("未找到项目----固定节点对应的地块信息,nodeId={}", nodeId);
|
|
|
}
|
|
|
if(Objects.isNull(nodeLand)){
|
|
|
logger.info("未找到节点对应的地块信息,nodeId={}", nodeId);
|
|
|
@@ -189,6 +201,7 @@ public class NodeLandImpl implements NodeLandService {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
|
public NodeLand getCurrentNodeLandByNodeId(String nodeId) {
|
|
|
// 获取地块ID
|