springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/MemberStatisticsAdminDTO.java
New file @@ -0,0 +1,28 @@ package com.panzhihua.common.model.dtos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("分页查询网格员统计请求参数") public class MemberStatisticsAdminDTO { @ApiModelProperty(value = "分页-当前页数", example = "1") private Long pageNum = 1L; @ApiModelProperty(value = "分页-每页记录数", example = "10") private Long pageSize = 10L; @ApiModelProperty(value = "查询开始时间") private String startTime; @ApiModelProperty(value = "查询结束时间") private String endTime; @ApiModelProperty(value = "网格员名称") private String nickName; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java
@@ -1,5 +1,7 @@ package com.panzhihua.common.model.vos.grid; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +15,7 @@ public class EventGridAdminVO { @ApiModelProperty(value = "网格id") @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value = "网格名称") private String gridName; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsAllAdminVO.java
New file @@ -0,0 +1,32 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("管理后台统计网格所有事件返回参数") public class EventStatisticsAllAdminVO { @ApiModelProperty(value = "发布事件总数") private Integer eventTotal; @ApiModelProperty(value = "处理事件总数") private Integer handleEventTotal; @ApiModelProperty(value = "发布宣传教育总数") private Integer propagandaEducationTotal; @ApiModelProperty(value = "随手拍处理总数") private Integer easyPhotoTotal; @ApiModelProperty(value = "新增居民数") private Integer addResidentTotal = 0; @ApiModelProperty(value = "新增实有房屋数") private Integer addHouseTotal = 0; @ApiModelProperty(value = "完成走访数") private Integer finishVisitTotal = 0; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventStatisticsMemberAdminVO.java
New file @@ -0,0 +1,65 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("管理后台统计网格员返回参数") public class EventStatisticsMemberAdminVO { @ApiModelProperty(value = "网格员名称") private String nickName; @ApiModelProperty(value = "发布突发事件") private Integer addTFTotal; @ApiModelProperty(value = "处理突发事件") private Integer handleTFTotal; @ApiModelProperty(value = "发布矛盾纠纷") private Integer addMDTotal; @ApiModelProperty(value = "处理矛盾纠纷") private Integer handleMDTotal; @ApiModelProperty(value = "发布治安隐患") private Integer addZATotal; @ApiModelProperty(value = "处理治安隐患") private Integer handleZATotal; @ApiModelProperty(value = "发布不稳定因素") private Integer addBWDTotal; @ApiModelProperty(value = "处理不稳定因素") private Integer handleBWDTotal; @ApiModelProperty(value = "发布公共服务") private Integer addGGTotal; @ApiModelProperty(value = "处理公共服务") private Integer handleGGTotal; @ApiModelProperty(value = "发布特殊人群") private Integer addTSTotal; @ApiModelProperty(value = "处理特殊人群") private Integer handleTSTotal; @ApiModelProperty(value = "完成走访任务") private Integer handleZFTotal; @ApiModelProperty(value = "处理随手拍") private Integer easyPhotoTotal; @ApiModelProperty(value = "发布宣传教育") private Integer propagandaEducationTotal; @ApiModelProperty(value = "新增居民数") private Integer addResidentTotal = 0; @ApiModelProperty(value = "新增实有房屋数") private Integer addHouseTotal = 0; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -6,6 +6,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; /** * * @author cedoo email:cedoo(a)qq.com @@ -795,4 +797,28 @@ */ @PostMapping("/eventgriddata/communitygrid") R getGridDataListByCommunity(@RequestParam("gridId") Long communityId); /** * 后台管理-统计模块 * @param communityId 社区id * @return 统计信息 */ @GetMapping("/statistics/admin/eventStatistics") R eventStatistics(@RequestParam("communityId") Long communityId); /** * 后台管理-删除网格 * @param Ids 网格id集合 * @return 删除结果 */ @PostMapping("/eventgriddata/data/delete") R deleteGridData(@RequestBody List<Long> Ids); /** * 后台管理-网格员统计 * @param statisticsAdminDTO 请求参数 * @return 网格员统计信息 */ @GetMapping("/statistics/admin/gridMemberStatistics") R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java
@@ -16,10 +16,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.Base64; import java.util.List; import java.util.UUID; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; /** @@ -105,4 +102,52 @@ } @ApiOperation(value = "批量上传照片/视频 (jpg/jpeg/png/mp4/mov)") @PostMapping(value = "uploads", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R uploadImages(@RequestParam MultipartFile[] files, HttpServletRequest request) throws IOException { // 微信图片内容校验 // WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService(); String property = System.getProperty("user.dir"); String fileExtension = ".jpg"; List<String> urlList = new ArrayList<>(); SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); for (MultipartFile file:files) { String originName = file.getOriginalFilename(); AtomicBoolean isVideo = new AtomicBoolean(false); videoExtensionAllow.forEach(ext ->{ String originNameLowerCase = originName.toLowerCase(); if(originNameLowerCase.endsWith("." +ext)){ isVideo.set(true); } }); if(isVideo.get()){ fileExtension = ".mp4"; } if(originName.toLowerCase().endsWith(".mp3")){ fileExtension = ".mp3"; } String name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension; try { InputStream is = file.getInputStream(); String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension; File file1 = new File(fileName); file.transferTo(file1); boolean delete = file1.delete(); log.info("临时文件删除【{}】", delete); sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is); urlList.add(url + "/idcard/" + name); } catch (Exception e) { log.error("上传文件失败【{}】", e.getMessage()); return R.fail(); } } sftp.logout(); return R.ok(urlList); } } springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
@@ -16,6 +16,7 @@ import com.panzhihua.common.service.grid.GridService; import javax.annotation.Resource; import java.util.List; /** * @@ -80,4 +81,13 @@ return gridService.editGridDataByAdmin(eventGridDataDTO); } @ApiOperation(value = "删除网格") @PostMapping("/event/delete") public R deleteGridData(@RequestBody List<Long> Ids){ if(Ids.isEmpty()){ return R.fail("参数错误"); } return gridService.deleteGridData(Ids); } } springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/StatisticsApi.java
New file @@ -0,0 +1,56 @@ package com.panzhihua.grid_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO; import com.panzhihua.common.model.dtos.grid.PageEventManageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventStatisticsAllAdminVO; import com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO; import com.panzhihua.common.model.vos.grid.EventVO; import com.panzhihua.common.service.grid.GridService; import com.panzhihua.common.utlis.ClazzUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * 统计模块 */ @Slf4j @RestController @RequestMapping("/statistics/") @Api(tags = {"统计模块 @lyq"}) public class StatisticsApi extends BaseController { @Resource private GridService gridService; @ApiOperation(value = "事件统计", response= EventStatisticsAllAdminVO.class) @GetMapping("/eventStatistics") public R eventStatistics(){ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); if(loginUserInfoVO == null){ return R.fail("请先登录"); } return gridService.eventStatistics(loginUserInfoVO.getCommunityId()); } @ApiOperation(value = "网格员统计", response= EventStatisticsMemberAdminVO.class) @GetMapping("/gridMemberStatistics") public R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO){ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); if(loginUserInfoVO == null){ return R.fail("请先登录"); } if(statisticsAdminDTO.getCommunityId() == null){ statisticsAdminDTO.setCommunityId(loginUserInfoVO.getCommunityId()); } return gridService.gridMemberStatistics(statisticsAdminDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * @@ -160,4 +161,9 @@ } @PostMapping("/data/delete") public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){ return eventGridDataService.deleteGridDataByAdmin(Ids); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
New file @@ -0,0 +1,38 @@ package com.panzhihua.service_grid.api; import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_grid.service.EventService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @Slf4j @RestController @RequestMapping("/statistics/") public class StatisticsApi { @Resource private EventService eventService; /** * 后台管理-统计模块 * @param communityId 社区id * @return 统计信息 */ @GetMapping("/admin/eventStatistics") public R eventStatistics(@RequestParam("communityId") Long communityId){ return eventService.eventStatistics(communityId); } /** * 后台管理-网格员统计 * @param statisticsAdminDTO 请求参数 * @return 网格员统计信息 */ @PostMapping("/admin/gridMemberStatistics") public R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO){ return eventService.gridMemberStatistics(statisticsAdminDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO; import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO; import com.panzhihua.common.model.vos.grid.EventMapGridVO; import com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO; import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO; import org.apache.ibatis.annotations.Mapper; @@ -39,4 +41,11 @@ */ List<EventMapGridVO> getMapGridListByApp(@Param("userId") Long userId); /** * 后台管理-网格员统计 * @param statisticsAdminDTO 请求参数 * @return 网格员统计信息 */ IPage<EventStatisticsMemberAdminVO> gridMemberStatistics(Page page, @Param("statisticsAdminDTO") MemberStatisticsAdminDTO statisticsAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.grid.PageEventDTO; import com.panzhihua.common.model.dtos.grid.PageEventManageDTO; import com.panzhihua.common.model.dtos.grid.PagePublicityEventCommunityDTO; import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.grid.ComMapGridEventVO; import com.panzhihua.common.model.vos.grid.EventStatisticsAllAdminVO; import com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO; import com.panzhihua.service_grid.model.dos.EventDO; import com.panzhihua.common.model.vos.grid.EventVO; import org.apache.ibatis.annotations.Mapper; @@ -71,4 +70,13 @@ * @return */ IPage<EventVO> findCommunityPublicityByPage(Page page, @Param("pagePublicityEventCommunityDTO") PagePublicityEventCommunityDTO pagePublicityEventCommunityDTO); /** * 后台管理-统计模块 * @param communityId 社区id * @return 统计信息 */ EventStatisticsAllAdminVO eventStatistics(@Param("communityId") Long communityId); Integer getEventCountByGridIds(@Param("ids") List<Long> ids); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
@@ -8,6 +8,8 @@ import com.panzhihua.common.model.vos.grid.EventGridDataVO; import com.panzhihua.service_grid.model.dos.EventGridDataDO; import java.util.List; /** * 区县/街道/社区/网格员网格数据管理 service * @@ -109,4 +111,6 @@ * @return */ R getGridDataListByCommunity(Long communityId); R deleteGridDataByAdmin(List<Long> Ids); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -177,4 +177,18 @@ * @return */ R selectCommunityPublicity(PagePublicityEventCommunityDTO pagePublicityEventDTO); /** * 后台管理-统计模块 * @param communityId 社区id * @return 统计信息 */ R eventStatistics(Long communityId); /** * 后台管理-网格员统计 * @param statisticsAdminDTO 请求参数 * @return 网格员统计信息 */ R gridMemberStatistics(MemberStatisticsAdminDTO statisticsAdminDTO); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java
@@ -223,7 +223,17 @@ */ @Override public R easyListByAdmin(PageEasyAdminDTO easyAppDTO){ return R.ok(this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO)); IPage<ComActEasyPhotoAdminVO> photoAdminVOIPage = this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO); if(!photoAdminVOIPage.getRecords().isEmpty()){ photoAdminVOIPage.getRecords().forEach(photoAdmin -> { //随手拍已处理,查询随手拍类型 List<String> photoTypeList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdmin.getId()); if(!photoTypeList.isEmpty()){ photoAdmin.setPhotoTypeList(photoTypeList); } }); } return R.ok(photoAdminVOIPage); } /** springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -259,4 +259,18 @@ return R.ok(eventGridDataAreaVOList); } @Override public R deleteGridDataByAdmin(List<Long> Ids){ Integer count = eventMapper.getEventCountByGridIds(Ids); if(count > 0){ return R.fail("您选择的网格已发布过事件,不可删除"); } if(this.baseMapper.deleteBatchIds(Ids) > 0){ return R.ok(); }else{ return R.fail(); } } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -52,6 +52,8 @@ private CommunityService communityService; @Resource private EventGridDataMapper eventGridDataMapper; @Resource private EventGridMemberRelationMapper eventGridMemberRelationMapper; /** * 分页查找事件 @@ -1578,4 +1580,23 @@ } return -1; } /** * 后台管理-统计模块 * @param communityId 社区id * @return 统计信息 */ @Override public R eventStatistics(Long communityId){ return R.ok(this.baseMapper.eventStatistics(communityId)); } /** * 后台管理-网格员统计 * @param statisticsAdminDTO 请求参数 * @return 网格员统计信息 */ @Override public R gridMemberStatistics(MemberStatisticsAdminDTO statisticsAdminDTO){ return R.ok(eventGridMemberRelationMapper.gridMemberStatistics(new Page(statisticsAdminDTO.getPageNum(),statisticsAdminDTO.getPageSize()),statisticsAdminDTO)); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml
@@ -191,9 +191,9 @@ </if> <if test="photoEditDTO.ids!=null and photoEditDTO.ids.size > 0"> where id in <foreach collection='photoEditDTO.ids' item='id' index='index' open='(' close=')' separator=',' > + #{id} + </foreach> + <foreach collection='photoEditDTO.ids' item='id' index='index' open='(' close=')' separator=',' > #{id} </foreach> </if> </update> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml
@@ -69,5 +69,251 @@ WHERE grid_member_id = #{userId} </select> <select id="gridMemberStatistics" resultType="com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO" parameterType="com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO"> SELECT DISTINCT su.nick_name,( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 5 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS addTFTotal, ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 5 AND event_status = 2 AND event_process_status = 2 AND process_user_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleTFTotal,( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS addMDTotal, ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 3 AND event_status = 2 AND event_process_status = 2 AND process_user_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleMDTotal,( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS addZATotal, ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 1 AND event_status = 2 AND event_process_status = 2 AND process_user_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleZATotal,( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 4 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS addBWDTotal, ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 4 AND event_status = 2 AND event_process_status = 2 AND process_user_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleBWDTotal,( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS addGGTotal, ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 2 AND event_status = 2 AND event_process_status = 2 AND process_user_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleGGTotal,( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS addTSTotal, ( SELECT count( id ) FROM `event` WHERE event_category = 1 AND event_type = 6 AND event_status = 2 AND event_process_status = 2 AND process_user_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleTSTotal, ( SELECT count( id ) FROM event_visiting_tasks WHERE dell_user_id = su.user_id AND event_status = 2 <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(dell_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(dell_date,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS handleZFTotal, ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 AND handler_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(feedback_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(feedback_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS easyPhotoTotal, ( SELECT count( id ) FROM `event` WHERE event_category = 2 AND event_status = 2 AND grid_member_id = su.user_id <if test="statisticsAdminDTO.startTime!=null and statisticsAdminDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{statisticsAdminDTO.startTime} </if> <if test="statisticsAdminDTO.endTime!=null and statisticsAdminDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{statisticsAdminDTO.endTime} </if> ) AS propagandaEducationTotal FROM sys_user AS su LEFT JOIN `event` AS e ON su.user_id = e.grid_member_id WHERE su.type = 6 <if test="statisticsAdminDTO.communityId!=null"> AND su.community_id = #{statisticsAdminDTO.communityId} </if> <if test="statisticsAdminDTO.nickName!=null and statisticsAdminDTO.nickName != """> AND su.nick_name like concat (#{statisticsAdminDTO.nickName},'%') </if> ORDER BY su.create_at desc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -508,4 +508,44 @@ ORDER BY e.${pagePublicityEventCommunityDTO.sortColumns} ${pagePublicityEventCommunityDTO.sortType} </if> </select> <select id="eventStatistics" resultType="com.panzhihua.common.model.vos.grid.EventStatisticsAllAdminVO"> SELECT count( e.id ) AS eventTotal,( SELECT count( e.id ) FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id WHERE egd.grid_community_id = #{communityId} AND e.event_status = 2 AND e.event_process_status = 2 ) AS handleEventTotal, ( SELECT count( e.id ) FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id WHERE egd.grid_community_id = #{communityId} AND e.event_category = 2 AND e.event_status = 2 ) AS propagandaEducationTotal, ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 AND community_id = #{communityId} ) AS easyPhotoTotal FROM `event` AS e LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id WHERE egd.grid_community_id = #{communityId} AND e.event_status = 2 </select> <select id="getEventCountByGridIds" resultType="Integer"> select count(id) from event where grid_id in <foreach item="item" collection="ids" separator="," open="(" close=")" index=""> #{item} </foreach> </select> </mapper>