Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

7 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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

@@ -75,6 +75,7 @@
            qu.deal_result,
            qu.deal_name,
            qu.deal_time,
            qi.process,
            CASE
                WHEN qu.model = pm.id THEN pm.model
                ELSE qu.model
@@ -85,8 +86,16 @@
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.id
                 LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
        where
            1=1
        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}
    </select>
</mapper>