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

maven

7 小时以前 63328dd80adc6331db581dda6418308e6fd4da12

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

@@ -7,18 +7,17 @@
        FROM quality_test_standard
        where
        1=1
        <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
            AND product_id = #{qualityTestStandard.productId}
        <if test="qualityTestStandard.standardNo != null and qualityTestStandard.standardNo != '' ">
            AND standard_no like concat('%',#{qualityTestStandard.standardNo},'%')
        </if>
    </select>
    <select id="qualityTestStandardList" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
        SELECT
        *
        FROM quality_test_standard
        where
        1=1
        <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
            AND product_id = #{qualityTestStandard.productId}
        <if test="qualityTestStandard.standardName != null and qualityTestStandard.standardName != '' ">
            AND standard_name like concat('%',#{qualityTestStandard.standardName},'%')
        </if>
        <if test="qualityTestStandard.state != null and qualityTestStandard.state != '' ">
            AND state = #{qualityTestStandard.state}
        </if>
        <if test="qualityTestStandard.inspectType != null and qualityTestStandard.inspectType != '' ">
            AND inspect_type = #{qualityTestStandard.inspectType}
        </if>
    </select>
</mapper>