add:网格名称

CeDo

2021-06-03 8f71636ce6617933c16a71efaa30417841152796

add:网格名称

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java

@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "网格ID")
    private Long gridId;

    @ApiModelProperty(value = "网格名称")
    private String gridName;

    @ApiModelProperty(value = "网格员")
    private Long gridMemberId;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -508,8 +508,8 @@
     * @param eventGridStatisticsDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridData")
    R getGridData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
    @PostMapping("/eventgriddata/getGridStatisticsdData")
    R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);

    /**
     * 查询用户网格

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java

@@ -76,7 +76,7 @@
        EventGridStatisticsDataDTO eventGridStatisticsDataDTO = new EventGridStatisticsDataDTO();
        eventGridStatisticsDataDTO.setUserId(loginUserInfoVO.getUserId());
        eventGridStatisticsDataDTO.setGridId(gridId);
        return gridService.getGridData(eventGridStatisticsDataDTO);
        return gridService.getGridStatisticsdData(eventGridStatisticsDataDTO);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java

@@ -98,4 +98,13 @@
        return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
    }

    /**
     * 网格数据待处理统计信息
     * @param eventGridStatisticsDataDTO
     * @return
     */
    @PostMapping("/eventgriddata/getGridStatisticsdData")
    R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO){
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java

@@ -13,6 +13,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
 *
@@ -45,5 +47,5 @@
     * @param eventGridTodoDataDTO
     * @return
     */
    UserEventGridDataVO getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
    List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -138,7 +138,7 @@

    @Override
    public R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO) {
        UserEventGridDataVO userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
        List<UserEventGridDataVO> userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
        return R.ok(userEventGridDataVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -49,6 +49,8 @@
    private EventTransferRecordService eventTransferRecordService;
    @Resource
    private CommunityService communityService;
    @Resource
    private EventGridDataMapper eventGridDataMapper;


    /**
@@ -156,6 +158,10 @@
                eventDealStatus=6;//"已撤销"
            }
            eventDetailsVO.setEventDealStatus(eventDealStatus);

            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
            eventDetailsVO.setGridName(eventGridDataDO.getGridName());

            //查询事件关联附件
            List<EventResourceDO> eventResourceDOList =
                    eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()