辅助审核-控规数据

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

@@ -13,7 +13,7 @@ public enum DecisionType {
      */
     DECISION_TYPE_1("1", "现状数据", "vector.gj_sandiao", "gid", "gj_sandiao", "gid", "dlmc","dlbm"),
     DECISION_TYPE_2("2", "城镇开发边界", "vector.gj_chengzhen", "gid", "gj_chengzhen", "gid", "ghfqmc","ghfqdm"),
-    DECISION_TYPE_3("3", "规划数据", "vector.gj_konggui", "gid", "gj_konggui", "gid", "dkbh","ydxz"),
+    DECISION_TYPE_3("3", "控规数据", "vector.gj_konggui", "gid", "gj_konggui", "gid", "dkbh","ydxz"),
     DECISION_TYPE_4("4", "所有权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_5("5", "使用权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_6("6", "供地数据", "vector.gj_gd_data", "gid", "gj_gd_data", "gid","srr", "nf"),

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

@@ -702,11 +702,9 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
      */
     private List<Map<String, Object>> prepareTableData(List<Map<String, Object>> dataList, Integer type,String name) {
         List<Map<String, Object>> result = new ArrayList<>();
-        
         if (CollectionUtils.isEmpty(dataList)) {
             return result;
         }
-
         int seq = 1;
         for (Map<String, Object> data : dataList) {
             Map<String, Object> row = new HashMap<>();
@@ -739,17 +737,34 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
                     row.put("shapearea", getDoubleValue(data, "shapearea"));
                     row.put("tdyt", getStringValue(data, "tdyt"));
                 }
-            } else {
+            } else if (type == 1) {
+                // 所有权/使用权宗地
+                row.put("dlmc", getStringValue(data, "dlmc"));
+                row.put("shapearea", getDoubleValue(data, "shapearea"));
+                row.put("dlbm", getStringValue(data, "dlbm"));
+            }else if (type == 2) {
+                // 所有权/使用权宗地
+                row.put("ghfqmc", getStringValue(data, "ghfqmc"));
+                row.put("shapearea", getDoubleValue(data, "shapearea"));
+                row.put("ghfqdm", getStringValue(data, "ghfqdm"));
+            }else if (type == 3) {
+                row.put("dkbh", getStringValue(data, "dkbh"));
+                row.put("shapearea", getDoubleValue(data, "shapearea"));
+                row.put("ydxz", getStringValue(data, "ydxz"));
+            }else if (type == 8) {
+                row.put("dlmc", getStringValue(data, "dlmc"));
+                row.put("shapearea", getDoubleValue(data, "shapearea"));
+                row.put("dlbm", getStringValue(data, "dlbm"));
+            }else {
                 // 默认：复制所有数据
                 row.putAll(data);
             }
-
             result.add(row);
         }
-
         return result;
     }
 
+
     /**
      * 获取字符串值
      */