审批-导出优化

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

@@ -225,18 +225,18 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_a = "基础指标一";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_a).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<FullTimeWorkPerson> fullTimeWorkPersonList = questionnaireDao.selectFullTimeWorkPersonList(recordId);
-                    if (fullTimeWorkPersonList != null) {
-                        for(int i = 0; i < fullTimeWorkPersonList.size();i++){
+                    List<SiteCondition> siteConditionList = questionnaireDao.selectSiteConditionList();
+                    if (siteConditionList != null) {
+                        for(int i = 0; i < siteConditionList.size();i++){
                             //excel生成序号
-                            fullTimeWorkPersonList.get(i).setIndex(i+1);
+                            siteConditionList.get(i).setIndex(i+1);
                         }
                         //生成excel
-                        EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("众创空间场地情况").
+                        EasyExcel.write(response.getOutputStream(),SiteCondition.class).sheet("众创空间场地情况与是否租赁场地").
                                 registerWriteHandler(horizontalCellStyleStrategy)
-                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
-                                .doWrite(fullTimeWorkPersonList);
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
+                                .doWrite(siteConditionList);
                         response.flushBuffer();
                     }
                     break;
@@ -245,18 +245,18 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_b = "基础指标二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_b).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> siteConditionList = questionnaireDao.selectSiteConditionList();
-                    if (siteConditionList != null) {
-                        for(int i = 0; i < siteConditionList.size();i++){
+                    List<FullTimeWorkPerson> fullTimeWorkPersonList = questionnaireDao.selectFullTimeWorkPersonList(recordId);
+                    if (fullTimeWorkPersonList != null) {
+                        for(int i = 0; i < fullTimeWorkPersonList.size();i++){
                             //excel生成序号
-                            siteConditionList.get(i).setIndex(i+1);
+                            fullTimeWorkPersonList.get(i).setIndex(i+1);
                         }
                         //生成excel
-                        EasyExcel.write(response.getOutputStream(),SiteCondition.class).sheet("众创空间场地情况与是否租赁场地").
+                        EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("众创空间场地情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
-                                .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
-                                .doWrite(siteConditionList);
+                                .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .doWrite(fullTimeWorkPersonList);
                         response.flushBuffer();
                     }
                     break;
@@ -406,7 +406,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_aa = "引导指标一";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_aa).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<FullTimeWorkPerson> leadingIndicatorOneList = questionnaireDao.selectFullTimeWorkPersonList(recordId);
+                    List<SiteCondition> leadingIndicatorOneList = questionnaireDao.selectSiteConditionList();
                     if (leadingIndicatorOneList != null) {
                         for(int i = 0; i < leadingIndicatorOneList.size();i++){
                             //excel生成序号
@@ -427,7 +427,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_bb = "引导指标二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_bb).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<FullTimeWorkPerson> leadingIndicatorTwoList = questionnaireDao.selectFullTimeWorkPersonList(recordId);
+                    List<SiteCondition> leadingIndicatorTwoList = questionnaireDao.selectSiteConditionList();
                     if (leadingIndicatorTwoList != null) {
                         for(int i = 0; i < leadingIndicatorTwoList.size();i++){
                             //excel生成序号