wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+添加分页

Browse Source
This commit is contained in:
wuyu 2023-12-11 17:44:43 +08:00
parent 5e26189f32
commit eff9616fde
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -198,8 +198,8 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
query.groupBy(PendingMessageRecord::getBizCode);
// 构建排序条件
buildSortCondition(query, request.getOrderFields(), pendingMessageState);
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.selectPageWithCustomSql(query.getWrapper());
IPage<PendingMessageRecord> page = request.toPage();
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.selectPageWithCustomSql(query.getWrapper(),page);
templateCodes = pendingMessageRecords.stream().map(PendingMessageRecord::getTemplateCode)
.collect(Collectors.toList());
List<MessageTemplateDTO> messageTemplates = messageTemplateNewService.listByTemplateCodes(templateCodes);

3
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/PendingMessageRecordMapper.java
View File

@ -4,6 +4,7 @@ import cn.axzo.msg.center.domain.dto.PendingCalendarCodeDTO;
import cn.axzo.msg.center.domain.entity.PendingMessageRecord;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -23,6 +24,6 @@ public interface PendingMessageRecordMapper extends BaseMapper<PendingMessageRec
@Param("selectDate") Date selectDate, @Param("personId") Long personId,@Param("isNowDay") Boolean isNowDay);
@Select("SELECT pmr.*,GROUP_CONCAT(pmr.executor_name) AS executorName FROM pending_message_record pmr ${ew.customSqlSegment}")
List<PendingMessageRecord> selectPageWithCustomSql(@Param(Constants.WRAPPER) Wrapper<PendingMessageRecord> wrapper);
List<PendingMessageRecord> selectPageWithCustomSql(@Param(Constants.WRAPPER) Wrapper<PendingMessageRecord> wrapper, IPage<PendingMessageRecord> page);
}