代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -477,7 +477,6 @@ public class DeptAssessmentDeclarationController {
 			}
 			list.addAll(value);
 		});
-		list.sort(Comparator.comparing(SummaryInformationDTO::getSerialNumber, Comparator.nullsLast(Integer::compareTo)));
 		ExcelUtils.createCollectExcel(list, annual, month, response.getOutputStream());
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/util/ExcelUtils.java

@@ -22,6 +22,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -261,6 +262,9 @@ public class ExcelUtils {
 		Workbook workbook = new XSSFWorkbook();
 		Sheet sheet = workbook.createSheet("Sheet1");
 
+		//排序
+		summaryInformationDTOList.sort(Comparator.comparing(SummaryInformationDTO::getSerialNumber, Comparator.nullsLast(Integer::compareTo)));
+
 		// 设置列宽
 		sheet.setColumnWidth(0, 256 * 20);
 		sheet.setColumnWidth(1, 256 * 20);
@@ -295,7 +299,7 @@ public class ExcelUtils {
 		employeeNameHeader.setCellValue("姓名");
 		employeeNameHeader.setCellStyle(headerStyle);
 		Cell suggestedValueHeader = headerRow.createCell(3);
-		suggestedValueHeader.setCellValue("推荐系数");
+		suggestedValueHeader.setCellValue("评定系数");
 		suggestedValueHeader.setCellStyle(headerStyle);
 		Cell declarationsNumberHeader = headerRow.createCell(4);
 		declarationsNumberHeader.setCellValue("申报次数");
@@ -304,7 +308,7 @@ public class ExcelUtils {
 		reportingDepartmentHeader.setCellValue("申报部门");
 		reportingDepartmentHeader.setCellStyle(headerStyle);
 		Cell declarationLevelHeader = headerRow.createCell(6);
-		declarationLevelHeader.setCellValue("申报级别");
+		declarationLevelHeader.setCellValue("评定级别");
 		declarationLevelHeader.setCellStyle(headerStyle);
 
 		// 设置表格内容数据