问卷管理审批-导出优化；

绩效汇总列表排序修改

src/main/java/com/tiptimes/ctrl/ExcelFillCellMergeStrategy.java

+package com.tiptimes.ctrl;
+
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.List;
+
+/**
+ * 单元格合并
+ *
+ * @author wangugocun
+ * @date 2022/10/24 11:35
+ */
+public class ExcelFillCellMergeStrategy implements CellWriteHandler {
+    /**
+     * 合并字段的下标
+     */
+    private int[] mergeColumnIndex;
+    /**
+     * 合并几行
+     */
+    private int mergeRowIndex;
+
+    public int[] getMergeColumnIndex() {
+        return mergeColumnIndex;
+    }
+
+    public void setMergeColumnIndex(int[] mergeColumnIndex) {
+        this.mergeColumnIndex = mergeColumnIndex;
+    }
+
+    public int getMergeRowIndex() {
+        return mergeRowIndex;
+    }
+
+    public void setMergeRowIndex(int mergeRowIndex) {
+        this.mergeRowIndex = mergeRowIndex;
+    }
+
+    public ExcelFillCellMergeStrategy() {
+    }
+
+    public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex) {
+        this.mergeRowIndex = mergeRowIndex;
+        this.mergeColumnIndex = mergeColumnIndex;
+    }
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
+                                 Head head, Integer integer, Integer integer1, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell,
+                                Head head, Integer integer, Boolean aBoolean) {
+
+    }
+
+//    @Override
+//    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+//                                       CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+//
+//    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+                                 List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+//当前行
+        int curRowIndex = cell.getRowIndex();
+        //当前列
+        int curColIndex = cell.getColumnIndex();
+
+        if (curRowIndex > mergeRowIndex) {
+            for (int i = 0; i < mergeColumnIndex.length; i++) {
+                if (curColIndex == mergeColumnIndex[i]) {
+                    mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
+                    break;
+                }
+            }
+        }
+    }
+
+    private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex) {
+        //获取当前行的当前列的数据和上一行的当前列列数据，通过上一行数据是否相同进行合并
+        Object curData = cell.getCellTypeEnum() == CellType.STRING ? cell.getStringCellValue() :
+                cell.getNumericCellValue();
+        Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex);
+        Object preData = preCell.getCellTypeEnum() == CellType.STRING ? preCell.getStringCellValue() :
+                preCell.getNumericCellValue();
+        // 比较当前行的第一列的单元格与上一行是否相同，相同合并当前单元格与上一行
+        //
+        if (curData.equals(preData)) {
+            Sheet sheet = writeSheetHolder.getSheet();
+            List<CellRangeAddress> mergeRegions = sheet.getMergedRegions();
+            boolean isMerged = false;
+            for (int i = 0; i < mergeRegions.size() && !isMerged; i++) {
+                CellRangeAddress cellRangeAddr = mergeRegions.get(i);
+                // 若上一个单元格已经被合并，则先移出原有的合并单元，再重新添加合并单元
+                if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) {
+                    sheet.removeMergedRegion(i);
+                    cellRangeAddr.setLastRow(curRowIndex);
+                    sheet.addMergedRegion(cellRangeAddr);
+                    isMerged = true;
+                }
+            }
+            // 若上一个单元格未被合并，则新增合并单元
+            if (!isMerged) {
+                CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex,
+                        curColIndex);
+                sheet.addMergedRegion(cellRangeAddress);
+            }
+        }
+    }
+}

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -13,6 +13,7 @@ import com.tiptimes.service.FileService;
 import com.tiptimes.service.QuestionnaireService;
 import com.tiptimes.util.*;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -376,7 +377,9 @@ public class QuestionnaireCtrl {
 
         //列表排序
         String sorting = "";
-        if(performanceSummary.getSorting().equals("desc")){
+        if(StringUtils.isEmpty(performanceSummary.getSorting())){
+            sorting = "tr.create_time desc";
+        } else if(performanceSummary.getSorting().equals("desc")){
             sorting = "tr.create_time desc";
         }else{
             sorting = "basicIndicators,guideIndicators,rewardIndicators desc";

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

@@ -17,6 +17,7 @@ import com.tiptimes.service.QuestionnaireService;
 import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -177,14 +178,23 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
             headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
             //内容策略
             WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+            //设置 自动换行
             contentWriteCellStyle.setWrapped(true);
+            //设置 垂直对齐
+            contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
             //设置 水平居中
             contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+            // 这个策略是 头是头的样式 内容是内容的样式
             HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
 
             response.setContentType("application/vnd.ms-excel;charset=UTF-8");
             response.setCharacterEncoding("UTF-8");
 
+            //需要合并的列
+            int[] mergeColumeIndex = {1};
+            // 从第二行后开始合并
+            int mergeRowIndex = 2;
+
             switch (index) {
                 case "1":
                     //导出文件名称
@@ -200,6 +210,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         //生成excel
                         EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("众创空间场地情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
                                 .doWrite(fullTimeWorkPersonList);
                         response.flushBuffer();
@@ -220,6 +231,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),SiteCondition.class).sheet("众创空间场地情况与是否租赁场地").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(siteConditionList);
                         response.flushBuffer();
                     }
@@ -239,6 +251,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),IncubatedEnterprises.class).sheet("入孵企业情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(incubatedEnterprisesList);
                         response.flushBuffer();
                     }
