fix:1.生产报工优化

liding

2026-05-20 4d99e718536ac77dff26dde8da7a59cdc9b52de8

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

@@ -40,9 +40,10 @@
            AND check_time >= 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">
        SELECT
        qu.*,
@@ -61,6 +62,7 @@
            AND product_name = #{qualityUnqualified.productName}
        </if>
    </select>

    <select id="getUnqualified" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
        SELECT
            qu.id,
@@ -84,27 +86,32 @@
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.model AND pm.product_id = qu.product_id
                 LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
        LEFT JOIN product_model pm ON qu.model = pm.model AND pm.product_id = qu.product_id
        LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
        where
            1=1
        and qu.id = #{id}
            and qu.id = #{id}
    </select>

    <select id="getModelId" resultType="java.lang.Long">
        select pm.id
        from product_model pm
        left join product p on pm.product_id=p.id
        where pm.model=#{model}
          and  p.product_name=#{productName}
        left join product p on pm.product_id = p.id
        where pm.model = #{model}
          and p.product_name = #{productName}
    </select>
    <select id="selectUnqualifiedByProcessNames" resultType="com.ruoyi.quality.pojo.QualityUnqualified">

    <select id="selectUnqualifiedByProductOrderAndProcessNames" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
        SELECT DISTINCT qu.*
        FROM quality_unqualified qu
        JOIN quality_inspect qi ON qu.inspect_id = qi.id
        JOIN production_product_main ppm ON qi.product_main_id = ppm.id
        JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
        WHERE qi.process IN
        <foreach collection="processNames" item="processName" open="(" separator="," close=")">
            #{processName}
        </foreach>
        AND pwo.product_order_id = #{productOrderId}
        AND qu.deal_result = '隔离'
        AND qu.quarantine_lifted = false
    </select>
@@ -121,4 +128,4 @@
        WHERE po.id IS NOT NULL
        GROUP BY po.id
    </select>
</mapper>
</mapper>