|
|
@@ -868,7 +868,12 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
|
|
|
|
|
|
columnNumber ++;
|
|
|
cell = dataRow.createCell(columnNumber);
|
|
|
- cell.setCellValue(pageVo.getClassStatusCn());
|
|
|
+ if(pageVo.getClassStatus() != null && pageVo.getClassStatus() == 1){
|
|
|
+ cell.setCellValue("在读");
|
|
|
+ }else{
|
|
|
+ cell.setCellValue("毕业");
|
|
|
+ }
|
|
|
+
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
|
|
|
columnNumber ++;
|
|
|
@@ -1024,7 +1029,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
|
|
|
|
|
|
columnNumber ++;
|
|
|
cell = row.createCell(columnNumber);
|
|
|
- cell.setCellValue("准军事化管理效果");
|
|
|
+ cell.setCellValue("国防教学特色");
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
sheet.addMergedRegion(new CellRangeAddress(0, 0, columnNumber, columnNumber + 1));
|
|
|
columnNumber ++;
|
|
|
@@ -1102,7 +1107,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
|
|
|
columnNumber ++;
|
|
|
|
|
|
cell = row.createCell(columnNumber);
|
|
|
- cell.setCellValue("指数");
|
|
|
+ cell.setCellValue("扣分");
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
columnNumber ++;
|
|
|
|
|
|
@@ -1119,7 +1124,7 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
|
|
|
cell = row.createCell(columnNumber);
|
|
|
cell.setCellValue("此项得分");
|
|
|
cell.setCellStyle(cellStyle);
|
|
|
-
|
|
|
+ columnNumber ++;
|
|
|
|
|
|
cell = row.createCell(columnNumber);
|
|
|
cell.setCellValue("扣分");
|