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

guoshilong

2023-05-29 08c7fcce9fa2a876412fa81a19550b77996214e2

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.xml

@@ -19,4 +19,16 @@
        </if>
    </select>

    <!--通过id查询-->
    <select id="getDetailById" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleVO">
        select * from sm_alarm_rule where is_deleted = 0 and id = #{id}
    </select>

    <!--通过id查询-->
    <select id="getAlarmRuleDetailList" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO">
        select sard.*,sst.content as alarmContent
        from sm_alarm_rule_detail sard left join sm_sms_template sst on sard.template_id = sst.template_id
        where sard.alarm_rule_id = #{id}
    </select>

</mapper>