首页人员统计

leromro-core/src/main/java/com/leromro/core/controller/OrgStatDataController.java

@@ -152,8 +152,10 @@ public class OrgStatDataController extends BaseController {
             userSummaryVO.setTodayAdd((int) clientList.stream().filter(user -> DateUtil.beginOfDay(user.getCreateTime()).equals(today)).count());
             userSummaryVO.setYesterdayAdd((int) clientList.stream().filter(user -> DateUtil.beginOfDay(user.getCreateTime()).equals(yesterday)).count());
             userSummaryVO.setMonthAdd((int) clientList.stream()
-                    .filter(user -> DateUtil.beginOfDay(user.getCreateTime()).after(firstDayOfMonth))
-                    .filter(user -> DateUtil.beginOfDay(user.getCreateTime()).before(lastDayOfMonth))
+                    .filter(user -> {
+                        Date userDate = DateUtil.beginOfDay(user.getCreateTime());
+                        return !userDate.before(firstDayOfMonth) && !userDate.after(lastDayOfMonth);
+                    })
                     .count());
             //如果为用户则查看用户地址
         } else {
@@ -163,8 +165,10 @@ public class OrgStatDataController extends BaseController {
             userSummaryVO.setTodayAdd((int) volunteerInfoList.stream().filter(user -> DateUtil.beginOfDay(user.getCreateTime()).equals(today)).count());
             userSummaryVO.setYesterdayAdd((int) volunteerInfoList.stream().filter(user -> DateUtil.beginOfDay(user.getCreateTime()).equals(yesterday)).count());
             userSummaryVO.setMonthAdd((int) volunteerInfoList.stream()
-                    .filter(user -> DateUtil.beginOfDay(user.getCreateTime()).after(firstDayOfMonth))
-                    .filter(user -> DateUtil.beginOfDay(user.getCreateTime()).before(lastDayOfMonth))
+                    .filter(user -> {
+                        Date userDate = DateUtil.beginOfDay(user.getCreateTime());
+                        return !userDate.before(firstDayOfMonth) && !userDate.after(lastDayOfMonth);
+                    })
                     .count());
         }
         return R.ok(userSummaryVO);