From bfc6e3a58a707abbb1aa2d8bd495f5d9698bd442 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index c3920a7..bddd65e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1945,8 +1945,8 @@
public R getGridEventStatisticsByApp(Long gridId, Long userId) {
GridEventStatisticsVO result = this.baseMapper.getGridEventStatisticsByApp(gridId);
if (result != null) {
- result.setTodayNum(result.getTodayNum() + result.getZfTodayNum());
- result.setMonthNum(result.getMonthNum() + result.getZfMonthNum());
+ result.setTodayNum(result.getTodayNum() + result.getZfTodayNum() + result.getSspTodayNum());
+ result.setMonthNum(result.getMonthNum() + result.getZfMonthNum() + result.getSspMonthNum());
// 查询当前网格员下管理的楼栋名称
List<Map<String, Object>> buildNameList = this.baseMapper.getMemberBuildName(userId);
--
Gitblit v1.7.1