按照正序排列

liweidong
ShiJiuZhou 3 days ago
parent 005691078a
commit dd8f327b74
  1. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@ -503,7 +503,6 @@ public class InspectionTaskController extends BladeController {
List<MesRbFilePreserveSlotEntity> preserveSlotList = new ArrayList<>(); List<MesRbFilePreserveSlotEntity> preserveSlotList = new ArrayList<>();
QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<MesRbFilePreserveSlotEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("RFP_ID", rfpId); queryWrapper.eq("RFP_ID", rfpId);
queryWrapper.orderByDesc("create_time");
preserveSlotList = mesRbFilePreserveSlotService.list(queryWrapper); preserveSlotList = mesRbFilePreserveSlotService.list(queryWrapper);
// QueryWrapper<WorkPlan> queryWrapper = new QueryWrapper<>(); // QueryWrapper<WorkPlan> queryWrapper = new QueryWrapper<>();
@ -546,7 +545,9 @@ public class InspectionTaskController extends BladeController {
dsRbFilePreserveSlot.setChildrenList(childrenListNew); dsRbFilePreserveSlot.setChildrenList(childrenListNew);
} }
} }
preserveSlotList.sort(Comparator.comparing(MesRbFilePreserveSlotEntity::getSlotIndex)); preserveSlotList.sort(Comparator.comparing(
e -> Integer.parseInt(e.getSlotIndex())
));
obj.put("preserveSlotList",preserveSlotList); obj.put("preserveSlotList",preserveSlotList);
obj.put("insertIndex",insertIndex); obj.put("insertIndex",insertIndex);
return R.data(obj); return R.data(obj);

Loading…
Cancel
Save