幼儿档案

ruoyi-ui/src/views/benyi/learndevelopmentfamily/table.vue

@@ -23,7 +23,7 @@
           </td>
           <td class="w200">
             <b class="table-title">幼儿姓名：</b>
-            {{ childFormat(childid) }}
+            {{ childname }}
           </td>
         </tr>
         <tr>
@@ -67,12 +67,7 @@
 </template>
 
 <script>
-import {
+import { listFamily, getFamily } from "@/api/benyi/learndevelopmentfamily";
-  listFamily,
-  getFamily,
-} from "@/api/benyi/learndevelopmentfamily";
-
-import { listChild } from "@/api/benyi/child";
 
 import Editor from "@/components/Editor";
 
@@ -86,6 +81,7 @@ export default {
       title: "幼儿学习与发展档案(家长)",
       classname: "",
       childid: "",
+      childname: "",
       xnxq: "",
       zpimgs: "",
       zpimgsremarks: "",
@@ -128,40 +124,22 @@ export default {
     this.queryParams.id = childId;
 
     this.getList();
-    this.getChildList();
     this.getDicts("sys_xnxq").then((response) => {
       this.xnxqOptions = response.data;
     });
   },
   methods: {
-    // 字典翻译
-    childFormat(childid) {
-      // return this.selectDictLabel(this.classOptions, row.classid);
-      var actions = [];
-      var datas = this.childOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].id == "" + childid) {
-          actions.push(datas[key].name);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
     // 字典翻译
     xnxqFormat(xnxq) {
       return this.selectDictLabel(this.xnxqOptions, xnxq);
     },
-    //获取幼儿列表
-    getChildList() {
-      listChild(null).then((response) => {
-        this.childOptions = response.rows;
-        this.classname = response.rows[0].bjmc;
-      });
-    },
     /** 查询儿童学习与发展档案（家长）列表 */
     getList() {
       this.loading = true;
       listFamily(this.queryParams).then((response) => {
+        //console.log(response);
+        this.classname = response.rows[0].byClass.bjmc;
+        this.childname = response.rows[0].byChild.name;
         this.familyList = response.rows;
         this.xnxq = response.rows[0].xnxq;
         this.childid = response.rows[0].childid;

ruoyi-ui/src/views/benyi/learndevelopmentteacher/table.vue

@@ -23,7 +23,7 @@
           </td>
           <td class="w200">
             <b class="table-title">幼儿姓名：</b>
-            {{ childFormat(childid) }}
+            {{ childname }}
           </td>
         </tr>
         <tr>
@@ -67,12 +67,7 @@
 </template>
 
 <script>
-import {
+import { listTeacher, getTeacher } from "@/api/benyi/learndevelopmentteacher";
-  listTeacher,
-  getTeacher,
-} from "@/api/benyi/learndevelopmentteacher";
-
-import { listChild } from "@/api/benyi/child";
 
 import Editor from "@/components/Editor";
 
@@ -86,6 +81,7 @@ export default {
       title: "幼儿学习与发展档案(教师)",
       classname: "",
       childid: "",
+      childname: "",
       xnxq: "",
       gcjl: "",
       gcjlremarks: "",
@@ -127,25 +123,11 @@ export default {
     this.queryParams.id = childId;
     //console.log(childId);
     this.getList();
-    this.getChildList();
     this.getDicts("sys_xnxq").then((response) => {
       this.xnxqOptions = response.data;
     });
   },
   methods: {
-    // 字典翻译
-    childFormat(childid) {
-      // return this.selectDictLabel(this.classOptions, row.classid);
-      var actions = [];
-      var datas = this.childOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].id == "" + childid) {
-          actions.push(datas[key].name);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
     // 学年学期类型--字典状态字典翻译
     xnxqFormat(xnxq) {
       return this.selectDictLabel(this.xnxqOptions, xnxq);
@@ -155,18 +137,13 @@ export default {
       //console.log(this.$refs.printMe);
       this.$print(this.$refs.printMe);
     },
-    //获取幼儿列表
-    getChildList() {
-      listChild(null).then((response) => {
-        this.childOptions = response.rows;
-        this.classname = response.rows[0].bjmc;
-        // console.log(response.rows);
-      });
-    },
     /** 查询儿童学习与发展档案（教师）列表 */
     getList() {
       this.loading = true;
       listTeacher(this.queryParams).then((response) => {
+        //console.log(response);
+        this.classname = response.rows[0].byClass.bjmc;
+        this.childname = response.rows[0].byChild.name;
         this.teacherList = response.rows;
         this.xnxq = response.rows[0].xnxq;
         this.childid = response.rows[0].childid;

ruoyi-ui/src/views/system/roleexplain/index.vue

@@ -6,7 +6,7 @@
           <span>{{ scope.row.name }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="拥有权限" :show-overflow-tooltip="true">
+      <el-table-column label="拥有权限">
         <template slot-scope="scope">
           <!-- <el-tag size="medium">{{ scope.row.role }}</el-tag> -->
           <div style="color: #409eff" v-html="scope.row.role"></div>

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

@@ -3,6 +3,8 @@ package com.ruoyi.project.benyi.controller;
 import java.util.List;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.benyi.domain.ByChild;
+import com.ruoyi.project.benyi.service.IByChildService;
 import com.ruoyi.project.common.SchoolCommon;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@ public class ByChildLearndevelopmentFamilyController extends BaseController {
     @Autowired
     private IByChildLearndevelopmentFamilyService byChildLearndevelopmentFamilyService;
     @Autowired
+    private IByChildService byChildService;
+    @Autowired
     private SchoolCommon schoolCommon;
 
     /**
@@ -87,12 +91,20 @@ public class ByChildLearndevelopmentFamilyController extends BaseController {
             ByChildLearndevelopmentFamily byChildLearndevelopmentFamilyNew = new ByChildLearndevelopmentFamily();
             byChildLearndevelopmentFamilyNew.setXnxq(byChildLearndevelopmentFamily.getXnxq());
             byChildLearndevelopmentFamilyNew.setChildid(byChildLearndevelopmentFamily.getChildid());
-            List<ByChildLearndevelopmentFamily> list = byChildLearndevelopmentFamilyService.selectByChildLearndevelopmentFamilyList(byChildLearndevelopmentFamilyNew);
+            //幼儿信息 需要班级id
-            if (list != null && list.size() > 0) {
+            ByChild byChild = byChildService.selectByChildById(byChildLearndevelopmentFamily.getChildid());
-                return AjaxResult.error("当前学期的幼儿档案已创建，无法重复创建");
+            String strClassId = byChild.getClassid();
+            if (byChild != null && !schoolCommon.isStringEmpty(strClassId)) {
+                List<ByChildLearndevelopmentFamily> list = byChildLearndevelopmentFamilyService.selectByChildLearndevelopmentFamilyList(byChildLearndevelopmentFamilyNew);
+                if (list != null && list.size() > 0) {
+                    return AjaxResult.error("当前学期的幼儿档案已创建，无法重复创建");
+                }
+                byChildLearndevelopmentFamily.setClassid(strClassId);
+                byChildLearndevelopmentFamily.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
+                return toAjax(byChildLearndevelopmentFamilyService.insertByChildLearndevelopmentFamily(byChildLearndevelopmentFamily));
+            } else {
+                return AjaxResult.error("当前幼儿没有班级信息");
             }
-            byChildLearndevelopmentFamily.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
-            return toAjax(byChildLearndevelopmentFamilyService.insertByChildLearndevelopmentFamily(byChildLearndevelopmentFamily));
         } else {
             return AjaxResult.error("当前用户非幼儿园，无法添加幼儿档案");
         }

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

@@ -3,6 +3,8 @@ package com.ruoyi.project.benyi.controller;
 import java.util.List;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.benyi.domain.ByChild;
+import com.ruoyi.project.benyi.service.IByChildService;
 import com.ruoyi.project.common.SchoolCommon;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@ public class ByChildLearndevelopmentTeacherController extends BaseController {
     @Autowired
     private IByChildLearndevelopmentTeacherService byChildLearndevelopmentTeacherService;
     @Autowired
+    private IByChildService byChildService;
+    @Autowired
     private SchoolCommon schoolCommon;
 
     /**
@@ -87,12 +91,21 @@ public class ByChildLearndevelopmentTeacherController extends BaseController {
             ByChildLearndevelopmentTeacher byChildLearndevelopmentTeacherNew = new ByChildLearndevelopmentTeacher();
             byChildLearndevelopmentTeacherNew.setXnxq(byChildLearndevelopmentTeacher.getXnxq());
             byChildLearndevelopmentTeacherNew.setChildid(byChildLearndevelopmentTeacher.getChildid());
-            List<ByChildLearndevelopmentTeacher> list = byChildLearndevelopmentTeacherService.selectByChildLearndevelopmentTeacherList(byChildLearndevelopmentTeacherNew);
+
-            if (list != null && list.size() > 0) {
+            //幼儿信息 需要班级id
-                return AjaxResult.error("当前学期的幼儿档案已创建，无法重复创建");
+            ByChild byChild = byChildService.selectByChildById(byChildLearndevelopmentTeacher.getChildid());
+            String strClassId = byChild.getClassid();
+            if (byChild != null && !schoolCommon.isStringEmpty(strClassId)) {
+                List<ByChildLearndevelopmentTeacher> list = byChildLearndevelopmentTeacherService.selectByChildLearndevelopmentTeacherList(byChildLearndevelopmentTeacherNew);
+                if (list != null && list.size() > 0) {
+                    return AjaxResult.error("当前学期的幼儿档案已创建，无法重复创建");
+                }
+                byChildLearndevelopmentTeacher.setClassid(strClassId);
+                byChildLearndevelopmentTeacher.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
+                return toAjax(byChildLearndevelopmentTeacherService.insertByChildLearndevelopmentTeacher(byChildLearndevelopmentTeacher));
+            } else {
+                return AjaxResult.error("当前幼儿没有班级信息");
             }
-            byChildLearndevelopmentTeacher.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId());
-            return toAjax(byChildLearndevelopmentTeacherService.insertByChildLearndevelopmentTeacher(byChildLearndevelopmentTeacher));
         } else {
             return AjaxResult.error("当前用户非幼儿园，无法添加幼儿档案");
         }

ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildLearndevelopmentFamily.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.domain;
 
+import com.ruoyi.project.system.domain.ByClass;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -97,6 +98,26 @@ public class ByChildLearndevelopmentFamily extends BaseEntity {
     @Excel(name = "创建人")
     private Long createuserid;
 
+    public ByClass getByClass() {
+        return byClass;
+    }
+
+    public void setByClass(ByClass byClass) {
+        this.byClass = byClass;
+    }
+
+    private ByClass byClass;
+
+    public ByChild getByChild() {
+        return byChild;
+    }
+
+    public void setByChild(ByChild byChild) {
+        this.byChild = byChild;
+    }
+
+    private ByChild byChild;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -227,6 +248,8 @@ public class ByChildLearndevelopmentFamily extends BaseEntity {
                 .append("jspyremarks", getJspyremarks())
                 .append("createuserid", getCreateuserid())
                 .append("createTime", getCreateTime())
+                .append("byClass", getByClass())
+                .append("byChild", getByChild())
                 .toString();
     }
 }

ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildLearndevelopmentTeacher.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.domain;
 
+import com.ruoyi.project.system.domain.ByClass;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -97,6 +98,26 @@ public class ByChildLearndevelopmentTeacher extends BaseEntity {
     @Excel(name = "创建人")
     private Long createuserid;
 
+    public ByClass getByClass() {
+        return byClass;
+    }
+
+    public void setByClass(ByClass byClass) {
+        this.byClass = byClass;
+    }
+
+    private ByClass byClass;
+
+    public ByChild getByChild() {
+        return byChild;
+    }
+
+    public void setByChild(ByChild byChild) {
+        this.byChild = byChild;
+    }
+
+    private ByChild byChild;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -227,6 +248,8 @@ public class ByChildLearndevelopmentTeacher extends BaseEntity {
                 .append("jyjhremarks", getJyjhremarks())
                 .append("createuserid", getCreateuserid())
                 .append("createTime", getCreateTime())
+                .append("byClass", getByClass())
+                .append("byChild", getByChild())
                 .toString();
     }
 }

ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentFamilyMapper.xml

@@ -20,10 +20,38 @@
         <result property="jspyremarks" column="jspyremarks"/>
         <result property="createuserid" column="createuserid"/>
         <result property="createTime" column="create_time"/>
+        <association property="byClass" column="classid" javaType="ByClass" resultMap="ByClassResult"/>
+        <association property="byChild" column="childid" javaType="ByChild" resultMap="ByChildResult"/>
+    </resultMap>
+
+    <resultMap type="ByClass" id="ByClassResult">
+        <result property="bjbh" column="bjbh"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="bjtype" column="bjtype"/>
+        <result property="bhxh" column="bhxh"/>
+        <result property="xn" column="xn"/>
+        <result property="bjmc" column="bjmc"/>
+        <result property="bjrych" column="bjrych"/>
+        <result property="jbny" column="jbny"/>
+        <result property="zbjs" column="zbjs"/>
+        <result property="pbjs" column="pbjs"/>
+        <result property="zljs" column="zljs"/>
+        <result property="isdel" column="isdel"/>
+        <result property="createtime" column="createtime"/>
+    </resultMap>
+
+    <resultMap type="ByChild" id="ByChildResult">
+        <result property="id" column="id"/>
+        <result property="schoolid" column="schoolid"/>
+        <result property="classid" column="classid"/>
+        <result property="name" column="name"/>
+        <result property="enName" column="en_name"/>
     </resultMap>
 
     <sql id="selectByChildLearndevelopmentFamilyVo">
-        select a.id, a.childid, a.xnxq, a.zpimgs, a.zpimgremarks, a.shimgs, a.shimgsremarks, a.yqsj, a.yqsjremarks, a.jspy, a.jspyremarks, a.createuserid, a.create_time,b.schoolid, b.classid from by_child_learndevelopment_family  a left join by_child b on a.childid=b.id
+        select a.id, a.childid, b.name, a.xnxq, a.zpimgs, a.zpimgremarks, a.shimgs, a.shimgsremarks, a.yqsj, a.yqsjremarks, a.jspy, a.jspyremarks, a.createuserid, a.create_time,b.schoolid, a.classid,c.bjmc from by_child_learndevelopment_family  a
+        left join by_child b on a.childid=b.id
+        left join by_class c on a.classid=c.bjbh
     </sql>
 
     <select id="selectByChildLearndevelopmentFamilyList" parameterType="ByChildLearndevelopmentFamily"
@@ -60,6 +88,7 @@
             <if test="id != null ">id,</if>
             <if test="childid != null ">childid,</if>
             <if test="xnxq != null  and xnxq != ''">xnxq,</if>
+            <if test="classid != null  and classid != ''">classid,</if>
             <if test="zpimgs != null  and zpimgs != ''">zpimgs,</if>
             <if test="zpimgremarks != null  and zpimgremarks != ''">zpimgremarks,</if>
             <if test="shimgs != null  and shimgs != ''">shimgs,</if>
@@ -75,6 +104,7 @@
             <if test="id != null ">#{id},</if>
             <if test="childid != null ">#{childid},</if>
             <if test="xnxq != null  and xnxq != ''">#{xnxq},</if>
+            <if test="classid != null  and classid != ''">#{classid},</if>
             <if test="zpimgs != null  and zpimgs != ''">#{zpimgs},</if>
             <if test="zpimgremarks != null  and zpimgremarks != ''">#{zpimgremarks},</if>
             <if test="shimgs != null  and shimgs != ''">#{shimgs},</if>

ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentTeacherMapper.xml

@@ -20,10 +20,38 @@
         <result property="jyjhremarks" column="jyjhremarks"/>
         <result property="createuserid" column="createuserid"/>
         <result property="createTime" column="create_time"/>
+        <association property="byClass" column="classid" javaType="ByClass" resultMap="ByClassResult"/>
+        <association property="byChild" column="childid" javaType="ByChild" resultMap="ByChildResult"/>
+    </resultMap>
+
+    <resultMap type="ByClass" id="ByClassResult">
+        <result property="bjbh" column="bjbh"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="bjtype" column="bjtype"/>
+        <result property="bhxh" column="bhxh"/>
+        <result property="xn" column="xn"/>
+        <result property="bjmc" column="bjmc"/>
+        <result property="bjrych" column="bjrych"/>
+        <result property="jbny" column="jbny"/>
+        <result property="zbjs" column="zbjs"/>
+        <result property="pbjs" column="pbjs"/>
+        <result property="zljs" column="zljs"/>
+        <result property="isdel" column="isdel"/>
+        <result property="createtime" column="createtime"/>
+    </resultMap>
+
+    <resultMap type="ByChild" id="ByChildResult">
+        <result property="id" column="id"/>
+        <result property="schoolid" column="schoolid"/>
+        <result property="classid" column="classid"/>
+        <result property="name" column="name"/>
+        <result property="enName" column="en_name"/>
     </resultMap>
 
     <sql id="selectByChildLearndevelopmentTeacherVo">
-        select a.id, a.childid, a.xnxq, a.gcjl, a.gcjlremarks, a.wtyfa, a.wtyfaremarks, a.pgjg, a.pgjgremarks, a.jyjh, a.jyjhremarks, a.createuserid, a.create_time,b.schoolid, b.classid from by_child_learndevelopment_teacher  a left join by_child b on a.childid=b.id
+        select a.id, a.childid, b.name, a.xnxq, a.gcjl, a.gcjlremarks, a.wtyfa, a.wtyfaremarks, a.pgjg, a.pgjgremarks, a.jyjh, a.jyjhremarks, a.createuserid, a.create_time,b.schoolid, a.classid,c.bjmc from by_child_learndevelopment_teacher  a
+        left join by_child b on a.childid=b.id
+        left join by_class c on a.classid=c.bjbh
     </sql>
 
     <select id="selectByChildLearndevelopmentTeacherList" parameterType="ByChildLearndevelopmentTeacher"
@@ -60,6 +88,7 @@
             <if test="id != null ">id,</if>
             <if test="childid != null ">childid,</if>
             <if test="xnxq != null  and xnxq != ''">xnxq,</if>
+            <if test="classid != null  and classid != ''">classid,</if>
             <if test="gcjl != null  and gcjl != ''">gcjl,</if>
             <if test="gcjlremarks != null  and gcjlremarks != ''">gcjlremarks,</if>
             <if test="wtyfa != null  and wtyfa != ''">wtyfa,</if>
@@ -75,6 +104,7 @@
             <if test="id != null ">#{id},</if>
             <if test="childid != null ">#{childid},</if>
             <if test="xnxq != null  and xnxq != ''">#{xnxq},</if>
+            <if test="classid != null  and classid != ''">#{classid},</if>
             <if test="gcjl != null  and gcjl != ''">#{gcjl},</if>
             <if test="gcjlremarks != null  and gcjlremarks != ''">#{gcjlremarks},</if>
             <if test="wtyfa != null  and wtyfa != ''">#{wtyfa},</if>