Browse Source

会员进度列表开发

anderx 1 year ago
parent
commit
e8594e32ec

+ 7 - 3
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -1906,7 +1906,7 @@ public class NewExcelUtil<T> {
 	}
 
 
-	public Result exportTaskDetailsExcel(TaskDetailsBo byTid, String sheetName, String uploadPath) {
+	public Result exportTaskDetailsExcel(List<TaskDetailsBo> list, String sheetName, String uploadPath) {
 		OutputStream out = null;
 		String filename="";
 		downloadPath=uploadPath;
@@ -1916,10 +1916,14 @@ public class NewExcelUtil<T> {
 			wb = new HSSFWorkbook(fileInputStream);
 			styles=createStyles(wb);
 			sheet = wb.getSheetAt(0);
-			Row row = sheet.createRow(6);
+			int index=6;
+
 			filename = encodingFilename(sheetName);
 			out = Files.newOutputStream(Paths.get(getAbsoluteFile(filename)));
-			addCell( row,byTid);
+			for (TaskDetailsBo bo : list) {
+				Row row = sheet.createRow(index++);
+				addCell( row,bo);
+			}
 			wb.write(out);
 			return new Result().data(filename);
 		} catch (Exception e) {

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

@@ -134,6 +134,8 @@ public class TaskDetailsController extends BaseController {
         return new Result<>().data(this.taskDetailsService.detailsList(in));
     }
 
+
+
     /**
      * 导出数据
      *
@@ -151,8 +153,8 @@ public class TaskDetailsController extends BaseController {
      * @return
      */
     @GetMapping("/export")
-    public Result export() {
-        return this.taskDetailsService.export();
+    public Result export(InputTaskDetailsBo in) {
+        return this.taskDetailsService.export(in);
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.goafanti.techproject.service;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.common.model.TaskFeature;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techproject.bo.InputTaskDetailsBo;
 import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.bo.TaskDetailsBo;
@@ -79,7 +80,7 @@ public interface TaskDetailsService {
     Object updateDownload(TaskDetails newTd);
 
 
-    Result export();
+    Result export(InputTaskDetailsBo in);
 
-    Object detailsList(InputTaskDetailsBo in);
+    Pagination<TaskDetailsBo> detailsList(InputTaskDetailsBo in);
 }

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

@@ -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) {