| | |
|---|
| | | } |
|---|
| | | EventDO eventDO = new EventDO(); |
|---|
| | | BeanUtils.copyProperties(publicityEventAddDTO, eventDO); |
|---|
| | | eventDO.setHappenTime(publicityEventAddDTO.getPropagandaTime()); |
|---|
| | | eventDO.setGridMemberId(publicityEventAddDTO.getUserId()); |
|---|
| | | eventDO.setEventCategory(2l);//宣传事件 |
|---|
| | | eventDO.setEventStatus(2);//事件状态 2发布 |
|---|
| | |
|---|
| | | 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); |
|---|
| | | } |
|---|
| | |
|---|
| | | 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; |
|---|
| | | } |
|---|
| | |
|---|
| | | 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)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
