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

ke

2024-08-27 f73dbcd6c21d28ab1e98840eee73c6d09bd0f929

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.java

@@ -2,6 +2,7 @@

import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -28,4 +29,40 @@
    * @return
    */
    int batchSaveSendRecord(@Param("list") List<SmsRecord> list);

   /**
    * 短信消息记录查询
    * @param page
    * @param smsRecord
    * @param list
    * @return
    */
   @InterceptorIgnore(tenantLine = "1")
    List<SmsRecordVO> smsPage(IPage<SmsRecordVO> page,
                       @Param("smsRecord")  SmsRecordVO smsRecord,
                       @Param("list")  List<String> list);

   /**
    * 站内信消息记录查询
    * @param page
    * @param smsRecord
    * @param list
    * @return
    */
   @InterceptorIgnore(tenantLine = "1")
    List<SmsRecordVO> msgPage(IPage<SmsRecordVO> page,
                       @Param("smsRecord")  SmsRecordVO smsRecord,
                       @Param("list")  List<String> list);

   /**
    * 短信和站内信消息记录查询  @InterceptorIgnore(tenantLine = "1") 等价 @SqlParser(filter = true)已过期
    * @param page
    * @param smsRecord
    * @param list
    * @return
    */
   @InterceptorIgnore(tenantLine = "1")
    List<SmsRecordVO> smsAndMsgPage(IPage<SmsRecordVO> page,
                           @Param("smsRecord")  SmsRecordVO smsRecord,
                           @Param("list")  List<String> list);
}