批次改层次

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -120,7 +120,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         }
 
         if (!isr.getBatchValue().equals("本科") && !isr.getBatchValue().equals("专升本") && !isr.getBatchValue().equals("专科")) {
-            return CommonResult.fail("批次为本科或专升本或专科");
+            return CommonResult.fail("层次为本科或专升本或专科");
         }
         int existCount = welcomeStudentService.existStudentInfo(isr.getAdmissNum(), isr.getCardId());
         if (existCount > 0) {
@@ -300,7 +300,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             return CommonResult.fail("学生数据已失效，编辑失败！");
         }
         if (!usr.getBatchValue().equals("本科") && !usr.getBatchValue().equals("专升本") && !usr.getBatchValue().equals("专科")) {
-            return CommonResult.fail("批次为本科或专升本或专科");
+            return CommonResult.fail("层次为本科或专升本或专科");
         }
         //region 学生信息
         student.setAdmissNum(usr.getAdmissNum());
@@ -631,7 +631,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         }
 
         if (!icr.getBatchValue().equals("本科") && !icr.getBatchValue().equals("专升本") && !icr.getBatchValue().equals("专科")) {
-            return CommonResult.fail("批次为本科或专升本或专科");
+            return CommonResult.fail("层次为本科或专升本或专科");
         }
         WelcomeStudent ws = welcomeStudentService.getDataByIdcardOrNum(icr.getAdmissNum(), icr.getCardId());
         if (ws == null) {
@@ -918,7 +918,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                     ws.setExamNum(ws.getExamNum());//考生号
                     ws.setEduSystem(ws.getEduSystem());//学制
                     ws.setGraduationSchool(ws.getGraduationSchool());//毕业中学
-                    ws.setBatchValue(ws.getBatchValue());//批次
+                    ws.setBatchValue(ws.getBatchValue());//层次
                     ws.setPoliticalStatu(ws.getPoliticalStatu());//政治面貌
                     ws.setNationality(ws.getNationality());//民族
                     ws.setPhone(ws.getPhone());//手机号码
@@ -1021,11 +1021,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         }
                         String graSchool = dataFormatter.formatCellValue(row.getCell(10));//毕业中学
                         if (!graSchool.equals("毕业中学")) {
-                            return CommonResult.fail("导入数据第十一列为毕业中学批次");
+                            return CommonResult.fail("导入数据第十一列为毕业中学层次");
                         }
-                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
-                        if (!batchValue.equals("批次")) {
-                            return CommonResult.fail("导入数据第十二列为批次");
+                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//层次
+                        if (!batchValue.equals("层次")) {
+                            return CommonResult.fail("导入数据第十二列为层次");
                         }
                         String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
                         if (!politicalStatu.equals("政治面貌")) {
@@ -1119,9 +1119,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         String graSchool = dataFormatter.formatCellValue(row.getCell(10));//毕业中学
                         studentData.setGraduationSchool(graSchool);
 
-                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
+                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//层次
                         if (!batchValue.equals("本科") && !batchValue.equals("专升本") && !batchValue.equals("专科")) {
-                            return CommonResult.fail("批次为本科或专升本或专科");
+                            return CommonResult.fail("层次为本科或专升本或专科");
                         }
                         studentData.setBatchValue(batchValue);
 
@@ -1300,11 +1300,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         }
                         String graSchool = dataFormatter.formatCellValue(row.getCell(10));//毕业中学
                         if (!graSchool.equals("毕业中学")) {
-                            return CommonResult.fail("导入数据第十一列为毕业中学批次");
+                            return CommonResult.fail("导入数据第十一列为毕业中学层次");
                         }
-                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
-                        if (!batchValue.equals("批次")) {
-                            return CommonResult.fail("导入数据第十二列为批次");
+                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//层次
+                        if (!batchValue.equals("层次")) {
+                            return CommonResult.fail("导入数据第十二列为层次");
                         }
                         String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
                         if (!politicalStatu.equals("政治面貌")) {
@@ -1400,9 +1400,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         String graSchool = dataFormatter.formatCellValue(row.getCell(10));//毕业中学
                         studentData.setGraduationSchool(graSchool);
 
-                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
+                        String batchValue = dataFormatter.formatCellValue(row.getCell(11));//层次
                         if (!batchValue.equals("本科") && !batchValue.equals("专升本") && !batchValue.equals("专科")) {
-                            return CommonResult.fail("批次为本科或专升本或专科");
+                            return CommonResult.fail("层次为本科或专升本或专科");
                         }
                         studentData.setBatchValue(batchValue);
 

src/main/java/com/template/model/pojo/WelcomeStudent.java

@@ -95,7 +95,7 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "毕业中学")
     private String graduationSchool;
 
-    @ApiModelProperty(value = "批次")
+    @ApiModelProperty(value = "层次")
     private String batchValue;
 
     @ApiModelProperty(value = "政治面貌")

src/main/java/com/template/model/request/InfoCollectionRequest.java

@@ -87,8 +87,8 @@ public class InfoCollectionRequest {
     @NotBlank(message = "毕业中学不能为空")
     private String graduationSchool;
 
-    @ApiModelProperty(value = "批次")
-    @NotBlank(message = "批次不能为空")
+    @ApiModelProperty(value = "层次")
+    @NotBlank(message = "层次不能为空")
     private String batchValue;
 
     @ApiModelProperty(value = "政治面貌")

src/main/java/com/template/model/request/InsertStudentRequest.java

@@ -92,8 +92,8 @@ public class InsertStudentRequest implements Serializable {
     @NotBlank(message = "毕业中学不能为空")
     private String graduationSchool;
 
-    @ApiModelProperty(value = "批次")
-    @NotBlank(message = "批次不能为空")
+    @ApiModelProperty(value = "层次")
+    @NotBlank(message = "层次不能为空")
     private String batchValue;
 
     @ApiModelProperty(value = "政治面貌")

src/main/java/com/template/model/request/updateStudentRequest.java

@@ -91,8 +91,8 @@ public class updateStudentRequest implements Serializable {
     @NotBlank(message = "毕业中学不能为空")
     private String graduationSchool;
 
-    @ApiModelProperty(value = "批次")
-    @NotBlank(message = "批次不能为空")
+    @ApiModelProperty(value = "层次")
+    @NotBlank(message = "层次不能为空")
     private String batchValue;
 
     @ApiModelProperty(value = "政治面貌")

src/main/java/com/template/model/vo/BedDetailsVo.java

@@ -33,7 +33,7 @@ public class BedDetailsVo {
     @ApiModelProperty(value = "所属班级")
     private String classstr;
 
-    @ApiModelProperty(value = "批次(年级)")
+    @ApiModelProperty(value = "层次(年级)")
     private String batchValue;
 
     @ApiModelProperty(value = "考生号")

src/main/java/com/template/model/vo/StudentDetailVo.java

@@ -72,7 +72,7 @@ public class StudentDetailVo {
     @ApiModelProperty(value = "毕业中学")
     private String graduationSchool;
 
-    @ApiModelProperty(value = "批次")
+    @ApiModelProperty(value = "层次")
     private String batchValue;
 
     @ApiModelProperty(value = "政治面貌")

src/main/java/com/template/model/vo/wxLoginVo.java

@@ -71,7 +71,7 @@ public class wxLoginVo {
     @ApiModelProperty(value = "毕业中学")
     private String graduationSchool;
 
-    @ApiModelProperty(value = "批次")
+    @ApiModelProperty(value = "层次")
     private String batchValue;
 
     @ApiModelProperty(value = "政治面貌")