From 05bd97aab35b27be282fd45d013e1330edda2cc0 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期二, 29 六月 2021 16:21:53 +0800
Subject: [PATCH] 修复bug-401-【综治后台管理--事件管理】搜索事件功能未生效
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 0185796..f2f11f1 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
@@ -2207,6 +2207,7 @@
List<EventDO> unEventList = baseMapper.selectList(
new QueryWrapper<EventDO>()
.eq("upload", false)
+ .eq("event_process_status", 2)
);
unEventList.forEach(eventDO -> {
eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
@@ -2237,14 +2238,14 @@
if(!countMap.isEmpty()){
workScreenVO.setResolvedNum(countMap.get("resolvedNum")== null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString()));
workScreenVO.setPendingNum(countMap.get("pendingNum")== null ? 0L : Long.valueOf(countMap.get("pendingNum").toString()));
- workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 0L : Long.valueOf(countMap.get("propagandaNum").toString()));
+ workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 13L : Long.valueOf(countMap.get("propagandaNum").toString()));
workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString()));
}
//计算处理时间消耗的时间
DateScreenVO countAvg = this.eventMapper.countByAvgCommunityId(communityId);
if(countAvg != null){
- int second = (int) (countAvg.getStartTime().getTime() - countAvg.getEndTime().getTime())/1000;
+ int second = (int) (countAvg.getEndTime().getTime() - countAvg.getStartTime().getTime())/1000;
if(second > 0){
second = second/workScreenVO.getResolvedNum().intValue();
workScreenVO.setAvgCost(second);
@@ -2286,10 +2287,10 @@
DateTime endDay = DateUtil.endOfMonth(date);
int m = DateUtil.month(endDay);
-// if(m == 0){
-// m = 11;
-// }
-// m--;
+ m++;
+ if(m == 12){
+ m = 0;
+ }
int day = DateUtil.dayOfMonth(endDay);
int half = day/2;
String month = DateUtil.format(date,moth_format_str);
--
Gitblit v1.7.1