原材料下单：报告下载添加审批状态校验，避免跳转页面报错问题&配置修改

zouyu

6 天以前 7e3cc4b30a8e0c30b6a0574061ba733a426d9f4f

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -280,10 +280,12 @@
                     ir1.id                                      enter_report_id,
                     ir1.url                                     enter_url,
                     ir1.url_s                                   enter_url_s,
                     ir1.is_ratify                               enter_ratify_status,
                     io2.id                                      quarter_order_id,
                     ir2.id                                      quarter_report_id,
                     ir2.url                                     quarter_url,
                     ir2.url_s                                   quarter_url_s,
                     ir2.is_ratify                               quarter_ratify_status,
                     group_concat(distinct isa.sample_code, ' ')          sample_code,
                     group_concat(distinct isa.sample, ' ')               sample_name,
                     group_concat(distinct isa.model, ' ')                sample_model,
@@ -317,7 +319,7 @@
        order by send_time desc
    </select>

    <select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
    <select id="selectIfsPage" resultType="com.ruoyi.basic.vo.IfsInventoryQuantityVO">
        SELECT * from ifs_inventory_quantity ifs
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
@@ -334,7 +336,7 @@
        select * from (<include refid="getIfsOrder"/>
        <where>
            <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
                send_time between #{beginDeclareDate} and #{endDeclareDate}
                declare_date between #{beginDeclareDate} and #{endDeclareDate}
            </if>
        </where>
        ) a
@@ -347,7 +349,7 @@
        select * from (<include refid="getIfsOrder"/>
            <where>
                <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
                    send_time between #{beginDeclareDate} and #{endDeclareDate}
                    declare_date between #{beginDeclareDate} and #{endDeclareDate}
                </if>
            </where>
        ) a
@@ -360,7 +362,7 @@
        <where>
            and (quarter_order_id is not null)
            <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
                and  send_time between #{beginDeclareDate} and #{endDeclareDate}
                and  declare_date between #{beginDeclareDate} and #{endDeclareDate}
            </if>
        </where>
        ) a
@@ -389,4 +391,13 @@
        where sample_type = #{sampleType}
          and sample is null
    </select>

    <!-- 根据原材料id列表查询原材料信息 -->
    <select id="getIfsByIds" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
        <include refid="getIfsOrder"/>
        where id in
        <foreach item="id" collection="ifsIds" open="(" separator="," close=")">
            #{id}
        </foreach>
    </select>
</mapper>