优化

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

@@ -119,8 +119,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             return CommonResult.fail(st);
         }
 
-        if (!isr.equals("本科") || !isr.equals("专升本")) {
-            return CommonResult.fail("批次为本科或专升本");
+        if (!isr.equals("本科") || !isr.equals("专升本") || !isr.equals("专科")) {
+            return CommonResult.fail("批次为本科或专升本或专科");
         }
         int existCount = welcomeStudentService.existStudentInfo(isr.getAdmissNum(), isr.getCardId());
         if (existCount > 0) {
@@ -299,8 +299,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         if (student == null) {
             return CommonResult.fail("学生数据已失效，编辑失败！");
         }
-        if (!usr.equals("本科") || !usr.equals("专升本")) {
-            return CommonResult.fail("批次为本科或专升本");
+        if (!usr.equals("本科") || !usr.equals("专升本") || !usr.equals("专科")) {
+            return CommonResult.fail("批次为本科或专升本或专科");
         }
         //region 学生信息
         student.setAdmissNum(usr.getAdmissNum());
@@ -630,8 +630,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             return CommonResult.fail(st);
         }
 
-        if (!icr.equals("本科") || !icr.equals("专升本")) {
-            return CommonResult.fail("批次为本科或专升本");
+        if (!icr.equals("本科") || !icr.equals("专升本") || !icr.equals("专科")) {
+            return CommonResult.fail("批次为本科或专升本或专科");
         }
         WelcomeStudent ws = welcomeStudentService.getDataByIdcardOrNum(icr.getAdmissNum(), icr.getCardId());
         if (ws == null) {
@@ -1120,8 +1120,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         studentData.setGraduationSchool(graSchool);
 
                         String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
-                        if (!batchValue.equals("本科") || !batchValue.equals("专升本")) {
-                            return CommonResult.fail("批次为本科或专升本");
+                        if (!batchValue.equals("本科") || !batchValue.equals("专升本") || !batchValue.equals("专科")) {
+                            return CommonResult.fail("批次为本科或专升本或专科");
                         }
                         studentData.setBatchValue(batchValue);
 
@@ -1401,8 +1401,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         studentData.setGraduationSchool(graSchool);
 
                         String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
-                        if (!batchValue.equals("本科") || !batchValue.equals("专升本")) {
-                            return CommonResult.fail("批次为本科或专升本");
+                        if (!batchValue.equals("本科") || !batchValue.equals("专升本") || !batchValue.equals("专科")) {
+                            return CommonResult.fail("批次为本科或专升本或专科");
                         }
                         studentData.setBatchValue(batchValue);
 

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

@@ -52,7 +52,7 @@ public class WelcomePaySetting implements Serializable {
     @ApiModelProperty(value = "专业名称")
     private String majorName;
 
-    @ApiModelProperty(value = "层次 本科 或专科")
+    @ApiModelProperty(value = "层次 本科 或 专升本 或 专科")
     private String eduLevel;
 
     @ApiModelProperty(value = "学制")