Merge branch 'test' into 'master'

Test

See merge request !43

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -2,6 +2,8 @@ package com.tiptimes.service.impl;
 
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.metadata.style.WriteFont;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
@@ -25,6 +27,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.net.URLEncoder;
 import java.util.*;
 
 
@@ -510,6 +515,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     //导出文件名称
                     String fileName_k = "引导指标六";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_k).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
+                    response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+                    ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build();
                     //查询数据
                     List<EntrepreneurshipProject> entrepreneurshipProjectList = questionnaireDao.selectEntrepreneurshipProjectList();
                     if (entrepreneurshipProjectList != null) {
@@ -518,13 +525,31 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                             entrepreneurshipProjectList.get(i).setIndex(i+1);
                         }
                         //生成excel
-                        EasyExcel.write(response.getOutputStream(),EntrepreneurshipProject.class).sheet("申报成功高校众创空间联盟发布的创新创业研究课题信息").
-                                registerWriteHandler(horizontalCellStyleStrategy)
+                        WriteSheet writeSheet0=EasyExcel.writerSheet(0,"申报成功高校众创空间联盟发布的创新创业研究课题信息")
+                                .head(EntrepreneurshipProject.class)
+                                .registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
-                                .doWrite(entrepreneurshipProjectList);
-                        response.flushBuffer();
+                                .build();
+                        excelWriter.write(entrepreneurshipProjectList,writeSheet0);
+                    }
+                    //查询数据
+                    List<EntrepreneurshipCourses> entrepreneurshipCoursesList5 = questionnaireDao.selectEntrepreneurshipCoursesList();
+                    if (entrepreneurshipCoursesList5 != null) {
+                        for(int i = 0; i < entrepreneurshipCoursesList5.size();i++){
+                            //excel生成序号
+                            entrepreneurshipCoursesList5.get(i).setIndex(i+1);
                         }
+                        WriteSheet writeSheet1=EasyExcel.writerSheet(1,"开设创新创业课程情况")
+                                .head(EntrepreneurshipCourses.class)
+                                .registerWriteHandler(horizontalCellStyleStrategy)
+                                .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
+                                .build();
+                        excelWriter.write(entrepreneurshipCoursesList5,writeSheet1);
+                    }
+                    excelWriter.finish();
+                    response.flushBuffer();
                     break;
                 case "16":
                     //引导指标7 --基础指标6