调整关于审核的批次报批数据

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

@@ -66,10 +66,10 @@ 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_SUOYOUQUAN ="1,2,6,8,18,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";
+    public static final String ZD_DICT_A6_VALUE_SHIYONGQUAN ="3,4,5,7,11,12,15,16,17,23,24,29,30,31,34";
 
 
     //汇交矢量表

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

@@ -14,13 +14,15 @@ 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_4("4", "所有权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
+    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"),
-    DECISION_TYPE_7("7", "用地报批（存量）数据", "vector.gj_bp_data", "gid", "gj_bp_data", "gid", "xmmc","xmlx"),
-    DECISION_TYPE_6_1("6", "土地供应数据", "public.c_one_code_tdgy", "node_id", "c_one_code_tdgy", "node_id","srf","hbcrht_date"),
-//    DECISION_TYPE_7_1("7", "用地报批数据", "public.t_ydbp_data", "id", "t_ydbp_data", "id", "name","pfwh"),
+    DECISION_TYPE_6("6", "供地数据", "public.c_one_code_decision_supply", "node_id", "c_one_code_decision_supply", "node_id","srf", "hbcrht_date"),
+    DECISION_TYPE_7("7", "报批数据", "public.c_one_code_decision_batch", "node_id", "c_one_code_decision_batch", "node_id", "node_name","pfwh"),
 
+//    DECISION_TYPE_6("6", "供地数据", "vector.gj_gd_data", "gid", "gj_gd_data", "gid","srr", "nf"),
+//    DECISION_TYPE_7("7", "用地报批（存量）数据", "vector.gj_bp_data", "gid", "gj_bp_data", "gid", "xmmc","xmlx"),
+//    DECISION_TYPE_6_1("6", "土地供应数据", "public.c_one_code_tdgy", "node_id", "c_one_code_tdgy", "node_id","srf","hbcrht_date"),
+//    DECISION_TYPE_7_1("7", "用地报批数据", "public.t_ydbp_data", "id", "t_ydbp_data", "id", "name","pfwh"),
 //    DECISION_TYPE_6_2("6", "供地数据", "c_one_code_tdgy", "node_id", "供地数据2", "project_name","project_code"),
 //    DECISION_TYPE_7_2("7", "报批数据", "c_one_code_ydbp", "node_id", "报批数据2", "node_id", "project_name","project_code");
     DECISION_TYPE_8("8", "永久基本农田", "vector.gj_nongtian", "gid", "gj_nongtian", "gid", "dlmc","dlbm");

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

@@ -149,7 +149,6 @@ public class ProjectImpl implements ProjectService {
     @Autowired
     private NodeLandService nodeLandService;
 
-
     @Autowired
     private TakeDataService takeDataService;
 
@@ -157,10 +156,6 @@ public class ProjectImpl implements ProjectService {
     private ProjectImmobileCodeMapper projectImmobileCodeMapper;
 
 
-
-
-
-
     @Override
     public String add(ProjectVo projectVo) {
         Project project = new Project();