|
|
@@ -114,12 +114,19 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Result export() {
|
|
|
+ public Result export(InputTaskDetailsBo in) {
|
|
|
+ in.setPageNo(1);
|
|
|
+ in.setPageSize(10000);
|
|
|
+ Pagination<TaskDetailsBo> page = detailsList(in);
|
|
|
+ List<TaskDetailsBo> list = (List<TaskDetailsBo>) page.getList();
|
|
|
+ NewExcelUtil<TaskDetailsBo> excel=new NewExcelUtil<>(TaskDetailsBo.class);
|
|
|
+
|
|
|
+ return excel.exportTaskDetailsExcel(list,"项目进度表",uploadPath);
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object detailsList(InputTaskDetailsBo in) {
|
|
|
+ public Pagination<TaskDetailsBo> detailsList(InputTaskDetailsBo in) {
|
|
|
in.setAid(TokenManager.getUserId());
|
|
|
Pagination<?> page = findPage("selectTaskDetailsList", "selectTaskDetailsCount", in);
|
|
|
List<TaskDetails> list = (List<TaskDetails>) page.getList();
|
|
|
@@ -128,10 +135,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
TaskDetailsBo bo=new TaskDetailsBo();
|
|
|
BeanUtils.copyProperties(e,bo);
|
|
|
addOrderInformation(bo);
|
|
|
+ pushGetServiceProject(bo);
|
|
|
list2.add(bo);
|
|
|
}
|
|
|
page.setList(list2);
|
|
|
- return page;
|
|
|
+ return (Pagination<TaskDetailsBo>) page;
|
|
|
}
|
|
|
|
|
|
private void addOrderInformation(TaskDetailsBo bo) {
|
|
|
@@ -400,7 +408,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
NewExcelUtil<TaskDetailsBo> excel=new NewExcelUtil<>(TaskDetailsBo.class);
|
|
|
TaskDetailsBo byTid = pushByTid(id);
|
|
|
pushGetServiceProject(byTid);
|
|
|
- return excel.exportTaskDetailsExcel(byTid,"项目进度表",uploadPath);
|
|
|
+ List<TaskDetailsBo> list = new ArrayList<>();
|
|
|
+ list.add(byTid);
|
|
|
+ return excel.exportTaskDetailsExcel(list,"项目进度表",uploadPath);
|
|
|
}
|
|
|
|
|
|
private void pushGetServiceProject( TaskDetailsBo res) {
|