Merge remote-tracking branch 'origin/dev_西宁_湟水峡' into dev_西宁_湟水峡

云

7 天以前 30ef534fcffe0520bebe7a34abe69d7afbbf227f

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

@@ -96,7 +96,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY qi.check_time DESC
        ORDER BY IF(qi.check_time IS NULL, 1, 0) ASC, qi.check_time DESC, qi.create_time DESC
    </select>

    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">