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

云

11 小时以前 620bb4712a31791231c4381581f0f60088f079fe

 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml

@@ -26,23 +26,24 @@
        END AS method
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.id
        where
        1=1
        <if test="qualityUnqualified.inspectType != null ">
            AND inspect_type = #{qualityUnqualified.inspectType}
        </if>
        <if test="qualityUnqualified.inspectState != null ">
            AND inspect_state = #{qualityUnqualified.inspectState}
        </if>
        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
            AND product_name = #{qualityUnqualified.productName}
        </if>
        <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
            AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
            AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
        </if>
        <where>
            <if test="qualityUnqualified.inspectType != null ">
                AND inspect_type = #{qualityUnqualified.inspectType}
            </if>
            <if test="qualityUnqualified.inspectState != null ">
                AND inspect_state = #{qualityUnqualified.inspectState}
            </if>
            <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
                AND product_name = #{qualityUnqualified.productName}
            </if>
            <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
                AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
            </if>
            <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
                AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        order by qu.create_time desc
    </select>
    <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
        SELECT