| | |
| | | } |
| | | return this.signCountMapper.signCount(orderStatusCount,page); |
| | | } |
| | | |
| | | @Override |
| | | public IPage<OrderStatusCount> signCountsNew(OrderStatusCount orderStatusCount, QueryRequest queryRequest) { |
| | | Page<OrderStatusCount> page = new Page<>(); |
| | | if (org.apache.commons.lang3.StringUtils.isNotBlank(queryRequest.getPageSize() + "") && (queryRequest.getPageSize() != 0)) { |
| | | page.setCurrent(queryRequest.getPageNum()); |
| | | page.setSize(queryRequest.getPageSize()); |
| | | } else { |
| | | page.setCurrent(0); |
| | | page.setSize(-1); |
| | | } |
| | | |
| | | IPage<OrderStatusCount> orderStatusCountIPage = this.signCountMapper.signCountNew(orderStatusCount, page); |
| | | List<OrderStatusCount> recordsAll = this.signCountMapper.signCountNewTotal(orderStatusCount); |
| | | List<OrderStatusCount> records = orderStatusCountIPage.getRecords(); |
| | | |
| | | for (int i=0;i<records.size();i++) { |
| | | for (OrderStatusCount statusCountx: recordsAll) { |
| | | if(records.get(i).getCarName().equals(statusCountx.getCarName())){ |
| | | records.get(i).setSendMonth(statusCountx.getProportion()); |
| | | break; |
| | | } |
| | | } |
| | | } |
| | | // List<OrderStatusCount> recordsLast = new ArrayList<>(); |
| | | orderStatusCountIPage.setRecords(records); |
| | | return orderStatusCountIPage; |
| | | } |
| | | } |