1
0
chenendian 4 дней назад
Родитель
Сommit
7c1933923b

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

@@ -16,8 +16,8 @@ public enum DecisionType {
     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_4("4", "所有权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_5("5", "使用权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_5("5", "使用权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
-    DECISION_TYPE_6("6", "供地数据", "public.c_one_code_decision_supply", "details_id", "c_one_code_decision_supply", "details_id","srf", "hbcrht_date"),
-    DECISION_TYPE_7("7", "报批数据", "public.c_one_code_decision_batch", "details_id", "c_one_code_decision_batch", "details_id", "node_name","pfwh"),
+    DECISION_TYPE_6("6", "土地供应数据", "public.c_one_code_decision_supply", "details_id", "c_one_code_decision_supply", "details_id","srf", "hbcrht_date"),
+    DECISION_TYPE_7("7", "用地报批数据", "public.c_one_code_decision_batch", "details_id", "c_one_code_decision_batch", "details_id", "node_name","pfwh"),
 
 
 //    DECISION_TYPE_6("6", "供地数据", "vector.gj_gd_data", "gid", "gj_gd_data", "gid","srr", "nf"),
 //    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_7("7", "用地报批(存量)数据", "vector.gj_bp_data", "gid", "gj_bp_data", "gid", "xmmc","xmlx"),

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

@@ -652,7 +652,7 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
                 }else {
                 }else {
 
 
                     NpoiHelper.TableTitle xmmcTitle = new NpoiHelper.TableTitle();
                     NpoiHelper.TableTitle xmmcTitle = new NpoiHelper.TableTitle();
-                    xmmcTitle.setKey("project_name");
+                    xmmcTitle.setKey("node_name");
                     xmmcTitle.setName("项目名称");
                     xmmcTitle.setName("项目名称");
                     xmmcTitle.setWidth(2484);
                     xmmcTitle.setWidth(2484);
                     xmmcTitle.setAlign(ParagraphAlignment.CENTER);
                     xmmcTitle.setAlign(ParagraphAlignment.CENTER);
@@ -669,8 +669,8 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
 
 
                     // 项目类型
                     // 项目类型
                     NpoiHelper.TableTitle xmlxTitle = new NpoiHelper.TableTitle();
                     NpoiHelper.TableTitle xmlxTitle = new NpoiHelper.TableTitle();
-                    xmlxTitle.setKey("tdyt");
-                    xmlxTitle.setName("报批用途");
+                    xmlxTitle.setKey("pfwh");
+                    xmlxTitle.setName("批复文号");
                     xmlxTitle.setWidth(1880);
                     xmlxTitle.setWidth(1880);
                     xmlxTitle.setAlign(ParagraphAlignment.CENTER);
                     xmlxTitle.setAlign(ParagraphAlignment.CENTER);
                     titles.add(xmlxTitle);
                     titles.add(xmlxTitle);