'commit'

src/main/java/UnitTest/TestHtml.java

@@ -17,7 +17,8 @@ public class TestHtml {
                 //将input_name去掉最后的数字，转为通用前缀
                 String regex = "\\d";
                 String prefix = input_name.replaceAll(regex, "");
-                System.out.println(input_name + " " + input_value + " " + prefix);
+                //System.out.println(input_name + " " + input_value + " " + prefix);
+                System.out.println(prefix);
             }
         });
     }

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -2025,6 +2025,7 @@ public class ZbdcModel {
                 res.add(CommonUtil.convertJsonObjectToRecord(j));
             }
         }
+        res = expandList(res, year);
         addSummaryRow(res);
         return res;
     }
@@ -2039,10 +2040,7 @@ public class ZbdcModel {
         if (list.isEmpty()) return null;
 
         //行政区划
-        List<Record> listXzqh = getQueryXzqh(year, -2);
-        Record r = new Record();
-        r.set("area_name", "市直");
-        listXzqh.add(r);
+        List<Record> listXzqh = getXzqhList();
         //有用的记录
         Record originalRecord = list.getFirst();
         // 遍历每个属性，如果不是area_name,那么给初值0