|
@@ -19,6 +19,7 @@ import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -57,11 +58,11 @@ public class TechnicalArticlesServiceImpl implements TechnicalArticlesService{
|
|
|
if(keyword != null && keyword != ""){
|
|
|
crowdTaskVOS = endPointShowList.stream()
|
|
|
.map(endPoint -> viewMediator.renderTaskDetailsByTourist(endPoint.getProjectCode(), endPoint.getTaskCode()))
|
|
|
- .filter(crowdTaskVO -> crowdTaskVO.getTitle().contains(keyword)).collect(Collectors.toList());
|
|
|
+ .filter(crowdTaskVO -> crowdTaskVO.getTitle().contains(keyword)).sorted(Comparator.comparing(CrowdTaskVO::getCode).reversed()).collect(Collectors.toList());
|
|
|
}else{
|
|
|
crowdTaskVOS = endPointShowList.stream()
|
|
|
.map(endPoint -> viewMediator.renderTaskDetailsByTourist(endPoint.getProjectCode(), endPoint.getTaskCode()))
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .sorted(Comparator.comparing(CrowdTaskVO::getCode).reversed()).collect(Collectors.toList());
|
|
|
}
|
|
|
technicalArticlesDTO.setTaskVOS(DataUtils.listToPage(crowdTaskVOS, pageable));
|
|
|
}
|