From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 0b39198..4d51dc6 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
@@ -1021,6 +1021,7 @@
}
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
+ eventDO.setHappenTime(publicityEventAddDTO.getPropagandaTime());
eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
eventDO.setEventCategory(2l);//宣传事件
eventDO.setEventStatus(2);//事件状态 2发布
@@ -2281,6 +2282,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);
}
@@ -2303,11 +2307,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;
}
@@ -2317,23 +2321,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