From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +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 | 11 ++++++++---
1 files changed, 8 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 5b517fd..8a11209 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
@@ -253,14 +253,14 @@
//查询网格员头像,姓名
Map<String,Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
if (!CollectionUtils.isEmpty(gridMember)) {
- eventDetailsVO.setGridMemberName(gridMember.get("name") == null ? "" : gridMember.get("name").toString());
+ eventDetailsVO.setGridMemberName(gridMember.get("nick_name") == null ? "" : gridMember.get("nick_name").toString());
eventDetailsVO.setGridMemberImageUrl(gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
}
if(Objects.equals(eventDO.getGridMemberId(),eventDO.getCreateBy())){
eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
}else{
Map<String,Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
- eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString());
+ eventDetailsVO.setCreator(createUser.get("nick_name") == null ? "" : createUser.get("nick_name").toString());
}
//当事件为特殊人群上报时，需要查询事件与人口关联关系
@@ -1923,7 +1923,12 @@
*/
@Override
public R getGridEventStatisticsByApp(Long gridId){
- return R.ok(this.baseMapper.getGridEventStatisticsByApp(gridId));
+ GridEventStatisticsVO result = this.baseMapper.getGridEventStatisticsByApp(gridId);
+ if(result != null){
+ result.setTodayNum(result.getTodayNum() + result.getZfTodayNum());
+ result.setMonthNum(result.getMonthNum() + result.getZfMonthNum());
+ }
+ return R.ok(result);
}
/**
--
Gitblit v1.7.1