修改bug

huanghongfa

2021-06-23 c019d028e6522b67bc09ab4da29de4eff112568b

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordDetailVO.java

New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.vos.community.screen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


@Data
@ApiModel("大屏事件播报流转记录详情返回参数")
public class EventTransferRecordDetailVO {

    @ApiModelProperty("街道名称")
    private String streetName;
    @ApiModelProperty("社区名称")
    private String communityName;
    @ApiModelProperty("网格名称")
    private String gridName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java

@@ -17,4 +17,31 @@

    @ApiModelProperty("事件处理结果")
    private String processResult;

    @ApiModelProperty("业务处理类型 1 网格员处理 2 派发到社区 3 社区处理 4 社区标为无效 5 标为无效后处理 6 验证 7 撤销 8 重新发布已撤销事件 9 社区重新发布已标为无效的事件")
    private Integer processType;

    @ApiModelProperty("事件处理人")
    private String fromName;

    @ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）",hidden = true)
    private Integer fromType;

    @ApiModelProperty(value = "事件来源机构或网格员",hidden = true)
    private Long fromId;

    @ApiModelProperty("上级关系")
    private String superiorRelationship;

    @ApiModelProperty(value = "事件id",hidden = true)
    private Long eventId;

    /**
     * 来源类型（1、网格员2、社区3、是街道）
     */
    public interface fromType{
        int wgy = 1;
        int sq = 2;
        int jd = 3;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java

@@ -21,6 +21,9 @@
    @ApiModelProperty("发布人id")
    private Long releaseId;

    @ApiModelProperty("发布人头像url")
    private String imageUrl;

    @ApiModelProperty("发布人")
    private String releaseName;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -70,7 +70,7 @@
    @Select("<script> \n"+
            "SELECT\n" +
            "nc.*,\n" +
            "u.`nick_name` AS releaseName,u.`type` as userType\n" +
            "u.`nick_name` AS releaseName,u.`type` as userType,u.image_url\n" +
            ",u.name as communityName\n" +
            "FROM\n" +
            "com_act_neighbor_circle nc\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -842,9 +842,25 @@
            " e.id = #{eventId}")
    EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);

    @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}")
    @Select("select process_date,process_result,process_type,from_type,from_id,from_name,event_id from event_transfer_record where event_id = #{eventId}")
    List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);

    @Select("SELECT " +
            " cs.address AS streetName, " +
            " ca.`name` AS communityName, " +
            " egd.grid_name  " +
            "FROM " +
            " `event` AS e " +
            " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
            " LEFT JOIN com_act AS ca ON egd.grid_community_id = ca.community_id " +
            " LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id  " +
            "WHERE " +
            " e.id = #{eventId}")
    EventTransferRecordDetailVO getEventScreenEventTransDetail(@Param("eventId") Long eventId);

    @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = #{communityId}")
    EventTransferRecordDetailVO getEventScreenEventTransDetailByCommunityId(@Param("communityId") Long communityId);

    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
    Integer getStatisticsCount(@Param("communityId") Long communityId);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -1415,6 +1415,21 @@

                //查询事件流转记录
                List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
                if(!transferRecordList.isEmpty()){
                    transferRecordList.forEach(transfer -> {
                        if(transfer.getFromType().equals(EventTransferRecordVO.fromType.wgy)){
                            //查询上级网格信息
                            EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
                            transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
                                    + transferRecordDetailVO.getCommunityName() + "-" + transferRecordDetailVO.getGridName());
                        }else if(transfer.getFromType().equals(EventTransferRecordVO.fromType.sq)){
                            //查询上级社区信息
                            EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
                            transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
                                    + transferRecordDetailVO.getCommunityName());
                        }
                    });
                }
                statisticsVO.setTransferRecordList(transferRecordList);
            }
        }