报警bug修改

101captain

2021-10-13 6a6b006f0d6f3c0857efa061f75cdb2e2950d857

报警bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml

@@ -18,7 +18,7 @@
    </resultMap>

    <select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.id,t.serial_no,t.type,t.create_time,t.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
        select t.id,t.serial_no,t.type,t.create_time,t1.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
        left join com_property_equipment t1 on t.serial_no = t1.serial_no
        left join com_mng_population_house t3 on t1.village_id=t3.id
        left join sys_user t2 on t.solve_id = user_id
@@ -58,7 +58,7 @@


    <select id="selectById" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.id,t.serial_no,t.type,t.create_time,t.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
        select t.id,t.serial_no,t.type,t.create_time,t1.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
            left join com_property_equipment t1 on t.serial_no = t1.serial_no
            left join com_mng_population_house t3 on t1.village_id=t3.id
            left join sys_user t2 on t.solve_id = user_id

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyEquipmentMapper.xml

@@ -24,6 +24,9 @@
            <if test="commonPage.type!=null">
                and type =#{commonPage.type}
            </if>
            <if test="commonPage.paramId !=null">
                and community_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.name!=null and commonPage.name!=''">
                and name like concat(#{commonPage.name},'%')
            </if>