修改bug

huanghongfa

2021-07-02 b26d7102509a1e2f3b9ccd179aa54323d12926b4

修改bug

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

@@ -36,4 +36,7 @@
    private Long communityId;

    private Long userId;

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/AppVisitTasksVO.java

@@ -73,6 +73,9 @@
    @ApiModelProperty("状态")
    private String eventStatusName;

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

    public String getEventStatusName() {

        return EventTasksStatusEnum.getName(eventStatus);

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

@@ -111,7 +111,7 @@

    <select id="list" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.AppVisitTasksVO">
        SELECT vt.id,vt.visiter_name,vt.grid_member,vt.grid_member_name,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.create_at,u.name as creator,vt.event_status,vt.visiter_address,vt.happent_lat_lng,
        p.card_no_str,p.name,REPLACE(p.label,',','#')
        p.card_no_str,vt.exception,p.name,REPLACE(p.label,',','#')
        FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id
        left join sys_user u on vt.create_by = u.user_id
        WHERE 1=1
@@ -121,6 +121,9 @@
        <if test = "query.eventStatus == 0">
            and (vt.event_status = 3 or vt.event_status = 7)
        </if>
        <if test = "query.exception != null">
            and vt.exception = #{query.exception}
        </if>
        <if test = "query.eventStatus == 3 or query.eventStatus == 7">
            and vt.event_status = #{query.eventStatus}
        </if>