报批及供地数据开发

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/DecisionType.java

@@ -20,8 +20,12 @@ public enum DecisionType {
      * extraFields：查询业务表时需要额外返回的字段名列表（动态拼接到 SELECT 中）
      * 字段名需与业务表列名完全一致
      */
-    DECISION_TYPE_4("4", "所有权宗地", "zdjbxx", "zddm", "gmjjhyfldm", "zddm", "qlrsjsyrlxm","zdszx"),
-    DECISION_TYPE_5("5", "使用权宗地", "zdjbxx", "zddm", "gmjjhyfldm", "zddm", "qlrsjsyrlxm","zdszx");
+    DECISION_TYPE_4("4", "所有权宗地", "zdjbxx", "zddm", "所有权宗地", "zddm", "qlrsjsyrlxm","zdszx"),
+    DECISION_TYPE_5("5", "使用权宗地", "zdjbxx", "zddm", "使用权宗地", "zddm", "qlrsjsyrlxm","zdszx"),
+    DECISION_TYPE_6("6", "供地数据", "gj_gd_data", "gid", "供地数据", "gid","srr", "nf"),
+    DECISION_TYPE_7("7", "报批数据", "gj_bp_data", "gid", "报批数据", "gid", "xmmc","xmlx");
+
+
 
 
     private final String name;

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

@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -108,6 +107,7 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
         try{
             Arrays.stream(DecisionType.values()).forEach(type -> {
                 if(dataType.contains(Integer.parseInt(type.getCode()))) {
+                    //todo 这里需要根据条件判断使用权宗地，与所有权宗地的id
                     List<String> tableIds = new ArrayList<>();
                     DecisionIntersectsDetailsVo param = new DecisionIntersectsDetailsVo();
                     param.setTaskId(decisionTask.getId());

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

@@ -114,7 +114,7 @@
          FROM (
             SELECT
             inTbale.${sourceId} as source_id,
-            inTbale.${detailsName} as details_name,
+            #{detailsName} as details_name,
             public.ST_Intersection(inTbale.geom,public.ST_GeomFromEWKT(#{ewkt})) AS geom
             FROM vector.${tableName} inTbale
             WHERE public.ST_Intersects( inTbale.geom,public.ST_GeomFromEWKT(#{ewkt}))
@@ -146,7 +146,7 @@
             d.shape_area   AS shapeArea
             <if test="extraFields != null and extraFields.size() > 0">
                 <foreach collection="extraFields" item="field" separator="">
-                    , b.${field} AS ${field}
+                    , COALESCE(b.${field}::varchar, '---') AS ${field}
                 </foreach>
             </if>
         FROM public.t_decision_task_details d