Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化儿童体检表

Browse Source
This commit is contained in:
sk1551
2020-08-18 18:54:41 +08:00
parent 7c5ac8e992
commit 381e15ef9c
3 changed files with 93 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildHealthCheck.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.project.benyi.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
@ -121,6 +122,8 @@ public class ByChildHealthCheck extends BaseEntity {
private ByChild byChild;
private ByClass byClass;
private Long createuser;
public void setId(Long id) {
@ -272,6 +275,7 @@ public class ByChildHealthCheck extends BaseEntity {
.append("createtime", getCreatetime())
.append("createuser", getCreateuser())
.append("byChild", getByChild())
.append("byClass", getByChild())
.toString();
}
@ -290,4 +294,12 @@ public class ByChildHealthCheck extends BaseEntity {
public void setByChild(ByChild byChild) {
this.byChild = byChild;
}
public ByClass getByClass() {
return byClass;
}
public void setByClass(ByClass byClass) {
this.byClass = byClass;
}
}

29
ruoyi/src/main/resources/mybatis/benyi/ByChildHealthCheckMapper.xml
View File

@ -23,6 +23,26 @@
<result property="createtime" column="createtime"/>
<result property="createuser" column="createuser"/>
<association property="byChild" column="id" javaType="ByChild" resultMap="ByChildResult" />
<association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult" />
</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="zbjsxm" column="zbjsxm"/>
<result property="pbjs" column="pbjs"/>
<result property="pbjsxm" column="pbjsxm"/>
<result property="zljs" column="zljs"/>
<result property="zljsxm" column="zljsxm"/>
<result property="isdel" column="isdel"/>
<result property="createtime" column="createtime"/>
</resultMap>
<resultMap type="ByChild" id="ByChildResult">
@ -71,9 +91,10 @@
<sql id="selectByChildHealthCheckVo">
select h.id, h.child_id, h.class_info, h.school_name, h.check_time, h.doctor_name, h.eyes_vision_left, h.eyes_vision_right, h.vision_assessment, h.decayed_tooth, h.weight, h.weight_assessment, h.height, h.height_assessment, h.total_assessment, h.createtime, h.createuser,
c.id, c.schoolid, c.classid, c.name
from by_child_health_check h
left join by_child c on h.child_id = c.id
c.id, c.schoolid, c.classid, c.name, b.bjbh, b.bjmc
from by_child_health_check h
left join by_child c on h.child_id = c.id
left join by_class b on h.class_info = b.bjbh
</sql>
<select id="selectByChildHealthCheckList" parameterType="ByChildHealthCheck" resultMap="ByChildHealthCheckResult">
@ -109,7 +130,7 @@
<select id="selectByChildHealthCheckById" parameterType="Long" resultMap="ByChildHealthCheckResult">
<include refid="selectByChildHealthCheckVo"/>
where id = #{id}
where h.id = #{id}
</select>
<insert id="insertByChildHealthCheck" parameterType="ByChildHealthCheck" useGeneratedKeys="true" keyProperty="id">