校验上链逻辑

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectMapper.java

@@ -59,4 +59,7 @@ public interface ProjectMapper {
      * 统计：返回 singleCount(1)、batchCount(2)、total
      */
     ProjectNumRes countTypeStats();
+
+    Project getProjectByNodeId(String nodeId);
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectWorkflowMapper.java

@@ -60,7 +60,7 @@ public interface ProjectWorkflowMapper {
      *  查询当前项目下的某个节点ID的数据
      *
      */
-    List<ProjectWorkflow> selectProjectOneNodeId(@Param("nodeId") String nodeId);
+    List<ProjectWorkflow> selectProjectOneNodeId(@Param("nodeId") String nodeId,@Param("nodeTableName") String nodeTableName);
 
 
 }

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

@@ -1,8 +1,11 @@
 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.ProjectType;
 import com.siwei.apply.mapper.NodeLandMapper;
+import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.service.NodeLandService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -28,7 +31,8 @@ public class NodeLandImpl implements NodeLandService {
     @Autowired
     private ProjectWorkflowMapper projectWorkflowMapper;
 
-
+    @Autowired
+    private ProjectMapper projectMapper;
 
 
     
@@ -153,8 +157,14 @@ public class NodeLandImpl implements NodeLandService {
         // 获取地块ID
         NodeLand nodeLand = nodeLandMapper.selectByNodeId(nodeId);
         if(Objects.isNull(nodeLand)){
+            //这里需要根据节点查出当前项目信息
+            String nodeTableName = "t_tjyydhx";
+            Project project  = projectMapper.getProjectByNodeId(nodeId);
+            if(ProjectType.ALONE.getCode().equals(project.getProjectType())){
+                nodeTableName = "t_ydbp";
+            }
             //获取当前项目下的固定节点
-            List<ProjectWorkflow>  useProjectWorkflowList =  projectWorkflowMapper.selectProjectOneNodeId(nodeId);
+            List<ProjectWorkflow>  useProjectWorkflowList =  projectWorkflowMapper.selectProjectOneNodeId(nodeId,nodeTableName);
             if(CollectionUtils.isNotEmpty(useProjectWorkflowList)){
                 String useNodeId = useProjectWorkflowList.get(0).getNodeId();
                 nodeLand = nodeLandMapper.selectByNodeId(useNodeId);

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -130,4 +130,15 @@
         FROM t_tdgy
         WHERE project_id IS NULL OR project_id = ''
     </select>
+
+    <!--     根据节点获取项目信息-->
+    <select id="getProjectByNodeId" resultMap="projectMap">
+        SELECT   project.*   FROM "public"."t_project"  project
+        LEFT JOIN "public"."t_project_workflow"  flow
+        on flow.project_id=project.id
+        WHERE flow.node_id = #{nodeId}   LIMIT 1
+    </select>
+
+
+
 </mapper>

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectWorkflowMapper.xml

@@ -144,8 +144,8 @@
             flow2.updated_at
         FROM "public"."t_project_workflow"  flow1
         LEFT JOIN "public"."t_project_workflow"  flow2
-        on flow1.project_id=flow2.project_id and  flow2.node_table_name='t_ydbp'
-        WHERE flow1.node_id = #{projectId}
+        on flow1.project_id=flow2.project_id and  flow2.node_table_name=#{nodeTableName}
+        WHERE flow1.node_id = #{nodeId}
     </select>