|
|
@ -44,7 +44,8 @@ public class SearchAppealDomainServiceImpl implements SearchAppealDomainService |
|
|
public Result<PageResult<AppealDTO>> list(AppealParam appealParam) { |
|
|
public Result<PageResult<AppealDTO>> list(AppealParam appealParam) { |
|
|
QueryWrapper<AppealEntity> appealEntityQueryWrapper = new QueryWrapper<>(); |
|
|
QueryWrapper<AppealEntity> appealEntityQueryWrapper = new QueryWrapper<>(); |
|
|
IPage<AppealDTO> appealDTOIPage = new Page<>(); |
|
|
IPage<AppealDTO> appealDTOIPage = new Page<>(); |
|
|
Map<Long, String> taskIdToSubLineNameMap = Map.of(); |
|
|
Map<Long, String> taskIdToSubLineNameMap = new HashMap<>(); |
|
|
|
|
|
appealEntityQueryWrapper.orderByDesc("update_time"); |
|
|
if (StringUtils.isBlank(appealParam.getSubLineName())){ |
|
|
if (StringUtils.isBlank(appealParam.getSubLineName())){ |
|
|
Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); |
|
|
Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); |
|
|
appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); |
|
|
appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); |
|
|
@ -62,7 +63,6 @@ public class SearchAppealDomainServiceImpl implements SearchAppealDomainService |
|
|
|
|
|
|
|
|
//查询申诉列表
|
|
|
//查询申诉列表
|
|
|
appealEntityQueryWrapper.in("task_id",taskBySubLineName.stream().map(TaskDTO::getId).collect(Collectors.toList())); |
|
|
appealEntityQueryWrapper.in("task_id",taskBySubLineName.stream().map(TaskDTO::getId).collect(Collectors.toList())); |
|
|
appealEntityQueryWrapper.orderByDesc("update_time"); |
|
|
|
|
|
Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); |
|
|
Page<AppealEntity> appealEntityPage = appealMapper.selectPage(PageConverter.toMpPage(appealParam), appealEntityQueryWrapper); |
|
|
appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); |
|
|
appealDTOIPage = appealEntityPage.convert(entity -> entity.toDTO(AppealDTO::new)); |
|
|
} |
|
|
} |
|
|
|