年份修改成TREE

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhJctbServiceImpl.java

@@ -201,7 +201,7 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
             d_map0.put("quarter", yearN);
             d_map0.put("startTime", yearN + "-01-01 00:00:00");
             d_map0.put("endTime", yearN + "-12-31 23:59:59");
-            retList.add(d_map0);
+            List<Map<String, Object>> retYearList = new ArrayList<>();
             for (int i = 1; i <= mor; i++) {
                 Map<String, Object> d_map = new HashMap<>();
                 d_map.put("year", yearN);
@@ -209,27 +209,29 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
                 String d_startTime = null;
                 String d_endTime = null;
                 if (i == 1) {
-                    d_quarter = "-" + yearN + "年第一季度";
+                    d_quarter = yearN + "年第一季度";
                     d_startTime = "-01-01 00:00:00";
                     d_endTime = "-03-31 23:59:59";
                 } else if (i == 2) {
-                    d_quarter = "-" + yearN + "年第二季度";
+                    d_quarter = yearN + "年第二季度";
                     d_startTime = "-04-01 00:00:00";
                     d_endTime = "-06-30 23:59:59";
                 } else if (i == 3) {
-                    d_quarter = "-" + yearN + "年第三季度";
+                    d_quarter = yearN + "年第三季度";
                     d_startTime = "-07-01 00:00:00";
                     d_endTime = "-09-30 23:59:59";
                 } else if (i == 4) {
-                    d_quarter = "-" + yearN + "年第四季度";
+                    d_quarter = yearN + "年第四季度";
                     d_startTime = "-10-01 00:00:00";
                     d_endTime = "-12-31 23:59:59";
                 }
                 d_map.put("quarter", d_quarter);
                 d_map.put("startTime", yearN + d_startTime);
                 d_map.put("endTime", yearN + d_endTime);
-                retList.add(d_map);
+                retYearList.add(d_map);
             }
+            d_map0.put("children", retYearList);
+            retList.add(d_map0);
         }
         return retList;
     }