Merge remote-tracking branch 'origin/jtdev' into jtdev
| | |
| | | and a."name" like concat('%',#{alarmRecord.reservoirName},'%') |
| | | </if> |
| | | <if test="alarmRecord.type!=null and alarmRecord.type!=''"> |
| | | and sar1.type = #{alarmRecord.type} |
| | | and |
| | | <foreach collection="alarmRecord.type.split(',')" index="index" item="item" open="(" separator="or " close=")"> |
| | | sar1.type = #{item} |
| | | </foreach> |
| | | </if> |
| | | <if test="alarmRecord.alarmRuleType!=null and alarmRecord.alarmRuleType!=''"> |
| | | and sar1.alarm_rule_type = #{alarmRecord.alarmRuleType} |