幼儿评估

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import java.util.ArrayList;
@@ -127,6 +128,37 @@ public class ByChildController extends BaseController {
         return AjaxResult.success(byChildService.selectByChildById(id));
     }
 
+    /**
+     * 获取幼儿信息详细信息-评估用
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:child:query')")
+    @GetMapping(value = "/assessmentchild/{id}")
+    public AjaxResult getChildInfo(@PathVariable("id") Long id) {
+        AjaxResult ajax = AjaxResult.success();
+        ByChild byChild = byChildService.selectByChildById(id);
+        ajax.put(AjaxResult.DATA_TAG, byChild);
+        //根据生日判断评估适用项 36-48:1 48-60:2 60-72:3
+        System.out.println("csrq:"+byChild.getCsrq());
+        if (byChild.getCsrq() != null) {
+            int iMonths = schoolCommon.getDifMonth(new Date(), byChild.getCsrq());
+            if (iMonths >= 36 && iMonths <= 48) {
+                ajax.put("isAssessment", 1);
+            } else if (iMonths >= 48 && iMonths < 60) {
+                ajax.put("isAssessment", 2);
+            } else if (iMonths >= 60 && iMonths <= 72) {
+                ajax.put("isAssessment", 3);
+            }else{
+                ajax.put("isAssessment", 0);
+            }
+        } else {
+            ajax.put("isAssessment", 0);
+        }
+
+        ajax.put("trem",schoolCommon.getCurrentXnXq());
+
+        return ajax;
+    }
+
     /**
      * 获取维护幼儿信息
      */

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

@@ -46,6 +46,13 @@ public class ByAssessmentcontent extends BaseEntity {
     @Excel(name = "序号")
     private Long sort;
 
+    /**
+     * 参考标准
+     */
+    @Excel(name = "参考标准")
+    private String ckbz;
+
+
     public String getParentName() {
         return parentName;
     }
@@ -118,6 +125,16 @@ public class ByAssessmentcontent extends BaseEntity {
         return sort;
     }
 
+    public void setCkbz(String ckbz) {
+        this.ckbz = ckbz;
+    }
+
+    public String getCkbz() {
+        return ckbz;
+
+    }
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -128,6 +145,7 @@ public class ByAssessmentcontent extends BaseEntity {
                 .append("scope", getScope())
                 .append("createTime", getCreateTime())
                 .append("sort", getSort())
+                .append("ckbz", getCkbz())
                 .toString();
     }
 

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

@@ -11,11 +11,12 @@
         <result property="iselement" column="iselement"/>
         <result property="scope" column="scope"/>
         <result property="createTime" column="create_time"/>
-        <result property="sort"    column="sort"    />
+        <result property="sort" column="sort"/>
+        <result property="ckbz" column="ckbz"/>
     </resultMap>
 
     <sql id="selectByAssessmentcontentVo">
-        select id, parentId, name, iselement, scope, create_time, sort from by_assessmentcontent
+        select id, parentId, name, iselement, scope, create_time, sort, ckbz from by_assessmentcontent
     </sql>
 
     <select id="selectByAssessmentcontentList" parameterType="ByAssessmentcontent"
@@ -65,6 +66,7 @@ order by t.sort
             <if test="scope != null  and scope != ''">scope,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="sort != null ">sort,</if>
+            <if test="ckbz != null  and ckbz != ''">ckbz,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="parentId != null ">#{parentId},</if>
@@ -73,6 +75,7 @@ order by t.sort
             <if test="scope != null  and scope != ''">#{scope},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="sort != null ">#{sort},</if>
+            <if test="ckbz != null  and ckbz != ''">#{ckbz},</if>
         </trim>
     </insert>
 
@@ -85,6 +88,7 @@ order by t.sort
             <if test="scope != null  and scope != ''">scope = #{scope},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="sort != null ">sort = #{sort},</if>
+            <if test="ckbz != null  and ckbz != ''">ckbz = #{ckbz},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -109,9 +109,10 @@
 
     <sql id="selectByChildVo">
         select c.id, c.schoolid, c.classid, c.name, c.en_name, c.infant_name, c.phone, c.xb, c.mz, c.zjhm, c.csrq, c.birth_province, c.birth_provincename, c.birth_city, c.birth_cityname, c.birth_area, c.birth_areaname, c.registered_province, c.registered_provincename, c.registered_city, c.registered_cityname, c.registered_area, c.registered_areaname, c.addr_province, c.addr_provincename, c.addr_city, c.addr_cityname, c.addr_area, c.addr_areaname, c.addr_detail, c.ever_school, c.learn_english, c.source, c.status, c.enter_date, c.out_date, c.first_language, c.seconder_language, c.other_language, c.createuserid, c.create_time, p.fathername, p.mothername,
-        p.childid, p.fphone, p.foffphone, p.mphone, p.moffphone, p.grandfathername, p.gfgx, p.gfphone, p.gfoffphone, p.gfaddress, p.grandmothername, p.gmgx, p.gmphone, p.gmaddress, p.gmoffphone, p.create_time
+        p.childid, p.fphone, p.foffphone, p.mphone, p.moffphone, p.grandfathername, p.gfgx, p.gfphone, p.gfoffphone, p.gfaddress, p.grandmothername, p.gmgx, p.gmphone, p.gmaddress, p.gmoffphone, p.create_time,a.bjmc,(select nick_name from sys_user where user_id=a.zbjs) as zbjsmc
         from by_child c
         left join by_child_contactpeople p on c.id=p.childid
+        left join by_class a on c.classid=a.bjbh
     </sql>
 
     <select id="selectByChildList" parameterType="ByChild" resultMap="ByChildResult">