|
|
|
@ -69,21 +69,21 @@ public class BoardServiceImpl implements BoardService { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardListWithLine(inData); |
|
|
|
List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData); |
|
|
|
double number2=list2.size(); |
|
|
|
int pageIndex2=inData.getNumber2(); |
|
|
|
int maxPage2=(int)Math.ceil(number2/12); |
|
|
|
int maxPage2=(int)Math.ceil(number2/5); |
|
|
|
if(pageIndex2>maxPage2){ |
|
|
|
pageIndex2=1; |
|
|
|
} |
|
|
|
List<AbnormalFeedBackOutData> result2 =new ArrayList<>(); |
|
|
|
if(pageIndex2<maxPage2){ |
|
|
|
for(int i=0;i<6;i++){ |
|
|
|
result2.add(list2.get((pageIndex2-1)*6+i)); |
|
|
|
for(int i=0;i<5;i++){ |
|
|
|
result2.add(list2.get((pageIndex2-1)*5+i)); |
|
|
|
} |
|
|
|
}else { |
|
|
|
for(int i=0;(pageIndex2-1)*6+i<number2;i++){ |
|
|
|
result2.add(list2.get((pageIndex2-1)*6+i)); |
|
|
|
for(int i=0;(pageIndex2-1)*5+i<number2;i++){ |
|
|
|
result2.add(list2.get((pageIndex2-1)*5+i)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|