修改生产核算

huminmin

2026-07-13 53c0da6e44a01acf9d97bdc7abaf25e5984b92dc

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

@@ -14,6 +14,7 @@
        qu.quantity,
        qu.defective_phenomena,
        qu.deal_result,
        qu.photo_urls,
        qu.deal_name,
        qu.deal_time,
        CASE
@@ -26,23 +27,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
@@ -71,9 +73,10 @@
            qu.product_name,
            qu.unit,
            qu.quantity,
            qu.defective_phenomena,
            qu.deal_result,
            qu.deal_name,
        qu.defective_phenomena,
        qu.deal_result,
        qu.photo_urls,
        qu.deal_name,
            qu.deal_time,
            CASE
                WHEN qu.model = pm.id THEN pm.model
@@ -84,7 +87,7 @@
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.id
                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
        where
            1=1
        and qu.id = #{id}