Merge branch 'test_bak' into 'test'

罗元桥

2021-10-19 b5be008466d57cad8805952c25d2b49282151ca9

Merge branch 'test_bak' into 'test'

Test bak

See merge request root/zhihuishequ!247

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

@@ -108,9 +108,8 @@

    <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.grid_menber_tele,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,vt.exception,p.name,REPLACE(cmpct.label,',','#')
        p.card_no_str,vt.exception,p.name
        FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id
        left join com_mng_population_community_tags AS cmpct on p.id = cmpct.population_id
        left join sys_user u on vt.create_by = u.user_id
        WHERE 1=1
        <if test = "query.visiterId !=null">