|
|
@@ -24,8 +24,10 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
+import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -128,9 +130,9 @@ public class RoomValueWeekServiceImpl extends MPJBaseServiceImpl<RoomValueWeekMa
|
|
|
@Override
|
|
|
public PageOutput<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto) {
|
|
|
List<RoomValueWeekItemVo> itemList = roomValueWeekRoomValueWeekItemMapper.getItemList(dto);
|
|
|
- List<Long> weekIds = new ArrayList<>();
|
|
|
+ Set<Long> weekIds = new HashSet<>();
|
|
|
for (RoomValueWeekItemVo itemVo : itemList) {
|
|
|
- weekIds.add(itemVo.getId());
|
|
|
+ weekIds.add(itemVo.getRoomValueWeekId());
|
|
|
}
|
|
|
|
|
|
IPage<RoomValueWeek> roomValueWeekIPage = roomValueWeekRoomValueWeekMapper.selectPage(ConventPage.getPage(dto),
|