xgxt_sd/zhxg_java
19
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

辅导员管理-业绩考核-初步实现

Browse Source
This commit is contained in:
weishengyou
2026-03-18 17:21:15 +08:00
parent 2337e6ae5e
commit c9c0232664
5 changed files with 152 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java
View File

@@ -13,6 +13,8 @@ import lombok.*;
import com.srs.common.core.domain.BaseEntity; import com.srs.common.core.domain.BaseEntity;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.srs.teacher.domain.SysTeacherStuTestMaterials;
import com.srs.teacher.domain.SysTeacherStuNoticeMaterials;
/** /**
@@ -172,4 +174,18 @@ public class SysTeacherKpiFillingStuMgt extends BaseEntity {
@ApiModelProperty(value = "每周深入学生宿舍佐证材料", hidden = true) @ApiModelProperty(value = "每周深入学生宿舍佐证材料", hidden = true)
@Excel(name = "每周深入学生宿舍佐证材料") @Excel(name = "每周深入学生宿舍佐证材料")
private List<SysTeacherVisitDormitoryMaterials> visitDormitoryMaterialsList; private List<SysTeacherVisitDormitoryMaterials> visitDormitoryMaterialsList;
/**
* 职业测评/就业育人佐证材料
*/
@ApiModelProperty(value = "职业测评/就业育人佐证材料", hidden = true)
@Excel(name = "职业测评/就业育人佐证材料")
private List<SysTeacherStuTestMaterials> edgMaterialsList;
/**
* 通知任务佐证材料
*/
@ApiModelProperty(value = "通知任务佐证材料", hidden = true)
@Excel(name = "通知任务佐证材料")
private List<SysTeacherStuNoticeMaterials> noticeMaterialsList;
} }

4
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java
View File

@@ -82,10 +82,10 @@ public class SysTeacherKpiFillingBusinessWorkServiceImpl extends ServiceImpl<Sys
public int updateSysTeacherKpiFillingBusinessWork(SysTeacherKpiFillingBusinessWork sysTeacherKpiFillingBusinessWork) { public int updateSysTeacherKpiFillingBusinessWork(SysTeacherKpiFillingBusinessWork sysTeacherKpiFillingBusinessWork) {
// sysTeacherKpiFillingBusinessWork.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName()); // sysTeacherKpiFillingBusinessWork.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
// 判断填报记录是否填报 // 判断填报记录是否填报
List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth(), sysTeacherKpiFillingBusinessWork.getClassType()); /*List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth(), sysTeacherKpiFillingBusinessWork.getClassType());
if (sysTeacherKpiFillingBusinessWorkList != null && !sysTeacherKpiFillingBusinessWorkList.isEmpty()) { if (sysTeacherKpiFillingBusinessWorkList != null && !sysTeacherKpiFillingBusinessWorkList.isEmpty()) {
throw new ServiceException("已提交，请勿重复提交", 500); throw new ServiceException("已提交，请勿重复提交", 500);
} }*/
return sysTeacherKpiFillingBusinessWorkMapper.updateSysTeacherKpiFillingBusinessWork(sysTeacherKpiFillingBusinessWork); return sysTeacherKpiFillingBusinessWorkMapper.updateSysTeacherKpiFillingBusinessWork(sysTeacherKpiFillingBusinessWork);
} }

4
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java
View File

