|
@@ -1272,7 +1272,7 @@ public class ApplicationPrimaryController {
|
|
|
HSSFCell cellTitle13 = rowTitle.createCell(12);
|
|
|
cellTitle13.setCellValue("插班生报名年级");
|
|
|
HSSFCell cellTitle14 = rowTitle.createCell(13);
|
|
|
- cellTitle14.setCellValue("");
|
|
|
+ cellTitle14.setCellValue("性别");
|
|
|
HSSFCell cellTitle15 = rowTitle.createCell(14);
|
|
|
cellTitle15.setCellValue("");
|
|
|
HSSFCell cellTitle16 = rowTitle.createCell(15);
|
|
@@ -1281,6 +1281,8 @@ public class ApplicationPrimaryController {
|
|
|
cellTitle17.setCellValue("");
|
|
|
HSSFCell cellTitle18 = rowTitle.createCell(17);
|
|
|
cellTitle18.setCellValue("");
|
|
|
+ HSSFCell cellTitle19 = rowTitle.createCell(18);
|
|
|
+ cellTitle19.setCellValue("");
|
|
|
|
|
|
// int maxColumn = sheet.getRow(0).getPhysicalNumberOfCells();
|
|
|
// for(int i = 1; i < maxColumn; i++) {
|
|
@@ -1449,6 +1451,15 @@ public class ApplicationPrimaryController {
|
|
|
cellContent13.setCellValue(apDTO.getSchoolNumber().getGradeStr());
|
|
|
}
|
|
|
|
|
|
+ if(apDTO.getSex() != null) {
|
|
|
+ HSSFCell cellContent14 = rowContent.createCell(13);
|
|
|
+ if (apDTO.getSex() == 1) {
|
|
|
+ cellContent14.setCellValue("男");
|
|
|
+ } else {
|
|
|
+ cellContent14.setCellValue("女");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
List<Sort> sortList2 = new ArrayList<>();
|
|
|
sortList2.add(new Sort("create_time","asc"));
|
|
|
Map<String,Object> searchParams2 = new HashMap<>();
|
|
@@ -1461,7 +1472,7 @@ public class ApplicationPrimaryController {
|
|
|
Page<ApprovalInfo> aiPage = approvalInfoService.pageSearch(searchParams2,0,1000,false,sortList2);
|
|
|
List<ApprovalInfo> apList = aiPage.getResult();
|
|
|
for(int b =0;b<apList.size();b++){
|
|
|
- HSSFCell cellContent = rowContent.createCell(b+13);
|
|
|
+ HSSFCell cellContent = rowContent.createCell(b+14);
|
|
|
ApprovalInfo ap = apList.get(b);
|
|
|
cellContent.setCellValue(ap.getRemark());
|
|
|
}
|