走访日志查询过滤修改，房屋详情查询bug 修复

zhongrj

2024-01-17 72e02952b154a321ed384b73eb0351e7384fa04e

走访日志查询过滤修改，房屋详情查询bug 修复

 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml

@@ -37,6 +37,9 @@
        <if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
            and jh.name like concat('%',#{gridWorkLog.name},'%')
        </if>
        <if test="gridWorkLog.houseCode !=null and gridWorkLog.houseCode!=''">
            and jh.house_code = #{gridWorkLog.houseCode}
        </if>
        <if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
            and jh.phone_number like concat('%',#{gridWorkLog.phone},'%')
        </if>

 src/main/java/org/springblade/modules/grid/vo/GridWorkLogVO.java

@@ -86,4 +86,9 @@
     */
    private String roleName;

    /**
     * 地址编码
     */
    private String houseCode;

}

 src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml

@@ -200,8 +200,38 @@

    </select>

    <!--房屋详情-->
    <resultMap id="houseAndHouseLabelDetailMap" type="org.springblade.modules.house.vo.HouseVO" autoMapping="true">
        <result column="id" property="id"/>
        <result column="house_code" property="houseCode"/>
        <result column="district_code" property="districtCode"/>
        <result column="district_name" property="districtName"/>
        <result column="house_name" property="houseName"/>
        <result column="phone" property="phone"/>
        <result column="area" property="area"/>
        <result column="property_price" property="propertyPrice"/>
        <result column="service_due" property="serviceDue"/>
        <result column="floor" property="floor"/>
        <result column="building" property="building"/>
        <result column="unit" property="unit"/>
        <result column="room" property="room"/>
        <result column="building_no" property="buildingNo"/>
        <result column="image_urls" property="imageUrls"/>
        <result column="create_user" property="createUser"/>
        <result column="created_time" property="createTime"/>
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="remark" property="remark"/>
        <result column="is_deleted" property="isDeleted"/>
        <collection property="userHouseLabelVOList" javaType="java.util.List"
                    ofType="org.springblade.modules.house.vo.UserHouseLabelVO" autoMapping="true">
            <id property="id" column="cid"/>
            <result property="remark" column="cremark"/>
        </collection>
    </resultMap>

    <!--房屋自定义详情查询-->
    <select id="getHouseDetail" resultMap="houseAndHouseLabelMap">
    <select id="getHouseDetail" resultMap="houseAndHouseLabelDetailMap">
        select
        jh.*,
        jhl.id as cid,jhl.*,jhl.remark as cremark,