关于修复，所有权宗地，使用权宗地的图斑交集

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/Constant.java

@@ -63,6 +63,12 @@ public class Constant {
     );
 
 
+    // 宗地所有权的相关值
+    public static final String ZD_DICT_A6_VALUE_SUOYOUQUAN ="1,2,4,6,8,16,18,24,25,26,33,35,36";
 
+    // 使用权的相关值
+    public static final String ZD_DICT_A6_VALUE_SHIYONGQUAN ="3,4,5,7,11,12,15,16,17,23,24,25,26,29,30,31,34";
 
-    }
+
+
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZdjbxxMapper.java

@@ -30,6 +30,10 @@ public interface ZdjbxxMapper {
      */
     List<Zdjbxx> getListByDjzqdm (@Param("djzqdm") String djzqdm);
 
+
+    List<String> getListByQllx (@Param("qllxIds") String qllxIds);
+
+
     /**
      * 获取宗地基本信息记录列表
      */

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

@@ -1,12 +1,14 @@
 package com.siwei.apply.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.siwei.apply.common.Constant;
 import com.siwei.apply.domain.DecisionTask;
 import com.siwei.apply.domain.LandType;
 import com.siwei.apply.domain.vo.*;
 import com.siwei.apply.enums.DecisionType;
 import com.siwei.apply.mapper.DecisionTaskMapper;
 import com.siwei.apply.mapper.LandTypeMapper;
+import com.siwei.apply.mapper.cadastre.ZdjbxxMapper;
 import com.siwei.apply.service.DecisionTaskService;
 import com.siwei.apply.service.IImageService;
 import com.siwei.apply.utils.NpoiHelper;
@@ -47,6 +49,9 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
     @Autowired
     private LandTypeMapper landTypeMapper;
 
+    @Autowired
+    private ZdjbxxMapper zdjbxxMapper;
+
 
 
     @Override
@@ -134,8 +139,20 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
         try{
             Arrays.stream(DecisionType.values()).forEach(type -> {
                 if(dataType.contains(Integer.parseInt(type.getCode()))) {
-                    //todo 这里需要根据条件判断使用权宗地，与所有权宗地的id
+                    //这里需要根据条件判断使用权宗地，与所有权宗地的id
                     List<String> tableIds = new ArrayList<>();
+                    String qllxIds  = null;
+                    if(type.getCode().equals("4")){ // 所有权宗地
+                        qllxIds = Constant.ZD_DICT_A6_VALUE_SUOYOUQUAN;
+                    }else if(type.getCode().equals("5")){
+                        qllxIds = Constant.ZD_DICT_A6_VALUE_SHIYONGQUAN;
+                    }
+                    if(Objects.nonNull(qllxIds)){
+                        List<String> zddmList = zdjbxxMapper.getListByQllx(qllxIds);
+                        if(CollectionUtils.isNotEmpty(zddmList)){
+                            tableIds.addAll(zddmList);
+                        }
+                    }
                     DecisionIntersectsDetailsVo param = new DecisionIntersectsDetailsVo();
                     param.setTaskId(decisionTask.getId());
                     param.setTableName(type.getTable());
@@ -172,7 +189,6 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
      * 根据当前任务id，返回此次任务的所有结果，并且需要根据不同类型动态查询
      *
      *
-     *
      * @param taskId
      * @return
      */
@@ -717,11 +733,11 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
                 if(name.equalsIgnoreCase("报批数据")) {
                     row.put("xmmc", getStringValue(data, "xmmc"));
                     row.put("shapearea", getDoubleValue(data, "shapearea"));
-                    row.put("tdyt", getStringValue(data, "tdyt"));
+                    row.put("xmlx", getStringValue(data, "xmlx"));
                 }else {
                     row.put("project_name", getStringValue(data, "project_name"));
                     row.put("shapearea", getDoubleValue(data, "shapearea"));
-                    row.put("xmlx", getStringValue(data, "xmlx"));
+                    row.put("tdyt", getStringValue(data, "tdyt"));
                 }
             } else {
                 // 默认：复制所有数据

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdjbxxMapper.xml

@@ -115,6 +115,15 @@
         </where>
     </select>
 
+    <select id="getListByQllx" resultType="String">
+        SELECT zddm
+        FROM vector.zdjbxx
+        <where>
+            <if test="qllxIds != null and qllxIds != ''">
+                AND qllx  in(#{qllxIds})
+            </if>
+        </where>
+    </select>
 
 
     <select id="getList" resultMap="BaseResultMap">