兼容土地供应，嵌入批次数据

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

@@ -166,12 +166,13 @@ public class TdgyImpl implements TdgyService {
         if(ProjectType.BATCH.getCode().equals(String.valueOf(pType))){
             //这里进行转换，查找复用的id //todo 这里后期需要删除
             NodeLand nodeLand= nodeLandService.getNodeLandByNodeId(id);
-            id = nodeLand.getNodeId();
+            String converId = nodeLand.getNodeId();//查找复用的id
             //这里检验空间图形是否包含批次数据
-            List<Map<String, String>> geomDetailsList= nodeLandService.selectTGeomDbDetailsByNodeId(id);
+            List<Map<String, String>> geomDetailsList= nodeLandService.selectTGeomDbDetailsByNodeId(converId);
             Map <String, String> resultMap = new HashMap<>();
             for (Map<String, String> geomDetailsMap : geomDetailsList) {
                 String geomDetailsId = geomDetailsMap.get("id");
+                //校验图斑是否包含批次报批节点（重点）
                 Map<String, String> geomDetailsAndNodeMap= nodeLandService.selectGeomContainsNode(geomDetailsId);
                 if(!MapUtils.isEmpty(geomDetailsAndNodeMap)){
                     String nodeId = geomDetailsAndNodeMap.get("node_id");

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

@@ -92,7 +92,7 @@
         LIMIT 1
     </select>
 
-
+    <!--  根据nodeId，查询出当前具体的图斑ID -->
     <select id="selectTGeomDbDetailsByNodeId" parameterType="String" resultType="java.util.Map">
         select  details.id, public.st_asewkt(details.geom) AS  geom, details.upload_id, details.geom_json, details.sort, details.geom_area
         from t_geom_db_details  details