20200728-入园通知书

ruoyi-ui/src/permission.js

@@ -66,7 +66,7 @@ router.beforeEach((to, from, next) => {
   } else {
     //console.log(whiteList.indexOf(to.path));
     // 没有token
-    if (whiteList.indexOf(to.path) !== -1 ||to.path.indexOf("/experience") != -1) {
+    if (whiteList.indexOf(to.path) !== -1 ||to.path.indexOf("/experience/apply/") != -1||to.path.indexOf("/experience/result/") != -1) {
       // 在免登录白名单，直接进入
       next()
     } else {

ruoyi-ui/src/views/benyi/experience/index.vue

@@ -364,7 +364,7 @@ export default {
           "入班半日体验申请表 " +
           "http://" +
           domain +
-          "/experience/choose/" +
+          "/experience/apply/" +
           response.data.dept.deptId;
       });
     },

ruoyi-ui/src/views/benyi/experience/result.vue

@@ -17,20 +17,13 @@
       <div class="result-info">
         <h3 class="title">园长答复</h3>
         <div class="info">
-          <el-alert title="通过申请" type="success" description="hfrn" :closable="false" show-icon></el-alert>
+          <el-alert :title="hfrn" type="success" :closable="false" show-icon></el-alert>
-          <el-alert
-            title="未通过申请"
-            type="error"
-            description="文字说明文字说明文字说明文字说明文字说明文字说明"
-            :closable="false"
-            show-icon
-          ></el-alert>
         </div>
       </div>
       <div class="result-info">
         <h3 class="title">园长指示</h3>
         <div class="info">
-          <el-alert title="yzzs" :closable="false" type="info"></el-alert>
+          <el-alert :title="yzzs" :closable="false" type="info"></el-alert>
         </div>
       </div>
       <div class="result-form">
@@ -100,10 +93,10 @@ export default {
   name: "result",
   data() {
     return {
-      hide: true,
+      hide: false,
       ishf: true,
-      hfrn: "sddfsdfsdffds",
+      hfrn: "",
-      yzzs: "sfdsfdsfdsf",
+      yzzs: "",
       // 查询参数
       queryParams: {
         yexm: undefined,
@@ -135,14 +128,12 @@ export default {
           this.hide = true;
           this.form = response.data;
           if (response.data.sfhf == "Y") {
-            this.ishf = true;
+            this.ishf = false;
             this.hfrn = response.data.hfrn;
             this.yzzs = response.data.yzzs;
           } else {
-            this.ishf = false;
+            this.ishf = true;
           }
-        } else {
-          this.hide = false;
         }
       });
     },

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByExperienceController.java

@@ -75,10 +75,10 @@ public class ByExperienceController extends BaseController {
      */
     @GetMapping("/getInfo")
     public AjaxResult getInfo_query(ByExperience byExperience) {
-        if(schoolCommon.isStringEmpty(byExperience.getYexm())){
+        if (schoolCommon.isStringEmpty(byExperience.getYexm())) {
             return AjaxResult.error("请输入幼儿姓名");
         }
-        if(schoolCommon.isStringEmpty(byExperience.getLxfs())){
+        if (schoolCommon.isStringEmpty(byExperience.getLxfs())) {
             return AjaxResult.error("请输入家长联系方式");
         }
 
@@ -96,6 +96,17 @@ public class ByExperienceController extends BaseController {
     @Log(title = "入班体验申请", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody ByExperience byExperience) {
+        //首先判断该幼儿是否已提交申请
+        ByExperience byExperienceNew = new ByExperience();
+        byExperienceNew.setYexm(byExperience.getYexm());
+        byExperienceNew.setLxfs(byExperience.getLxfs());
+        byExperienceNew.setSchoolid(byExperience.getSchoolid());
+
+        List<ByExperience> list = byExperienceService.selectByExperienceList(byExperienceNew);
+        if (list != null && list.size() > 0) {
+            return AjaxResult.error("该幼儿已在当前幼儿园申请，不可重复提交");
+        }
+
         return toAjax(byExperienceService.insertByExperience(byExperience));
     }