Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

2026-06-03 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

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

@@ -22,6 +22,7 @@
        <result column="update_user" property="updateUser" />
        <result column="update_time" property="updateTime" />
        <result column="deleted" property="deleted" />
        <result column="form_config" property="formConfig" />
    </resultMap>
    <select id="listPage" resultType="com.ruoyi.approve.bean.vo.ApprovalInstanceVo">
        select ai.*,su.nick_name as create_user_name from
@@ -39,16 +40,20 @@
                and ai. template_id = #{ew.templateId}
            </if>
            <if test="ew.businessType != null ">
                and ai. business_type = #{ew.businessType}
                and ai.business_type = #{ew.businessType}
            </if>
            <if test="ew.createTime != null">
                and ai.create_time between to_date(#{ew.createTimeStart}) and to_date(#{ew.createTimeEnd})
            <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>
        </where>
        order by ai.id desc
        order by ai.create_time desc
    </select>

</mapper>