Merge remote-tracking branch 'origin/master'

mitao

9 天以前 2bdcf12109e62a731eb16e90b6e1c39a67853fb1

 ruoyi-system/src/main/resources/mapper/system/AssetHouseInspectionRecordMapper.xml

@@ -25,5 +25,28 @@
    <sql id="Base_Column_List">
        id, asset_main_id, asset_code, asset_name, room_number, inspection_date, house_close_status, water_electronic_gas_close_status, inner_status, remarks, create_time, create_by, update_time, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.AssetHouseInspectionVO">
        select t1.*,t2.nick_name nickName,t3.room_number as roomNumber from asset_house_inspection_record t1
                    left join sys_user t2 on t1.inspection_id = t2.user_id
                                          left join asset_property_ext t3 on t1.asset_main_id = t3.asset_main_id
        where 1=1

        <if test="query.assetMainName != null and query.assetMainName != ''">
            AND (t1.asset_name like concat('%', #{query.assetMainName}, '%'))
        </if>
        <if test="query.userIds != null and query.userIds.size() > 0">
            AND t1.inspection_id IN
            <foreach item="item" index="index" collection="query.userIds" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        <if test="query.startTime != null and query.startTime != ''">
            AND t1.inspection_date >= #{query.startTime}
        </if>
        <if test="query.endTime != null and query.endTime != ''">
            AND t1.inspection_date &lt;= #{query.endTime}
        </if>
        AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
    </select>

</mapper>