'commit'

src/main/java/com/dsideal/base/Tools/FillData/Area/A13.java

@@ -245,14 +245,13 @@ public class A13 {
                         }
                     } catch (Exception err) {
                     }
-                    //如果list4的元素个数不足7个，需要补全到7个，空的用空字符串
-                    for (int i = list4.size(); i < 7; i++) {
-                        list4.add("");
-                    }
 
+                    List<String> list5 = get(5);
+                    list4.addAll(list5);
+                    while (list4.size() < 7) list4.add("");
 
                     Row outRow = outSheet.createRow(++rowIndex);
-                    DsKit.putData(outRow, Arrays.asList(areaName, "教育特征","",
+                    DsKit.putData(outRow, Arrays.asList(areaName, "教育特征", "",
                             rs(list4.getFirst()),
                             rs(list4.get(1)),
                             rs(list4.get(2)),
@@ -262,24 +261,18 @@ public class A13 {
                             rs(list4.get(6)),
                             cityName), dataStyle);
 
-                    List<String> list5 = get(5);
-                    //如果list5的元素个数不足8个，需要补全到8个，空的用空字符串
-                    if (list5.size() < 8) {
-                        for (int i = list5.size(); i < 8; i++) {
-                            list5.add("");
-                        }
-                    }
-                    outRow = outSheet.createRow(++rowIndex);
-                    DsKit.putData(outRow, Arrays.asList(areaName, "决策建议",
-                            rs(list5.getFirst()),
-                            rs(list5.get(1)),
-                            rs(list5.get(2)),
-                            rs(list5.get(3)),
-                            rs(list5.get(4)),
-                            rs(list5.get(5)),
-                            rs(list5.get(6)),
-                            rs(list5.get(7)),
-                            cityName), dataStyle);
+
+//                    outRow = outSheet.createRow(++rowIndex);
+//                    DsKit.putData(outRow, Arrays.asList(areaName, "决策建议",
+//                            rs(list5.getFirst()),
+//                            rs(list5.get(1)),
+//                            rs(list5.get(2)),
+//                            rs(list5.get(3)),
+//                            rs(list5.get(4)),
+//                            rs(list5.get(5)),
+//                            rs(list5.get(6)),
+//                            rs(list5.get(7)),
+//                            cityName), dataStyle);
                 }
             }
         }