Merge branch 'master' into 'test'

审批-导出优化

See merge request !20

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

@@ -413,7 +413,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                             leadingIndicatorOneList.get(i).setIndex(i+1);
                         }
                         //生成excel
-                        EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("引导指标一").
+                        EasyExcel.write(response.getOutputStream(),SiteCondition.class).sheet("引导指标一").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
@@ -434,7 +434,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                             leadingIndicatorTwoList.get(i).setIndex(i+1);
                         }
                         //生成excel
-                        EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("引导指标二").
+                        EasyExcel.write(response.getOutputStream(),SiteCondition.class).sheet("引导指标二").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))