diff --git a/ruoyi-ui/src/api/benyi/child.js b/ruoyi-ui/src/api/benyi/child.js
index fdb052e81..371d73db8 100644
--- a/ruoyi-ui/src/api/benyi/child.js
+++ b/ruoyi-ui/src/api/benyi/child.js
@@ -26,6 +26,14 @@ export function getChild(id) {
})
}
+// 查询幼儿信息详细
+export function getChildByAssessment(id) {
+ return request({
+ url: '/benyi/child/assessmentchild/' + id,
+ method: 'get'
+ })
+}
+
// 查询维护幼儿详细
export function getChild_query(query) {
return request({
diff --git a/ruoyi-ui/src/views/benyi/assessment/student.vue b/ruoyi-ui/src/views/benyi/assessment/student.vue
index 4a0806d0b..ac813ac70 100644
--- a/ruoyi-ui/src/views/benyi/assessment/student.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/student.vue
@@ -2,11 +2,11 @@
<div class="app-container">
<div class="flex align-center justify-between">
<p class="title flex align-center">
- <span>姓名：张三 </span>
- <span>出生日期：男 </span>
- <span>班级：圆圆班 </span>
- <span>学期：2020-2021 </span>
- <span>班长：2021 </span>
+ <span>姓名：{{ this.childName }} </span>
+ <span>出生日期：{{ this.childCsrq }} </span>
+ <span>班级：{{ this.bjmc }} </span>
+ <span>学期：{{ this.trem }} </span>
+ <span>班长：{{ this.zbjsxm }} </span>
</p>
<el-button
type="primary"
@@ -36,7 +36,58 @@
</el-table-column>
</el-table> -->
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
- <el-tab-pane label="健康" name="first">
+ <el-tab-pane
+ v-for="itemLy in assessmentcontentList.filter(
+ (p) => p.parentId == this.assessmentscope
+ )"
+ :key="itemLy.id"
+ :label="itemLy.name"
+ :name="itemLy.name"
+ >
+ <div
+ class="block"
+ v-for="itemFzly in assessmentcontentList.filter(
+ (p) => p.parentId == itemLy.id
+ )"
+ :key="itemFzly.id"
+ >
+ <h2 class="block-item-title flex align-center">
+ {{ itemFzly.name }}
+ </h2>
+ <ul class="block-content">
+ <li
+ v-for="itemMb in assessmentcontentList.filter(
+ (p) => p.parentId == itemFzly.id
+ )"
+ :key="itemMb.id"
+ >
+ <p class="block-content-title">
+ <span class="num">{{ itemMb.sort }}. </span>{{ itemMb.name }}
+ </p>
+ <div
+ class="checkbox-content"
+ v-for="itemYs in assessmentcontentList.filter(
+ (p) => p.parentId == itemMb.id
+ )"
+ :key="itemYs.id"
+ >
+ <p class="checkbox-item flex align-center">
+ <el-checkbox v-model="itemYs.id">{{
+ itemYs.name
+ }}</el-checkbox>
+ </p>
+ <div class="check-info" v-if="itemYs.ckbz">
+ {{ itemYs.ckbz }}
+ <!-- <p>男孩：身高：94.9-111.7厘米，体重：12.7-21.2公斤</p>
+ <p>女孩：身高：94.1-111.3厘米，体重：12.3-21.5公斤</p> -->
+ </div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </el-tab-pane>
+
+ <!-- <el-tab-pane label="健康" name="first">
<div class="block">
<h2 class="block-item-title flex align-center">身心状况</h2>
<ul class="block-content">
@@ -90,7 +141,7 @@
<el-tab-pane label="语言" name="second">配置管理</el-tab-pane>
<el-tab-pane label="社会" name="third">角色管理</el-tab-pane>
<el-tab-pane label="科学" name="fourth">定时任务补偿</el-tab-pane>
- <el-tab-pane label="艺术" name="five">定时任务补偿</el-tab-pane>
+ <el-tab-pane label="艺术" name="five">定时任务补偿</el-tab-pane> -->
</el-tabs>
</div>
</template>
@@ -104,12 +155,19 @@ import {
exportAssessmentcontent,
} from "@/api/benyi/assessmentcontent";
+import { getChildByAssessment } from "@/api/benyi/child";
+
export default {
name: "Assessmentstudent",
data() {
return {
- checkedValues: [],
+ childName: "",
+ childCsrq: "",
+ bjmc: "",
+ trem: "",
+ zbjsxm: "",
+ assessmentscope: "",
// 遮罩层
loading: true,
// 选中数组
@@ -124,19 +182,44 @@ export default {
scope: undefined,
sort: undefined,
},
- activeName: "first",
+ activeName: "健康",
checked: false,
};
},
created() {
- this.getList();
+ // this.getList();
+ const childId = this.$route.params && this.$route.params.id;
+ console.log("childId:" + childId);
+ this.getChild(childId);
},
methods: {
+ getChild(childId) {
+ getChildByAssessment(childId).then((response) => {
+ console.log(response);
+ if (response.code == "200") {
+ this.childName = response.data.name;
+ this.childCsrq = response.data.csrq;
+ this.trem = response.trem;
+ this.bjmc = response.data.bjmc;
+ this.zbjsxm = response.data.zbjsmc;
+ if (response.isAssessment == "0") {
+ this.msgError(
+ "当前幼儿出生日期不符合评估范围，幼儿评估范围为36-72个月"
+ );
+ } else {
+ this.assessmentscope = response.isAssessment;
+
+ this.getList();
+ }
+ }
+ });
+ },
/** 查询评估内容列表 */
getList() {
this.loading = true;
listAssessmentcontent(this.queryParams).then((response) => {
- this.assessmentcontentList = this.handleTree(response.rows, "id");
+ console.log("rows:" + response.rows);
+ this.assessmentcontentList = response.rows;
this.loading = false;
});
},
@@ -150,12 +233,8 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
- // 多选框选中数据
- handleSelectionChange(row) {},
/** 提交按钮 */
- submitForm: function () {
- console.log("checkedValues:" + this.checkedValues);
- },
+ submitForm: function () {},
handleClick(tab) {
// this.activeName = tab
},
diff --git a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
index e94aef016..0ce8de695 100644
--- a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
@@ -104,6 +104,14 @@
placeholder="请输入内容"
/>
</el-form-item>
+ <el-form-item label="参考标准" prop="ckbz">
+ <el-input
+ v-model="form.ckbz"
+ type="textarea"
+ placeholder="请输入内容"
+ />
+ </el-form-item>
+
<el-form-item label="是否元素" prop="iselement">
<el-select v-model="form.iselement" placeholder="请选择是否元素">
<el-option
@@ -260,6 +268,7 @@ export default {
scope: undefined,
createTime: undefined,
sort: 0,
+ ckbz: undefined,
};
this.resetForm("form");
},
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java
index 0ca59a223..28ad1b3eb 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java
+++ b/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;
+ }
+
/**
* 获取维护幼儿信息
*/
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java
index f9f0395ef..2c9e6ea25 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java
+++ b/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();
}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
index 1d2a3ec8b..214bdd250 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
+++ b/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>
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml
index ddfdc0782..b34803630 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml
+++ b/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">