代码优化

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

@@ -458,6 +458,11 @@ public class DeptAssessmentDeclarationController {
 		}
 		List<DeptAssessmentDeclaration> deptAssessmentDeclarationList = deptAssessmentDeclarationService.list(qw);
 		for (DeptAssessmentDeclaration deptAssessmentDeclaration : deptAssessmentDeclarationList) {
+			QueryWrapper<EvaluationDept> qwDept = new QueryWrapper<>();
+			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
+				qwDept.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId());
+			}
+			EvaluationDept evaluationDept = evaluationDeptService.getOne(qwDept);
 			List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = deptAssessmentDeclarationContentService.detailsList(deptAssessmentDeclaration.getId());
 			for (DeptAssessmentDeclarationContent deptAssessmentDeclarationContent : deptAssessmentDeclarationContentList) {
 				SummaryInformationDTO summaryInformationDTO = new SummaryInformationDTO();
@@ -466,6 +471,9 @@ public class DeptAssessmentDeclarationController {
 				summaryInformationDTO.setSuggestedValue(deptAssessmentDeclarationContent.getSuggestedValue());
 				summaryInformationDTO.setReportingDepartment(deptAssessmentDeclaration.getDeptName());
 				summaryInformationDTO.setDeclarationLevel(deptAssessmentDeclaration.getRatingGrade());
+				if (null != evaluationDept) {
+					summaryInformationDTO.setSerialNumber(evaluationDept.getSerialNumber());
+				}
 				summaryInformationDTOList.add(summaryInformationDTO);
 			}
 		}
@@ -477,6 +485,7 @@ 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,7 +22,6 @@ 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;
@@ -262,9 +261,6 @@ 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);