From d55aa8ce835cd7150dca26280f15fa0b60f37864 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 14 七月 2021 17:18:57 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 3b82fcd..cdbec76 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
@@ -264,7 +264,7 @@
}
//当事件为特殊人群上报时，需要查询事件与人口关联关系
- if(eventDetailsVO.getEventType().equals(6)){
+ if(eventDetailsVO.getEventType() != null && eventDetailsVO.getEventType().equals(6)){
List<EventSpecialPopulationDetailsVO> specialPopulationList = eventSpecialCrowdRecordMapper.getSpecialPopulationIds(eventDetailsVO.getId());
if(!specialPopulationList.isEmpty()){
specialPopulationList.forEach(special -> {
@@ -735,15 +735,20 @@
public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
//boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
- boolean canRepublishByUser = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态
+ boolean canRepublishByUser = eventDO.getEventDealStatus() == 6|eventDO.getEventDealStatus() == 5; //已失效状态
if (!canRepublishByUser) {
return R.fail("当前不是撤销/草稿状态");
}
+ if(eventDO.getEventCategory().equals(2L)){//宣传教育
+ eventDO.setEventDealStatus(8);
+ }else{
+ eventDO.setEventProcessStatus(1); //待解决
+ eventDO.setProcessType(1); //网格员处理
+ }
eventDO.setEventStatus(2);//2 发布
- eventDO.setEventProcessStatus(1); //待解决
- eventDO.setProcessType(1); //网格员处理
eventDO.setUpdateBy(commonEventRepublishDTO.getUserId());
+
int updated = this.getBaseMapper().updateById(eventDO);
if (updated != 1) {
return R.fail("更新事件状态失败");
@@ -1021,6 +1026,7 @@
}
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
+ eventDO.setHappenTime(publicityEventAddDTO.getPropagandaTime());
eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
eventDO.setEventCategory(2l);//宣传事件
eventDO.setEventStatus(2);//事件状态 2发布
@@ -1939,6 +1945,16 @@
statisticsDetailVO.setNoEventZFTotal(0);
}
+ //查询网格
+ EventGridDataDO gridDataDO = eventGridDataMapper.selectById(statisticsDTO.getGridId());
+ if(gridDataDO != null){
+ Map<String,Long> sspCountMap = this.baseMapper.getSSPEventTotal(gridDataDO.getGridCommunityId());
+ if(!sspCountMap.isEmpty()){
+ statisticsDetailVO.setEventSSPTotal(sspCountMap.get("eventSSPTotal")!=null?sspCountMap.get("eventSSPTotal").intValue():0);
+ statisticsDetailVO.setNoEventSSPTotal(sspCountMap.get("noEventSSPTotal")!=null?sspCountMap.get("noEventSSPTotal").intValue():0);
+ }
+ }
+
//统计数据
Integer sum = statisticsDetailVO.getEventTFTotal() + statisticsDetailVO.getEventMDTotal() + statisticsDetailVO.getEventZATotal()
+ statisticsDetailVO.getEventBWDTotal() + statisticsDetailVO.getEventTSTotal() + statisticsDetailVO.getEventGGTotal()
@@ -2249,7 +2265,7 @@
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 ? 13L : Long.valueOf(countMap.get("propagandaNum").toString()));
- workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString()));
+ workScreenVO.setCurrentNum(countMap.get("sspCurrentNum") + countMap.get("currentNum"));
}
//计算处理时间消耗的时间
@@ -2271,6 +2287,9 @@
List<EventWorkVO> list = new ArrayList<>();
for(EventWorkVO eventWorkVO: listHalfYearByDyn()){
EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId);
+ result.setEventTotal(result.getEventTotal() + result.getSspTotal());
+ result.setEventAdd(result.getEventAdd() + result.getSspAdd());
+ result.setEventSolve(result.getEventSolve() + result.getSspSolve());
result.setMonth(eventWorkVO.getMonth());
list.add(result);
}
@@ -2293,11 +2312,11 @@
List<EventWorkVO> dateList = new ArrayList<>();
Date now = new Date();
for(int i= 6;i>=1;i--){
- Date date = DateUtils.getDateM(now,-i);
+ Date date = DateUtils.getDateM(now,-(i-1));
DateTime endDay = DateUtil.endOfMonth(date);
int m = DateUtil.month(endDay);
- m++;
+// m++;
if(m == 12){
m = 0;
}
@@ -2307,23 +2326,14 @@
EventWorkVO eventWorkVO = new EventWorkVO();
eventWorkVO.setMonth(monthStr[m]+"月上旬");
eventWorkVO.setStart(month+ "-01 00:00:00");
- eventWorkVO.setEnd(month+ "-"+half+" 23:59:58");
+ eventWorkVO.setEnd(month+ "-"+half+" 23:59:59");
dateList.add(eventWorkVO);
EventWorkVO eventWorkVO1 = new EventWorkVO();
eventWorkVO1.setMonth(monthStr[m]+"月下旬");
- eventWorkVO1.setStart(month+ "-"+half+" 23:59:58");
+ eventWorkVO1.setStart(month+ "-"+half+" 23:59:59");
eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay,"yyyy-MM-dd HH:mm:ss"));
dateList.add(eventWorkVO1);
}
return dateList;
-
}
-
- public static void main(String[] args) {
- String content = "30,104";
- String re = "[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?";
-
- System.out.println(content.matches(re));
- }
-
}
--
Gitblit v1.7.1