From 31ccc7365bfc8a55faec6c8cac875edc8e095585 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 29 九月 2021 11:34:41 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..d6b0c01 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
@@ -317,7 +317,9 @@
if (eventMapper.insert(eventDO) == 1) {
// 如果是特殊人群，则新增特殊人群与事件关系
- if (commonEventAddDTO.getEventType().equals(6)) {
+ if (commonEventAddDTO.getEventType().equals(6)
+ && commonEventAddDTO.getPopulationIds() != null
+ && commonEventAddDTO.getPopulationIds().size() > 0) {
if (commonEventAddDTO.getPopulationIds() != null && commonEventAddDTO.getPopulationIds().size() > 0) {
List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>();
commonEventAddDTO.getPopulationIds().forEach(populationId -> {
@@ -1945,8 +1947,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