工作安排报表分页问题解决
This commit is contained in:
parent
9dff902a07
commit
a53921de80
|
|
@ -23,6 +23,8 @@ import com.bonus.system.holiday.entity.HolidayBean;
|
|||
import com.bonus.system.holiday.entity.HolidayImportBean;
|
||||
import com.bonus.system.holiday.entity.HolidayKeyBean;
|
||||
import com.bonus.system.holiday.entity.WorkReportBean;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
|
@ -37,6 +39,8 @@ import java.time.format.DateTimeFormatter;
|
|||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.bonus.common.core.utils.PageUtils.startPage;
|
||||
|
||||
/**
|
||||
* 项目部角色-业务层
|
||||
*
|
||||
|
|
@ -78,6 +82,7 @@ public class WorkReportServiceImpl implements WorkReportService {
|
|||
|
||||
@Override
|
||||
public List<WorkReportBean> getWorkReportList(WorkReportBean bean) {
|
||||
PageHelper.clearPage();
|
||||
List<WorkReportBean> workReportList = new ArrayList<>();
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
int roleCount = 0;
|
||||
|
|
@ -101,6 +106,7 @@ public class WorkReportServiceImpl implements WorkReportService {
|
|||
return workReportList;
|
||||
}
|
||||
}
|
||||
startPage();
|
||||
workReportList = dao.getWorkReportList(bean);
|
||||
for (WorkReportBean workReportBean : workReportList) {
|
||||
if (StringHelper.isNotEmpty(workReportBean.getCheckId())) {
|
||||
|
|
@ -116,6 +122,7 @@ public class WorkReportServiceImpl implements WorkReportService {
|
|||
}
|
||||
|
||||
}
|
||||
// PageInfo<WorkReportBean> pageInfo = new PageInfo<>(workReportList);
|
||||
return workReportList;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue