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

幼儿评估

Browse Source
This commit is contained in:
paidaxing444
2020-11-05 17:19:00 +08:00
parent d90fa8a860
commit ff6935c349
10 changed files with 356 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java
View File

@ -52,7 +52,7 @@ public class ByAssessmentcontentController extends BaseController {
/**
* 查询评估内容列表
*/
@PreAuthorize("@ss.hasPermi('benyi:assessmentstudy:list')")
@PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:list')")
@GetMapping("/treeselectstudy")
public AjaxResult treeselectstudy(ByAssessmentcontent byAssessmentcontent) {
List<ByAssessmentcontent> list = byAssessmentcontentService.selectByAssessmentcontentstudyList(byAssessmentcontent);

4
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentintroduceController.java
View File

@ -36,7 +36,7 @@ public class ByAssessmentintroduceController extends BaseController {
/**
* 查询评估体系介绍列表
*/
@PreAuthorize("@ss.hasPermi('benyi:assessmentintroduce:list')")
@PreAuthorize("@ss.hasPermi('benyi:assessmentintroduce:list')" + "||@ss.hasPermi('benyi:assessmentcontent:list')")
@GetMapping("/list")
public TableDataInfo list(ByAssessmentintroduce byAssessmentintroduce) {
startPage();
@ -59,7 +59,7 @@ public class ByAssessmentintroduceController extends BaseController {
/**
* 获取评估体系介绍详细信息
*/
@PreAuthorize("@ss.hasPermi('benyi:assessmentintroduce:query')")
@PreAuthorize("@ss.hasPermi('benyi:assessmentintroduce:query')" + "||@ss.hasPermi('benyi:assessmentcontent:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(byAssessmentintroduceService.selectByAssessmentintroduceById(id));

17
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentchild.java
View File

@ -25,6 +25,12 @@ public class ByAssessmentchild extends BaseEntity {
@Excel(name = "幼儿编号")
private Long childid;
/**
* 班级编号
*/
@Excel(name = "班级编号")
private String classid;
/**
* 测评内容编号
*/
@ -65,6 +71,14 @@ public class ByAssessmentchild extends BaseEntity {
return childid;
}
public void setClassid(String classid) {
this.classid = classid;
}
public String getClassid() {
return classid;
}
public void setContentid(Long contentid) {
this.contentid = contentid;
}
@ -102,6 +116,7 @@ public class ByAssessmentchild extends BaseEntity {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("childid", getChildid())
.append("classid", getClassid())
.append("contentid", getContentid())
.append("type", getType())
.append("xn", getXn())
@ -109,4 +124,4 @@ public class ByAssessmentchild extends BaseEntity {
.append("createTime", getCreateTime())
.toString();
}
}
}

17
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentrecordchild.java
View File

@ -25,6 +25,12 @@ public class ByAssessmentrecordchild extends BaseEntity {
@Excel(name = "幼儿编号")
private Long childid;
/**
* 班级编号
*/
@Excel(name = "班级编号")
private String classid;
/**
* 学年
*/
@ -65,6 +71,14 @@ public class ByAssessmentrecordchild extends BaseEntity {
return childid;
}
public void setClassid(String classid) {
this.classid = classid;
}
public String getClassid() {
return classid;
}
public void setXn(String xn) {
this.xn = xn;
}
@ -102,6 +116,7 @@ public class ByAssessmentrecordchild extends BaseEntity {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("childid", getChildid())
.append("classid", getClassid())
.append("xn", getXn())
.append("state", getState())
.append("scope", getScope())
@ -109,4 +124,4 @@ public class ByAssessmentrecordchild extends BaseEntity {
.append("createTime", getCreateTime())
.toString();
}
}
}

7
ruoyi/src/main/resources/mybatis/benyi/ByAssessmentchildMapper.xml
View File

@ -7,6 +7,7 @@
<resultMap type="ByAssessmentchild" id="ByAssessmentchildResult">
<result property="id" column="id"/>
<result property="childid" column="childid"/>
<result property="classid" column="classid"/>
<result property="contentid" column="contentid"/>
<result property="type" column="type"/>
<result property="xn" column="xn"/>
@ -15,13 +16,14 @@
</resultMap>
<sql id="selectByAssessmentchildVo">
select id, childid, contentid, type, xn, userid, create_time from by_assessmentchild
select id, childid, classid, contentid, type, xn, userid, create_time from by_assessmentchild
</sql>
<select id="selectByAssessmentchildList" parameterType="ByAssessmentchild" resultMap="ByAssessmentchildResult">
<include refid="selectByAssessmentchildVo"/>
<where>
<if test="childid != null ">and childid = #{childid}</if>
<if test="classid != null and classid != ''">and classid = #{classid}</if>
<if test="contentid != null ">and contentid = #{contentid}</if>
<if test="type != null and type != ''">and type = #{type}</if>
<if test="xn != null and xn != ''">and xn = #{xn}</if>
@ -38,6 +40,7 @@
insert into by_assessmentchild
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="childid != null ">childid,</if>
<if test="classid != null and classid != ''">classid,</if>
<if test="contentid != null ">contentid,</if>
<if test="type != null and type != ''">type,</if>
<if test="xn != null and xn != ''">xn,</if>
@ -46,6 +49,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="childid != null ">#{childid},</if>
<if test="classid != null and classid != ''">#{classid},</if>
<if test="contentid != null ">#{contentid},</if>
<if test="type != null and type != ''">#{type},</if>
<if test="xn != null and xn != ''">#{xn},</if>
@ -58,6 +62,7 @@
update by_assessmentchild
<trim prefix="SET" suffixOverrides=",">
<if test="childid != null ">childid = #{childid},</if>
<if test="classid != null and classid != ''">classid = #{classid},</if>
<if test="contentid != null ">contentid = #{contentid},</if>
<if test="type != null and type != ''">type = #{type},</if>
<if test="xn != null and xn != ''">xn = #{xn},</if>

9
ruoyi/src/main/resources/mybatis/benyi/ByAssessmentrecordchildMapper.xml
View File

@ -2,11 +2,12 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.benyi.mapper.ByAssessmentrecordchildMapper">
<mapper namespace="com.ruoyi.project.system.mapper.ByAssessmentrecordchildMapper">
<resultMap type="ByAssessmentrecordchild" id="ByAssessmentrecordchildResult">
<result property="id" column="id"/>
<result property="childid" column="childid"/>
<result property="classid" column="classid"/>
<result property="xn" column="xn"/>
<result property="state" column="state"/>
<result property="scope" column="scope"/>
@ -15,7 +16,7 @@
</resultMap>
<sql id="selectByAssessmentrecordchildVo">
select id, childid, xn, state, scope, userid, create_time from by_assessmentrecordchild
select id, childid, classid, xn, state, scope, userid, create_time from by_assessmentrecordchild
</sql>
<select id="selectByAssessmentrecordchildList" parameterType="ByAssessmentrecordchild"
@ -23,6 +24,7 @@
<include refid="selectByAssessmentrecordchildVo"/>
<where>
<if test="childid != null ">and childid = #{childid}</if>
<if test="classid != null and classid != ''">and classid = #{classid}</if>
<if test="xn != null and xn != ''">and xn = #{xn}</if>
<if test="state != null and state != ''">and state = #{state}</if>
<if test="scope != null and scope != ''">and scope = #{scope}</if>
@ -40,6 +42,7 @@
insert into by_assessmentrecordchild
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="childid != null ">childid,</if>
<if test="classid != null and classid != ''">classid,</if>
<if test="xn != null and xn != ''">xn,</if>
<if test="state != null and state != ''">state,</if>
<if test="scope != null and scope != ''">scope,</if>
@ -48,6 +51,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="childid != null ">#{childid},</if>
<if test="classid != null and classid != ''">#{classid},</if>
<if test="xn != null and xn != ''">#{xn},</if>
<if test="state != null and state != ''">#{state},</if>
<if test="scope != null and scope != ''">#{scope},</if>
@ -60,6 +64,7 @@
update by_assessmentrecordchild
<trim prefix="SET" suffixOverrides=",">
<if test="childid != null ">childid = #{childid},</if>
<if test="classid != null and classid != ''">classid = #{classid},</if>
<if test="xn != null and xn != ''">xn = #{xn},</if>
<if test="state != null and state != ''">state = #{state},</if>
<if test="scope != null and scope != ''">scope = #{scope},</if>