licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排序

Browse Source
This commit is contained in:
Ledo 2025-01-16 11:42:51 +08:00
parent 62584efc33
commit 2d7e1df4a8
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -165,10 +165,11 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
.disableSubLogicDel();
if (reqVO.getProcedureStatusList().size()==1 && reqVO.getProcedureStatusList().get(0)==2){
//完工降序
query.orderByDesc(TaskDispatchDO::getCode);
query.orderByDesc(TaskDispatchDetailDO::getDispatchId,TaskDispatchDetailDO::getSort);
}else {
//未完工升序
query.orderByAsc(TaskDispatchDO::getCode);
query.orderByAsc(TaskDispatchDetailDO::getDispatchId,TaskDispatchDetailDO::getSort)
;
}
if (CollUtil.isNotEmpty(postIds)) {
query.and(i -> i

52
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -342,33 +342,31 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
postIds.add(fpUserDetailDO.getPostId());
}
PageResult<TaskDispatchDetailDO> taskDispatchDetailDOPageResult = taskDispatchDetailMapper.selectPageWx(pageReqVO, postIds);
List<TaskDispatchDetailDO> list = taskDispatchDetailDOPageResult.getList();
List<TaskDispatchDetailDO> afterList = new ArrayList<>();
if (CollUtil.isNotEmpty(list)){
Map<String, List<TaskDispatchDetailDO>> collect ;
if(pageReqVO.getProcedureStatusList().size()==1 && pageReqVO.getProcedureStatusList().get(0)==2){
collect = list.stream()
.collect(Collectors.groupingBy(
TaskDispatchDetailDO::getDispatchCode,
() -> new TreeMap<>(Comparator.reverseOrder()),
Collectors.toList()
));
}else {
collect = list.stream()
.collect(Collectors.groupingBy(
TaskDispatchDetailDO::getDispatchCode,
TreeMap::new,
Collectors.toList()
));
}
collect.forEach((code,list2)->{
list2.sort(Comparator.comparing(TaskDispatchDetailDO::getSort, Comparator.nullsLast(Integer::compareTo)));
afterList.addAll(list2);
});
}
taskDispatchDetailDOPageResult.setList(afterList);
// List<TaskDispatchDetailDO> list = taskDispatchDetailDOPageResult.getList();
// List<TaskDispatchDetailDO> afterList = new ArrayList<>();
// if (CollUtil.isNotEmpty(list)){
// Map<String, List<TaskDispatchDetailDO>> collect ;
// if(pageReqVO.getProcedureStatusList().size()==1 && pageReqVO.getProcedureStatusList().get(0)==2){
// collect = list.stream()
// .collect(Collectors.groupingBy(
// TaskDispatchDetailDO::getDispatchCode,
// () -> new TreeMap<>(Comparator.reverseOrder()),
// Collectors.toList()
// ));
//
// }else {
// collect = list.stream()
// .collect(Collectors.groupingBy(
// TaskDispatchDetailDO::getDispatchCode,
// TreeMap::new,
// Collectors.toList()
// ));
// }
// collect.forEach((code,list2)->{
// afterList.addAll(list2);
// });
// }
// taskDispatchDetailDOPageResult.setList(afterList);
return taskDispatchDetailDOPageResult;
}
@Override