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

幼儿

Browse Source
This commit is contained in:
paidaxing444
2020-08-24 11:39:37 +08:00
parent 8af3981f77
commit 0c2953c36b
9 changed files with 102 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildCheckinDetailController.java
View File

@@ -56,7 +56,6 @@ public class ByChildCheckinDetailController extends BaseController {
byChildCheckinDetail.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
//判断是否为班主任
System.out.println(schoolCommon.getClassId());
if (!schoolCommon.isStringEmpty(schoolCommon.getClassId())) {
byChildCheckinDetail.setClassid(schoolCommon.getClassId());
}

1
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildContactpeopleController.java
View File

@@ -46,7 +46,6 @@ public class ByChildContactpeopleController extends BaseController {
startPage();
byChildContactpeople.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
//判断是否为班主任
System.out.println(schoolCommon.getClassId());
if (!schoolCommon.isStringEmpty(schoolCommon.getClassId())) {
byChildContactpeople.setClassid(schoolCommon.getClassId());
}

1
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildController.java
View File

@@ -46,7 +46,6 @@ public class ByChildController extends BaseController {
startPage();
byChild.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
//判断是否为班主任
System.out.println(schoolCommon.getClassId());
if (!schoolCommon.isStringEmpty(schoolCommon.getClassId())) {
byChild.setClassid(schoolCommon.getClassId());
}

5
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildLearndevelopmentFamilyController.java
View File

@@ -44,6 +44,11 @@ public class ByChildLearndevelopmentFamilyController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ByChildLearndevelopmentFamily byChildLearndevelopmentFamily) {
startPage();
byChildLearndevelopmentFamily.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
//判断是否为班主任
if (!schoolCommon.isStringEmpty(schoolCommon.getClassId())) {
byChildLearndevelopmentFamily.setClassid(schoolCommon.getClassId());
}
List<ByChildLearndevelopmentFamily> list = byChildLearndevelopmentFamilyService.selectByChildLearndevelopmentFamilyList(byChildLearndevelopmentFamily);
return getDataTable(list);
}

5
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildLearndevelopmentTeacherController.java
View File

@@ -44,6 +44,11 @@ public class ByChildLearndevelopmentTeacherController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ByChildLearndevelopmentTeacher byChildLearndevelopmentTeacher) {
startPage();
byChildLearndevelopmentTeacher.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
//判断是否为班主任
if (!schoolCommon.isStringEmpty(schoolCommon.getClassId())) {
byChildLearndevelopmentTeacher.setClassid(schoolCommon.getClassId());
}
List<ByChildLearndevelopmentTeacher> list = byChildLearndevelopmentTeacherService.selectByChildLearndevelopmentTeacherList(byChildLearndevelopmentTeacher);
return getDataTable(list);
}

30
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildLearndevelopmentFamily.java
View File

@@ -25,6 +25,18 @@ public class ByChildLearndevelopmentFamily extends BaseEntity {
@Excel(name = "幼儿id")
private Long childid;
/**
* 学校编码
*/
@Excel(name = "学校编码")
private Long schoolid;
/**
* 班级编码
*/
@Excel(name = "班级编码")
private String classid;
/**
* 学年学期
*/
@@ -101,6 +113,22 @@ public class ByChildLearndevelopmentFamily extends BaseEntity {
return childid;
}
public void setSchoolid(Long schoolid) {
this.schoolid = schoolid;
}
public Long getSchoolid() {
return schoolid;
}
public void setClassid(String classid) {
this.classid = classid;
}
public String getClassid() {
return classid;
}
public void setXnxq(String xnxq) {
this.xnxq = xnxq;
}
@@ -186,6 +214,8 @@ public class ByChildLearndevelopmentFamily extends BaseEntity {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("childid", getChildid())
.append("schoolid", getSchoolid())
.append("classid", getClassid())
.append("xnxq", getXnxq())
.append("zpimgs", getZpimgs())
.append("zpimgremarks", getZpimgremarks())

30
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByChildLearndevelopmentTeacher.java
View File

@@ -25,6 +25,18 @@ public class ByChildLearndevelopmentTeacher extends BaseEntity {
@Excel(name = "幼儿id")
private Long childid;
/**
* 学校编码
*/
@Excel(name = "学校编码")
private Long schoolid;
/**
* 班级编码
*/
@Excel(name = "班级编码")
private String classid;
/**
* 学年学期
*/
@@ -101,6 +113,22 @@ public class ByChildLearndevelopmentTeacher extends BaseEntity {
return childid;
}
public void setSchoolid(Long schoolid) {
this.schoolid = schoolid;
}
public Long getSchoolid() {
return schoolid;
}
public void setClassid(String classid) {
this.classid = classid;
}
public String getClassid() {
return classid;
}
public void setXnxq(String xnxq) {
this.xnxq = xnxq;
}
@@ -186,6 +214,8 @@ public class ByChildLearndevelopmentTeacher extends BaseEntity {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("childid", getChildid())
.append("schoolid", getSchoolid())
.append("classid", getClassid())
.append("xnxq", getXnxq())
.append("gcjl", getGcjl())
.append("gcjlremarks", getGcjlremarks())

28
ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentFamilyMapper.xml
View File

@@ -7,6 +7,8 @@
<resultMap type="ByChildLearndevelopmentFamily" id="ByChildLearndevelopmentFamilyResult">
<result property="id" column="id"/>
<result property="childid" column="childid"/>
<result property="schoolid" column="schoolid"/>
<result property="classid" column="classid"/>
<result property="xnxq" column="xnxq"/>
<result property="zpimgs" column="zpimgs"/>
<result property="zpimgremarks" column="zpimgremarks"/>
@@ -21,24 +23,26 @@
</resultMap>
<sql id="selectByChildLearndevelopmentFamilyVo">
select id, childid, xnxq, zpimgs, zpimgremarks, shimgs, shimgsremarks, yqsj, yqsjremarks, jspy, jspyremarks, createuserid, create_time from by_child_learndevelopment_family
select a.id, a.childid, a.xnxq, a.zpimgs, a.zpimgremarks, a.shimgs, a.shimgsremarks, a.yqsj, a.yqsjremarks, a.jspy, a.jspyremarks, a.createuserid, a.create_time,b.schoolid, b.classid from by_child_learndevelopment_family a left join by_child b on a.childid=b.id
</sql>
<select id="selectByChildLearndevelopmentFamilyList" parameterType="ByChildLearndevelopmentFamily"
resultMap="ByChildLearndevelopmentFamilyResult">
<include refid="selectByChildLearndevelopmentFamilyVo"/>
<where>
<if test="childid != null ">and childid = #{childid}</if>
<if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
<if test="zpimgs != null and zpimgs != ''">and zpimgs = #{zpimgs}</if>
<if test="zpimgremarks != null and zpimgremarks != ''">and zpimgremarks = #{zpimgremarks}</if>
<if test="shimgs != null and shimgs != ''">and shimgs = #{shimgs}</if>
<if test="shimgsremarks != null and shimgsremarks != ''">and shimgsremarks = #{shimgsremarks}</if>
<if test="yqsj != null and yqsj != ''">and yqsj = #{yqsj}</if>
<if test="yqsjremarks != null and yqsjremarks != ''">and yqsjremarks = #{yqsjremarks}</if>
<if test="jspy != null and jspy != ''">and jspy = #{jspy}</if>
<if test="jspyremarks != null and jspyremarks != ''">and jspyremarks = #{jspyremarks}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="childid != null ">and a.childid = #{childid}</if>
<if test="schoolid != null ">and b.schoolid = #{schoolid}</if>
<if test="classid != null and classid != ''">and b.classid = #{classid}</if>
<if test="xnxq != null and xnxq != ''">and a.xnxq = #{xnxq}</if>
<if test="zpimgs != null and zpimgs != ''">and a.zpimgs = #{zpimgs}</if>
<if test="zpimgremarks != null and zpimgremarks != ''">and a.zpimgremarks = #{zpimgremarks}</if>
<if test="shimgs != null and shimgs != ''">and a.shimgs = #{shimgs}</if>
<if test="shimgsremarks != null and shimgsremarks != ''">and a.shimgsremarks = #{shimgsremarks}</if>
<if test="yqsj != null and yqsj != ''">and a.yqsj = #{yqsj}</if>
<if test="yqsjremarks != null and yqsjremarks != ''">and a.yqsjremarks = #{yqsjremarks}</if>
<if test="jspy != null and jspy != ''">and a.jspy = #{jspy}</if>
<if test="jspyremarks != null and jspyremarks != ''">and a.jspyremarks = #{jspyremarks}</if>
<if test="createuserid != null ">and a.createuserid = #{createuserid}</if>
</where>
</select>

28
ruoyi/src/main/resources/mybatis/benyi/ByChildLearndevelopmentTeacherMapper.xml
View File

@@ -7,6 +7,8 @@
<resultMap type="ByChildLearndevelopmentTeacher" id="ByChildLearndevelopmentTeacherResult">
<result property="id" column="id"/>
<result property="childid" column="childid"/>
<result property="schoolid" column="schoolid"/>
<result property="classid" column="classid"/>
<result property="xnxq" column="xnxq"/>
<result property="gcjl" column="gcjl"/>
<result property="gcjlremarks" column="gcjlremarks"/>
@@ -21,24 +23,26 @@
</resultMap>
<sql id="selectByChildLearndevelopmentTeacherVo">
select id, childid, xnxq, gcjl, gcjlremarks, wtyfa, wtyfaremarks, pgjg, pgjgremarks, jyjh, jyjhremarks, createuserid, create_time from by_child_learndevelopment_teacher
select a.id, a.childid, a.xnxq, a.gcjl, a.gcjlremarks, a.wtyfa, a.wtyfaremarks, a.pgjg, a.pgjgremarks, a.jyjh, a.jyjhremarks, a.createuserid, a.create_time,b.schoolid, b.classid from by_child_learndevelopment_teacher a left join by_child b on a.childid=b.id
</sql>
<select id="selectByChildLearndevelopmentTeacherList" parameterType="ByChildLearndevelopmentTeacher"
resultMap="ByChildLearndevelopmentTeacherResult">
<include refid="selectByChildLearndevelopmentTeacherVo"/>
<where>
<if test="childid != null ">and childid = #{childid}</if>
<if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
<if test="gcjl != null and gcjl != ''">and gcjl = #{gcjl}</if>
<if test="gcjlremarks != null and gcjlremarks != ''">and gcjlremarks = #{gcjlremarks}</if>
<if test="wtyfa != null and wtyfa != ''">and wtyfa = #{wtyfa}</if>
<if test="wtyfaremarks != null and wtyfaremarks != ''">and wtyfaremarks = #{wtyfaremarks}</if>
<if test="pgjg != null and pgjg != ''">and pgjg = #{pgjg}</if>
<if test="pgjgremarks != null and pgjgremarks != ''">and pgjgremarks = #{pgjgremarks}</if>
<if test="jyjh != null and jyjh != ''">and jyjh = #{jyjh}</if>
<if test="jyjhremarks != null and jyjhremarks != ''">and jyjhremarks = #{jyjhremarks}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="childid != null ">and a.childid = #{childid}</if>
<if test="schoolid != null ">and b.schoolid = #{schoolid}</if>
<if test="classid != null and classid != ''">and b.classid = #{classid}</if>
<if test="xnxq != null and xnxq != ''">and a.xnxq = #{xnxq}</if>
<if test="gcjl != null and gcjl != ''">and a.gcjl = #{gcjl}</if>
<if test="gcjlremarks != null and gcjlremarks != ''">and a.gcjlremarks = #{gcjlremarks}</if>
<if test="wtyfa != null and wtyfa != ''">and a.wtyfa = #{wtyfa}</if>
<if test="wtyfaremarks != null and wtyfaremarks != ''">and a.wtyfaremarks = #{wtyfaremarks}</if>
<if test="pgjg != null and pgjg != ''">and a.pgjg = #{pgjg}</if>
<if test="pgjgremarks != null and pgjgremarks != ''">and a.pgjgremarks = #{pgjgremarks}</if>
<if test="jyjh != null and jyjh != ''">and a.jyjh = #{jyjh}</if>
<if test="jyjhremarks != null and jyjhremarks != ''">and a.jyjhremarks = #{jyjhremarks}</if>
<if test="createuserid != null ">and a.createuserid = #{createuserid}</if>
</where>
</select>