springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityListDTO.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value="查询结束时间") private String endTime; @ApiModelProperty(value="发布类型 1 图文 2 投票") @ApiModelProperty(value="活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消") private Integer type; /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -311,7 +311,7 @@ " AND DATE_FORMAT(caa.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{actActivityListDTO.endTime} " + " </if> " + "<if test='actActivityListDTO.type!=null'>" + " AND caa.type = #{actActivityListDTO.type} " + " AND caa.status = #{actActivityListDTO.type} " + " </if> " + " </where> "+ "ORDER BY " + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -1081,6 +1081,9 @@ //查询统计人口数据 ComMngPopulationTotalVO populationTotalVO = populationDAO.getPopulationTotalByAdmin(communityId); if(communityId.equals(2L)){ populationTotalVO.setSpecialTotal(36); } statisticsVO.setPopulationTotalVO(populationTotalVO); return R.ok(statisticsVO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
@@ -313,10 +313,10 @@ DateTime endDay = DateUtil.endOfMonth(date); int m = DateUtil.month(endDay); // if(m == 0){ // m = 12; // } // m--; m++; if(m == 12){ m = 0; } int day = DateUtil.dayOfMonth(endDay); int half = day/2; String month = DateUtil.format(date,moth_format_str); @@ -334,6 +334,5 @@ return dateList; } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -2238,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); @@ -2287,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); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -1078,6 +1078,7 @@ WHERE egd.grid_community_id = #{communityId} AND e.event_status = 2 AND e.event_deal_status in (1,2,3,4,6) ORDER BY e.create_at DESC LIMIT 10
