Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-07-26 af61e5f6de17791b5f8a07d3324c272a62eca5bf

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateHistoryMapper.xml

@@ -396,6 +396,9 @@
        <if test="valveState != null">
            and rash.valve_state = #{valveState,jdbcType=TINYINT}
        </if>
        <if test="intakeId != null">
            and rash.intake_id = #{intakeId}
        </if>
        <if test="intakeName != null">
            and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
        </if>
@@ -477,6 +480,9 @@
            <if test="valveState != null">
                and rash.valve_state = #{valveState,jdbcType=TINYINT}
            </if>
            <if test="intakeId != null">
                and rash.intake_id = #{intakeId}
            </if>
            <if test="intakeName != null">
                and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
            </if>