guoshilong
2023-07-18 9e1b909864e5c7b7bb174b3a2ccb3730f74679db
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
16 ■■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java 6 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml 5 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
@@ -68,4 +68,10 @@
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 短信类型
     */
    @ApiModelProperty(value = "短信类型")
    private Integer smsType;
}
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
@@ -30,4 +30,9 @@
     */
    private String endTime;
    /**
     * 短信类型
     */
    private Integer smsType;
}
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -4,7 +4,7 @@
    <!--自定义分页列表查询-->
    <select id="selectSmsResultPage" resultType="cn.gistack.alerts.sms.vo.SmsResultVO">
        select ssr.*,sst.content templateContent
        select ssr.*,sst.content templateContent,sst.sms_type as smsType
        from sm_sms_result ssr
        left join sm_sms_template sst on sst.template_id = ssr.template_id and sst.is_deleted = 0
        where 1=1 and ssr.is_deleted = 0
@@ -20,6 +20,9 @@
        <if test="smsResult.endTime!=null and smsResult.endTime!=''">
            and date_format(ssr.create_time,'%Y-%m-%d') &lt;= #{smsResult.endTime}
        </if>
        <if test="smsResult.smsType!=null">
            and sst.sms_type = #{smsResult.smsType}
        </if>
        order by id desc
    </select>