Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-invento...

huminmin

2026-03-19 7b53707f0a9a195d56f8010e5b377eacba55609b

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

@@ -17,6 +17,7 @@
        qu.deal_name,
        qu.deal_time,
        qu.batch_no,
        qu.check_type,
        CASE
        WHEN qu.model = pm.id THEN pm.model
        ELSE qu.model
@@ -29,20 +30,20 @@
        LEFT JOIN product_model pm ON qu.model = pm.id
        where
        1=1
        <if test="qualityUnqualified.inspectType != null ">
            AND inspect_type = #{qualityUnqualified.inspectType}
        <if test="qualityUnqualified.checkType != null ">
            AND check_type = #{qualityUnqualified.checkType}
        </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}
            AND product_name like concat('%',#{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')
            AND check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>
    <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">