Browse Source

项目进度列表导出异常修改

anderx 11 months ago
parent
commit
4c89dafbf2

+ 2 - 2
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -131,7 +131,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/detailsList")
     public Result<TaskDetailsBo> detailsList(InputTaskDetailsBo in) {
-        return new Result<>().data(this.taskDetailsService.detailsList(in));
+        return new Result<>().data(this.taskDetailsService.pushDetailsList(in));
     }
 
 
@@ -154,7 +154,7 @@ public class TaskDetailsController extends BaseController {
      */
     @GetMapping("/export")
     public Result export(InputTaskDetailsBo in) {
-        return this.taskDetailsService.export(in);
+        return this.taskDetailsService.pushExport(in);
     }
 
     /**

+ 3 - 2
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -80,7 +80,8 @@ public interface TaskDetailsService {
     Object updateDownload(TaskDetails newTd);
 
 
-    Result export(InputTaskDetailsBo in);
 
-    Pagination<TaskDetailsBo> detailsList(InputTaskDetailsBo in);
+    Pagination<TaskDetailsBo> pushDetailsList(InputTaskDetailsBo in);
+
+    Result pushExport(InputTaskDetailsBo in);
 }

+ 3 - 3
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -81,17 +81,17 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     }
 
     @Override
-    public Result export(InputTaskDetailsBo in) {
+    public Result pushExport(InputTaskDetailsBo in) {
         in.setPageNo(1);
         in.setPageSize(10000);
-        Pagination<TaskDetailsBo> page = detailsList(in);
+        Pagination<TaskDetailsBo> page = pushDetailsList(in);
         List<TaskDetailsBo> list = (List<TaskDetailsBo>) page.getList();
         NewExcelUtil<TaskDetailsBo> excel=new NewExcelUtil<>(TaskDetailsBo.class);
         return excel.exportTaskDetailsExcel(list,"项目进度表",uploadPath);
     }
 
     @Override
-    public Pagination<TaskDetailsBo> detailsList(InputTaskDetailsBo in) {
+    public Pagination<TaskDetailsBo> pushDetailsList(InputTaskDetailsBo in) {
         in.setAid(TokenManager.getUserId());
         Pagination<?> page = findPage("selectTaskDetailsList", "selectTaskDetailsCount", in);
         List<TaskDetails> list = (List<TaskDetails>) page.getList();