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

评估-教育建议

Browse Source
This commit is contained in:
zhanglipeng
2020-11-21 22:34:06 +08:00
parent e858bba93e
commit b662833522
9 changed files with 151 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,16 @@ public class ByAssessmentcontentController extends BaseController {
return getDataTable(list);
}
/**
* 查询幼儿未评估内容列表
*/
@PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:list')")
@GetMapping("/noassessment/list/{child}")
public TableDataInfo listno(@PathVariable("child") Long child) {
List<ByAssessmentcontent> list = byAssessmentcontentService.selectNoByAssessmentcontentListByChild(child);
return getDataTable(list);
}
/**
* 查询评估内容列表
*/

21
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByAssessmentcontent.java
View File

@ -52,6 +52,10 @@ public class ByAssessmentcontent extends BaseEntity {
@Excel(name = "参考标准")
private String ckbz;
@Excel(name = "教育建议")
private String jyjy;
private Long childid;
public String getParentName() {
return parentName;
@ -131,7 +135,22 @@ public class ByAssessmentcontent extends BaseEntity {
public String getCkbz() {
return ckbz;
}
public void setJyjy(String jyjy) {
this.jyjy = jyjy;
}
public String getJyjy() {
return jyjy;
}
public void setChildid(Long childid) {
this.childid = childid;
}
public Long getChildid() {
return childid;
}
@ -146,6 +165,8 @@ public class ByAssessmentcontent extends BaseEntity {
.append("createTime", getCreateTime())
.append("sort", getSort())
.append("ckbz", getCkbz())
.append("jyjy", getJyjy())
.append("childid", getChildid())
.toString();
}

8
ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java
View File

@ -27,6 +27,14 @@ public interface ByAssessmentcontentMapper {
*/
public List<ByAssessmentcontent> selectByAssessmentcontentList(ByAssessmentcontent byAssessmentcontent);
/**
* 查询幼儿未评估内容列表
*
* @param childId 幼儿id
* @return 评估内容集合
*/
public List<ByAssessmentcontent> selectNoByAssessmentcontentListByChild(Long childId);
/**
* 查询评估内容列表
*

8
ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java
View File

@ -28,6 +28,14 @@ public interface IByAssessmentcontentService {
*/
public List<ByAssessmentcontent> selectByAssessmentcontentList(ByAssessmentcontent byAssessmentcontent);
/**
* 查询幼儿未评估内容列表
*
* @param childId 幼儿id
* @return 评估内容集合
*/
public List<ByAssessmentcontent> selectNoByAssessmentcontentListByChild(Long childId);
/**
* 查询评估内容列表
*

11
ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java
View File

@ -47,6 +47,17 @@ public class ByAssessmentcontentServiceImpl implements IByAssessmentcontentServi
return byAssessmentcontentMapper.selectByAssessmentcontentList(byAssessmentcontent);
}
/**
* 查询幼儿未评估内容列表
*
* @param childId 幼儿id
* @return 评估内容集合
*/
@Override
public List<ByAssessmentcontent> selectNoByAssessmentcontentListByChild(Long childId){
return byAssessmentcontentMapper.selectNoByAssessmentcontentListByChild(childId);
}
/**
* 查询评估内容列表
*

14
ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml
View File

@ -13,10 +13,13 @@
<result property="createTime" column="create_time"/>
<result property="sort" column="sort"/>
<result property="ckbz" column="ckbz"/>
<result property="jyjy" column="jyjy" />
<result property="childid" column="childid" />
</resultMap>
<sql id="selectByAssessmentcontentVo">
select id, parentId, name, iselement, scope, create_time, sort, ckbz from by_assessmentcontent
select id, parentId, name, iselement, scope, create_time, sort, ckbz, jyjy from by_assessmentcontent
</sql>
<select id="selectByAssessmentcontentList" parameterType="ByAssessmentcontent"
@ -76,6 +79,12 @@ where find_in_set(id, getChildLst(#{id})) ;
where find_in_set(id, getChildLst(#{id})) and parentId>#{id} and iselement='N';
</select>
<!--根据幼儿id获取未评选的指标-->
<select id="selectNoByAssessmentcontentListByChild" parameterType="Long" resultMap="ByAssessmentcontentResult">
SELECT id, parentId, name, iselement, scope, create_time, sort, ckbz, jyjy FROM by_assessmentcontent
where id not in(select contentid from by_assessmentchild where childid=#{childid})
</select>
<insert id="insertByAssessmentcontent" parameterType="ByAssessmentcontent" useGeneratedKeys="true" keyProperty="id">
insert into by_assessmentcontent
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -86,6 +95,7 @@ where find_in_set(id, getChildLst(#{id})) and parentId>#{id} and iselement='N';
<if test="createTime != null ">create_time,</if>
<if test="sort != null ">sort,</if>
<if test="ckbz != null and ckbz != ''">ckbz,</if>
<if test="jyjy != null and jyjy != ''">jyjy,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="parentId != null ">#{parentId},</if>
@ -95,6 +105,7 @@ where find_in_set(id, getChildLst(#{id})) and parentId>#{id} and iselement='N';
<if test="createTime != null ">#{createTime},</if>
<if test="sort != null ">#{sort},</if>
<if test="ckbz != null and ckbz != ''">#{ckbz},</if>
<if test="jyjy != null and jyjy != ''">#{jyjy},</if>
</trim>
</insert>
@ -108,6 +119,7 @@ where find_in_set(id, getChildLst(#{id})) and parentId>#{id} and iselement='N';
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="sort != null ">sort = #{sort},</if>
<if test="ckbz != null and ckbz != ''">ckbz = #{ckbz},</if>
<if test="jyjy != null and jyjy != ''">jyjy = #{jyjy},</if>
</trim>
where id = #{id}
</update>