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

liyong

7 天以前 04dce61c02c10832665cdaf1aabf5b7e9b31da47

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

@@ -14,10 +14,22 @@
            AND standard_name like concat('%',#{c.standardName},'%')
        </if>
        <if test="c.state != null and c.state != '' ">
            AND state = #{c.state}
            AND state =#{c.state}
        </if>
        <if test="c.inspectType != null and c.inspectType != '' ">
            AND inspect_type = #{c.inspectType}
            AND inspect_type =#{c.inspectType}
        </if>
    </select>
    <select id="getQualityTestStandardByProductId" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
        SELECT qts.*
        FROM quality_test_standard qts
                 left join quality_test_standard_binding qtsb on qtsb.test_standard_id = qts.id
                 left join product_process pp on qts.process_id = pp.id
        WHERE qtsb.product_id = #{productId}
          AND qts.inspect_type = #{inspectType}
        <if test="process!='' and process!=null">
            and pp.name = #{process}
        </if>
        order by qts.id desc
    </select>
</mapper>