feat(iot): 物联设备接口新增存放位置字段

云

2026-06-04 feb86efc4e8a8d2da00e4832bcd81825726617bf

 src/main/resources/mapper/approve/ApprovalInstanceMapper.xml

@@ -24,19 +24,42 @@
        <result column="deleted" property="deleted" />
    </resultMap>
    <select id="listPage" resultType="com.ruoyi.approve.bean.vo.ApprovalInstanceVo">
        select ai.*,su.nick_name as create_user_name  from
        select ai.*,su.nick_name as create_user_name from
        approval_instance ai
        left join sys_user su on ai.create_user = su.user_id
        <where>
            deleted = 0
            <if test="ew.instanceNo != null">
                and instance_no like concat('%',#{ew.instanceNo},'%')
                and ai.instance_no like concat('%',#{ew.instanceNo},'%')
            </if>
            <if test="ew.templateName != null">
                and template_name like concat('%',#{ew.templateName},'%')
                and ai.template_name like concat('%',#{ew.templateName},'%')
            </if>
            <if test="ew.templateId != null ">
                and ai. template_id = #{ew.templateId}
            </if>
            <if test="ew.businessType != null ">
                and ai.business_type = #{ew.businessType}
            </if>
            <if test="ew.createTimeStart != null and ew.createTimeEnd != null">
                and ai.apply_time &gt;= #{ew.createTimeStart}
                and ai.apply_time &lt;= #{ew.createTimeEnd}
            </if>
            <if test="ew.status != null">
                and ai.status = #{ew.status}
            </if>
            <if test="ew.applicantName != null and ew.applicantName !=''">
                and ai.applicant_name = #{ew.applicantName}
            </if>
            <if test="ew.currentUserId != null">
                and (ai.applicant_id = #{ew.currentUserId}
                     or exists (select 1 from approval_task at2
                                where at2.instance_id = ai.id
                                  and at2.approver_id = #{ew.currentUserId}
                                  and at2.deleted = 0))
            </if>
        </where>
        order by ai.id desc
        order by ai.create_time desc
    </select>

</mapper>