Merge remote-tracking branch 'origin/jtdev' into jtdev
| | |
| | | left join SJZT_MD."att_res_base" arb on arb."guid" = sar.reservoir_number |
| | | left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid" |
| | | where sar.is_deleted = 0 |
| | | <if test="alarmRecord.alarmSurveyStationName!=null and alarmRecord.alarmSurveyStationName!=''"> |
| | | and alarm_survey_station_name like concat(concat('%',#{alarmRecord.alarmSurveyStationName}),'%') |
| | | </if> |
| | | <if test="alarmRecord.reservoirName!=null and alarmRecord.reservoirName!=''"> |
| | | and sar.reservoir_name like concat(concat('%',#{alarmRecord.reservoirName}),'%') |
| | | </if> |