优化

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

@@ -83,6 +83,7 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
         wps.setMajorName(psr.getMajorName());
         wps.setEduLevel(psr.getEduLevel());
         wps.setEduSystem(psr.getEduSystem());
+        wps.setPayAmount(psr.getPayAmount());
 
         int result = welcomePaySettingService.insertWelcomePaySetting(wps);
         return result > 0 ? CommonResult.ok("添加成功！") : CommonResult.fail("添加失败！");
@@ -111,6 +112,7 @@ public class WelcomePaySettingController implements WelcomePaySettingControllerA
         oldData.setMajorName(psr.getMajorName());
         oldData.setEduLevel(psr.getEduLevel());
         oldData.setEduSystem(psr.getEduSystem());
+        oldData.setPayAmount(psr.getPayAmount());
 
         int result = welcomePaySettingService.updateWelcomePaySetting(oldData);
         return result > 0 ? CommonResult.ok("编辑成功！") : CommonResult.fail("编辑失败！");

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

@@ -119,6 +119,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             return CommonResult.fail(st);
         }
 
+        if(!isr.equals("本科") || !isr.equals("专升本")){
+            return CommonResult.fail("批次为本科或专升本");
+        }
         int existCount = welcomeStudentService.existStudentInfo(isr.getAdmissNum(), isr.getCardId());
         if (existCount > 0) {
             return CommonResult.fail("当前录取号或身份证号已存在！");
@@ -296,7 +299,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         if (student == null) {
             return CommonResult.fail("学生数据已失效，编辑失败！");
         }
-
+        if(!usr.equals("本科") || !usr.equals("专升本")){
+            return CommonResult.fail("批次为本科或专升本");
+        }
         //region 学生信息
         student.setAdmissNum(usr.getAdmissNum());
         student.setName(usr.getName());
@@ -625,6 +630,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             return CommonResult.fail(st);
         }
 
+        if(!icr.equals("本科") || !icr.equals("专升本")){
+            return CommonResult.fail("批次为本科或专升本");
+        }
         WelcomeStudent ws = welcomeStudentService.getDataByIdcardOrNum(icr.getAdmissNum(), icr.getCardId());
         if (ws == null) {
             ws = new WelcomeStudent();
@@ -1124,6 +1132,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         studentData.setGraduationSchool(graSchool);
 
                         String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
+                        if(!batchValue.equals("本科") || !batchValue.equals("专升本")){
+                            return CommonResult.fail("批次为本科或专升本");
+                        }
                         studentData.setBatchValue(batchValue);
 
                         String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌
@@ -1402,6 +1413,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                         studentData.setGraduationSchool(graSchool);
 
                         String batchValue = dataFormatter.formatCellValue(row.getCell(11));//批次
+                        if(!batchValue.equals("本科") || !batchValue.equals("专升本")){
+                            return CommonResult.fail("批次为本科或专升本");
+                        }
                         studentData.setBatchValue(batchValue);
 
                         String politicalStatu = dataFormatter.formatCellValue(row.getCell(12));//政治面貌