@@ -103,10 +103,10 @@ public class SysTeacherKpiFillingStuMgtServiceImpl extends ServiceImpl<SysTeache
*/ */
@Override @Override
public int updateSysTeacherKpiFillingStuMgt(SysTeacherKpiFillingStuMgt sysTeacherKpiFillingStuMgt) { public int updateSysTeacherKpiFillingStuMgt(SysTeacherKpiFillingStuMgt sysTeacherKpiFillingStuMgt) {
List<SysTeacherKpiFillingStuMgt> sysTeacherKpiFillingStuMgts = sysTeacherKpiFillingStuMgtMapper.selectSysTeacherKpiFillingStuMgtByFdyNameAndFillingYear(sysTeacherKpiFillingStuMgt.getDepartmentName(), sysTeacherKpiFillingStuMgt.getFdyName(), sysTeacherKpiFillingStuMgt.getFillingYear(), sysTeacherKpiFillingStuMgt.getFillingMonth()); /*List<SysTeacherKpiFillingStuMgt> sysTeacherKpiFillingStuMgts = sysTeacherKpiFillingStuMgtMapper.selectSysTeacherKpiFillingStuMgtByFdyNameAndFillingYear(sysTeacherKpiFillingStuMgt.getDepartmentName(), sysTeacherKpiFillingStuMgt.getFdyName(), sysTeacherKpiFillingStuMgt.getFillingYear(), sysTeacherKpiFillingStuMgt.getFillingMonth());
if (sysTeacherKpiFillingStuMgts != null && !sysTeacherKpiFillingStuMgts.isEmpty()) { if (sysTeacherKpiFillingStuMgts != null && !sysTeacherKpiFillingStuMgts.isEmpty()) {
throw new ServiceException("已提交，请勿重复提交", 500); throw new ServiceException("已提交，请勿重复提交", 500);
} }*/
if (sysTeacherKpiFillingStuMgt.getFdyName() == null) { if (sysTeacherKpiFillingStuMgt.getFdyName() == null) {
sysTeacherKpiFillingStuMgt.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName()); sysTeacherKpiFillingStuMgt.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
} }

68
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml
View File

@@ -89,6 +89,14 @@
<collection property="visitDormitoryMaterialsList" <collection property="visitDormitoryMaterialsList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
javaType="java.util.ArrayList" select="selectVisitDormitoryMaterialsById"/> javaType="java.util.ArrayList" select="selectVisitDormitoryMaterialsById"/>
<!--职业测评/就业育人佐证材料子表的集合 -->
<collection property="edgMaterialsList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
javaType="java.util.ArrayList" select="selectEdgMaterialsById"/>
<!--通知任务佐证材料子表的集合 -->
<collection property="noticeMaterialsList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
javaType="java.util.ArrayList" select="selectNoticeMaterialsById"/>
</resultMap> </resultMap>
<!--个人填报-业务工作子表的映射 --> <!--个人填报-业务工作子表的映射 -->
@@ -401,6 +409,32 @@
<result property="fillingYear" column="filling_year"/> <result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/> <result property="fillingMonth" column="filling_month"/>
</resultMap> </resultMap>
<!--个人填报-学生管理-职业测评材料子表的映射 -->
<resultMap type="SysTeacherStuTestMaterials" id="SysTeacherEdgMaterialsResult">
<result property="id" column="id"/>
<result property="developmentTime" column="development_time"/>
<result property="place" column="place"/>
<result property="className" column="class_name"/>
<result property="numberOfStudents" column="number_of_students"/>
<result property="mainContent" column="main_content"/>
<result property="photo" column="photo"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--个人填报-学生管理-通知任务材料子表的映射 -->
<resultMap type="SysTeacherStuNoticeMaterials" id="SysTeacherStuNoticeMaterialsResult">
<result property="id" column="id"/>
<result property="developmentTime" column="development_time"/>
<result property="place" column="place"/>
<result property="className" column="class_name"/>
<result property="numberOfStudents" column="number_of_students"/>
<result property="mainContent" column="main_content"/>
<result property="photo" column="photo"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--个人填报-考勤管理-会议培训佐证材料子子表的映射 --> <!--个人填报-考勤管理-会议培训佐证材料子子表的映射 -->
<resultMap type="SysTeacherConferenceMeetingMaterials" id="SysTeacherConferenceMeetingMaterialsResult"> <resultMap type="SysTeacherConferenceMeetingMaterials" id="SysTeacherConferenceMeetingMaterialsResult">
<result property="id" column="id"/> <result property="id" column="id"/>
@@ -497,6 +531,40 @@
</where> </where>
order by id desc order by id desc
</select> </select>
<!--查询个人填报-学生管理-职业测评材料子表的数据-->
<select id="selectEdgMaterialsById" resultMap="SysTeacherEdgMaterialsResult">
select *
from sys_teacher_stu_test_materials
<where>
<if test="fdyName != null and fdyName != ''">
and fdy_name = #{fdyName}
</if>
<if test="fillingYear != null and fillingYear != ''">
and filling_year = #{fillingYear}
</if>
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
</where>
order by id desc
</select>
<!--查询个人填报-学生管理-通知任务材料子表的数据-->
<select id="selectNoticeMaterialsById" resultMap="SysTeacherStuNoticeMaterialsResult">
select *
from sys_teacher_stu_notice_materials
<where>
<if test="fdyName != null and fdyName != ''">
and fdy_name = #{fdyName}
</if>
<if test="fillingYear != null and fillingYear != ''">
and filling_year = #{fillingYear}
</if>
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
</where>
order by id desc
</select>
<!--个人填报-考勤管理-会议培训佐证材料子子表的数据--> <!--个人填报-考勤管理-会议培训佐证材料子子表的数据-->
<select id="selectConferenceMeetingMaterialsById" resultMap="SysTeacherConferenceMeetingMaterialsResult"> <select id="selectConferenceMeetingMaterialsById" resultMap="SysTeacherConferenceMeetingMaterialsResult">
select * select *

64
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml
View File

@@ -29,6 +29,10 @@
<collection property="stuTalkMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectStuTalkMaterialsById"/> <collection property="stuTalkMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectStuTalkMaterialsById"/>
<!--每周深入学生宿舍佐证材料子表的集合 --> <!--每周深入学生宿舍佐证材料子表的集合 -->
<collection property="visitDormitoryMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectVisitDormitoryMaterialsById"/> <collection property="visitDormitoryMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectVisitDormitoryMaterialsById"/>
<!--职业测评/就业育人佐证材料子表的集合 -->
<collection property="edgMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectEdgMaterialsById"/>
<!--通知任务佐证材料子表的集合 -->
<collection property="noticeMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectNoticeMaterialsById"/>
</resultMap> </resultMap>
<!--干部会议佐证材料子表的映射 --> <!--干部会议佐证材料子表的映射 -->
@@ -95,6 +99,32 @@
<result property="fillingYear" column="filling_year"/> <result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/> <result property="fillingMonth" column="filling_month"/>
</resultMap> </resultMap>
<!--职业测评/就业育人佐证材料子表的映射 -->
<resultMap type="SysTeacherStuTestMaterials" id="SysTeacherEdgMaterialsResult">
<result property="id" column="id"/>
<result property="developmentTime" column="development_time"/>
<result property="place" column="place"/>
<result property="className" column="class_name"/>
<result property="numberOfStudents" column="number_of_students"/>
<result property="mainContent" column="main_content"/>
<result property="photo" column="photo"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--通知任务佐证材料子表的映射 -->
<resultMap type="SysTeacherStuNoticeMaterials" id="SysTeacherStuNoticeMaterialsResult">
<result property="id" column="id"/>
<result property="developmentTime" column="development_time"/>
<result property="place" column="place"/>
<result property="className" column="class_name"/>
<result property="numberOfStudents" column="number_of_students"/>
<result property="mainContent" column="main_content"/>
<result property="photo" column="photo"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--查询干部会议佐证材料子表的数据--> <!--查询干部会议佐证材料子表的数据-->
<select id="selectCadreMeetingMaterialsById" resultMap="SysTeacherCadreMeetingMaterialsResult"> <select id="selectCadreMeetingMaterialsById" resultMap="SysTeacherCadreMeetingMaterialsResult">
@@ -176,6 +206,40 @@
</if> </if>
</where> </where>
</select> </select>
<!--职业测评/就业育人佐证材料子表的数据-->
<select id="selectEdgMaterialsById" resultMap="SysTeacherEdgMaterialsResult">
select *
from sys_teacher_stu_test_materials
<where>
<if test="fdyName != null and fdyName != ''">
and fdy_name = #{fdyName}
</if>
<if test="fillingYear != null and fillingYear != ''">
and filling_year = #{fillingYear}
</if>
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
</where>
order by id desc
</select>
<!--通知任务佐证材料子表的数据-->
<select id="selectNoticeMaterialsById" resultMap="SysTeacherStuNoticeMaterialsResult">
select *
from sys_teacher_stu_notice_materials
<where>
<if test="fdyName != null and fdyName != ''">
and fdy_name = #{fdyName}
</if>
<if test="fillingYear != null and fillingYear != ''">
and filling_year = #{fillingYear}
</if>
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
</where>
order by id desc
</select>
<sql id="selectSysTeacherKpiFillingStuMgtVo"> <sql id="selectSysTeacherKpiFillingStuMgtVo">
select id, select id,