Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

3 天以前 f5624a59380db70633eebe3612e2d3c703012b41

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

@@ -25,6 +25,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND  check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY check_time DESC
    </select>
    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
@@ -45,4 +46,13 @@
            AND product_name = #{qualityInspect.productName}
        </if>
    </select>

    <delete id="deleteByProductMainIds">
        DELETE FROM quality_inspect
        WHERE product_main_id IN
        <foreach collection="productMainIds" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

</mapper>