|
|
|
@ -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); |
|
|
|
|