@@ -258,6 +271,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EmploymentSituation.class).sheet("新增就业情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(employmentSituationList);
                         response.flushBuffer();
                     }
@@ -277,6 +291,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EntrepreneurshipCourses.class).sheet("开设创新创业课程情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(entrepreneurshipCoursesList);
                         response.flushBuffer();
                     }
@@ -296,6 +311,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),SigningMentors.class).sheet("签约创业导师情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(signingMentorsList);
                         response.flushBuffer();
                     }
@@ -315,6 +331,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),OrganizationActivity.class).sheet("组织双创活动情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(organizationActivityList);
                         response.flushBuffer();
                     }
@@ -334,6 +351,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),CompetingSituation.class).sheet("参赛情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(competingSituationList);
                         response.flushBuffer();
                     }
@@ -353,6 +371,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EntrepreneurshipFunding.class).sheet("创新创业工作经费").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(entrepreneurshipFundingList);
                         response.flushBuffer();
                     }
@@ -373,6 +392,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("引导指标一").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorOneList);
                         response.flushBuffer();
                     }
@@ -393,6 +413,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),FullTimeWorkPerson.class).sheet("引导指标二").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorTwoList);
                         response.flushBuffer();
                     }
@@ -413,6 +434,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),IncubatedEnterprises.class).sheet("引导指标三").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorThreeList);
                         response.flushBuffer();
                     }
@@ -433,6 +455,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),IncubatedEnterprises.class).sheet("引导指标四").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorFoureList);
                         response.flushBuffer();
                     }
@@ -453,6 +476,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),SigningMentors.class).sheet("引导指标五").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorFiveList);
                         response.flushBuffer();
                     }
@@ -473,6 +497,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EntrepreneurshipProject.class).sheet("申报成功高校众创空间联盟发布的创新创业研究课题信息").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(entrepreneurshipProjectList);
                         response.flushBuffer();
                     }
@@ -493,6 +518,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),SigningMentors.class).sheet("引导指标七").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorSixList);
                         response.flushBuffer();
                     }
@@ -513,6 +539,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),OrganizationActivity.class).sheet("引导指标八").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(leadingIndicatorSevenList);
                         response.flushBuffer();
                     }
@@ -533,6 +560,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EnterprisestAmount.class).sheet("在孵企业销售收入或累计合同额情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(enterprisestAmountList);
                         response.flushBuffer();
                     }
@@ -553,6 +581,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EvaluationBorrowing.class).sheet("本评估周期实现股权或债权融资情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(evaluationBorrowingList);
                         response.flushBuffer();
                     }
@@ -573,6 +602,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),InnovationWeek.class).sheet("主办或承办市级及以上级别路演、双创周活动").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(innovationWeekList);
                         response.flushBuffer();
                     }
@@ -593,6 +623,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),CollegeSituation.class).sheet("在孵企业在OTC高校板挂牌情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(collegeSituationList);
                         response.flushBuffer();
                     }
@@ -613,6 +644,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EnterprisesIntellectual.class).sheet("在孵企业新增知识产权").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(enterprisesIntellectualList);
                         response.flushBuffer();
                     }
@@ -633,6 +665,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),NationalCompetitionAwards.class).sheet("获得“互联网+”大赛全国赛事奖项情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(nationalCompetitionAwardsList);
                         response.flushBuffer();
                     }
@@ -653,6 +686,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EducationCommission.class).sheet("获得创客马拉松大赛及市教委组织的其他双创大赛奖项情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(educationCommissionList);
                         response.flushBuffer();
                     }
@@ -673,6 +707,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),EntrepreneurialProject.class).sheet("入选天津市创业拔尖项目情况").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(entrepreneurialProjectList);
                         response.flushBuffer();
                     }
@@ -694,6 +729,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         EasyExcel.write(response.getOutputStream(),SpaceAndIncubation.class).sheet("是否为国家级备案众创空间").
                                 registerWriteHandler(horizontalCellStyleStrategy)
                                 .registerWriteHandler(new SimpleColumnWidthStyleStrategy(30))
+                                .registerWriteHandler(new ExcelFillCellMergeStrategy(mergeRowIndex,mergeColumeIndex))
                                 .doWrite(spaceAndIncubationList);
                         response.flushBuffer();
                     }