|
@@ -1298,7 +1298,12 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
studentData.setBatchValue(batchValue);
|
|
studentData.setBatchValue(batchValue);
|
|
|
|
|
|
|
|
String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
|
|
String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
|
|
|
- studentData.setPoliticalStatu(politicalStatu);
|
|
|
|
|
|
|
+ if (ObjectUtils.isEmpty(politicalStatu)) {
|
|
|
|
|
+ studentData.setPoliticalStatu("群众");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ studentData.setPoliticalStatu(politicalStatu);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
String nationality = dataFormatter.formatCellValue(row.getCell(13));//民族
|
|
String nationality = dataFormatter.formatCellValue(row.getCell(13));//民族
|
|
|
studentData.setNationality(nationality);
|
|
studentData.setNationality(nationality);
|
|
@@ -1583,7 +1588,12 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
|
|
|
studentData.setBatchValue(batchValue);
|
|
studentData.setBatchValue(batchValue);
|
|
|
|
|
|
|
|
String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
|
|
String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
|
|
|
- studentData.setPoliticalStatu(politicalStatu);
|
|
|
|
|
|
|
+ if (ObjectUtils.isEmpty(politicalStatu)) {
|
|
|
|
|
+ studentData.setPoliticalStatu("群众");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ studentData.setPoliticalStatu(politicalStatu);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
String nationality = dataFormatter.formatCellValue(row.getCell(13));//民族
|
|
String nationality = dataFormatter.formatCellValue(row.getCell(13));//民族
|
|
|
studentData.setNationality(nationality);
|
|
studentData.setNationality(nationality);
|