修改首页图表

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/controller/HlwPaymentDetailController.java

@@ -379,25 +379,18 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
     public Result<?> getIndexMiddleUserInfo() throws ParseException {
         //存放返回数据结果
         List list = new ArrayList();
-        Calendar cal = Calendar.getInstance();
-        int day = cal.get(Calendar.DATE);
-        int month = cal.get(Calendar.MONTH) + 1;
-        int year = cal.get(Calendar.YEAR);
+        //当天时间
+        LocalDate localDate = LocalDate.now();
+        //前一个月开始倒推6个月
         for (int i = 0; i < 6; i++) {
             Map map = new HashMap();
-            if (month == 1) {
-                month = 12;
-                year = year - 1;
-            } else {
-                month = month - 1;
-            }
-            String date = year + "-" + (month < 10 ? "0" + month : month) + "-" + day;
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            int increasedUser = hlwUserMapper.monthAddUser(sdf.parse(date));
-            map.put("increasedUser", increasedUser);
-            map.put("date", year + "-" + (month < 10 ? "0" + month : month));
+            LocalDate lastDate = localDate.minusMonths(i + 1);
+            int increasedUser = hlwUserMapper.monthAddUser(DateUtils.asDate(lastDate));
+            map.put("value", increasedUser);
+            map.put("x", lastDate.toString().substring(0, 7));
             list.add(0, map);
         }
+
         return Result.ok(list);
     }
 
@@ -421,26 +414,17 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
         list.add(monthOrder);
         list.add(yearOrder);
 
-        //半年订单图表数据
-        Calendar cal = Calendar.getInstance();
-        int day = cal.get(Calendar.DATE);
-        int month = cal.get(Calendar.MONTH) + 1;
-        int year = cal.get(Calendar.YEAR);
+        //当天时间
+        LocalDate localDate = LocalDate.now();
         //存放图表所需年月+付款数据
         List<Map> list1 = new ArrayList<>();
+        //半年订单图表数据
         for (int i = 0; i < 6; i++) {
             Map map = new HashMap();
-            if (month == 1) {
-                month = 12;
-                year = year - 1;
-            } else {
-                month = month - 1;
-            }
-            String date = year + "-" + (month < 10 ? "0" + month : month) + "-" + day;
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            int monthOrder1 = hlwOrderMapper.monthAddOrder(sdf.parse(date));
-            map.put("monthOrder", monthOrder1);
-            map.put("date", year + "-" + (month < 10 ? "0" + month : month));
+            LocalDate lastDate = localDate.minusMonths(i + 1);
+            int monthOrder1 = hlwOrderMapper.monthAddOrder(DateUtils.asDate(lastDate));
+            map.put("value", monthOrder1);
+            map.put("x", lastDate.toString().substring(0, 7));
             list1.add(0, map);
         }
         list.add(list1);