修改bug

huanghongfa

2021-07-08 eb19fea84c68d7447b07ee105737d4ea8549249b

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java

@@ -37,6 +37,9 @@

    private Long userId;

    @ApiModelProperty("网格id")
    private Long gridId;

    @ApiModelProperty("正常状态（0.正常 1.异常）")
    private Integer exception;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -90,14 +90,10 @@
        TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.label,u.name as creator,p.nation_code,p.card_no as cardNoStr
        FROM event_visiting_tasks vt
        LEFT JOIN com_mng_population p ON p.id = vt.visiter_id
        LEFT JOIN com_mng_building mb ON(p.floor = mb.name AND p.village_id = mb.village_id)
        LEFT JOIN event_grid_building_relation gbr ON mb.id = gbr.build_id
        LEFT JOIN event_grid_data gd ON gd.id = gbr.grid_id
        LEFT JOIN event_grid_member_relation gmr ON gmr.grid_id = gd.id
        LEFT JOIN sys_user u ON u.user_id = gmr.grid_member_id
        LEFT JOIN sys_user u ON u.user_id = vt.create_by
        where 1=1
        <if test = "query.userId != null">
            and u.user_id = #{query.userId}
        <if test = "query.gridId != null">
            and vt.grid_id = #{query.gridId}
        </if>
        <if test = "query.status == 1">
            and (vt.event_status = 1 or vt.event_status = 3)