辅导员管理-添加班级类型参数支持按类型筛选

- 在多个服务接口中添加classType参数,包括考勤管理、业务工作、负面清单等服务
- 更新控制器方法以接收班级类型参数并传递给服务层
- 在实体类中添加classType字段,支持毕业班和非毕业班分类
- 修改数据访问层实现以支持按班级类型查询过滤
- 更新MyBatis映射文件中的SQL查询,添加classType条件判断
- 为业务工作模块添加其他任务分数字段和其他相关功能
- 在主表映射中添加班级类型字段,完善数据结构设计
This commit is contained in:
2026-03-13 15:11:56 +08:00
parent 41d310ca2f
commit 6d6814efa7
38 changed files with 314 additions and 62 deletions

View File

@@ -10,6 +10,9 @@ import com.srs.common.core.domain.BaseEntity;
import javax.validation.constraints.NotNull;
import java.util.List;
import com.srs.teacher.domain.SysTeacherKpiFillingBonusPoints;
import com.srs.teacher.domain.SysTeacherKpiFillingGraduationGuidance;
/**
* 业绩考核-个人填报对象 sys_teacher_kpi_filling
@@ -166,6 +169,14 @@ public class SysTeacherKpiFilling extends BaseEntity {
@Excel(name = "辅导员工号")
private String jobNumber;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
/**
* 个人填报-学生管理
*/
@@ -207,4 +218,18 @@ public class SysTeacherKpiFilling extends BaseEntity {
@ApiModelProperty(value = "个人填报-处理学生突发事件", hidden = true)
@Excel(name = "个人填报-处理学生突发事件")
private List<SysTeacherKpiFillingStuEmergency> kpiFillingStuEmergencyList;
/**
* 个人填报-加分项
*/
@ApiModelProperty(value = "个人填报-加分项", hidden = true)
@Excel(name = "个人填报-加分项")
private List<SysTeacherKpiFillingBonusPoints> kpiFillingBonusPointsList;
/**
* 个人填报-就业指导工作
*/
@ApiModelProperty(value = "个人填报-就业指导工作", hidden = true)
@Excel(name = "个人填报-就业指导工作")
private List<SysTeacherKpiFillingGraduationGuidance> kpiFillingGraduationGuidanceList;
}

View File

@@ -73,12 +73,20 @@ public class SysTeacherKpiFillingAMgt extends BaseEntity {
@TableField("filling_month")
@Excel(name = "填报月份")
private String fillingMonth;
/**
* 个人填报-考勤管理-会议培训佐证材料
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty(value = "个人填报-考勤管理-会议培训佐证材料", hidden = true)
@Excel(name = "个人填报-考勤管理-会议培训佐证材料")
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
/**
* 个人填报 - 考勤管理 - 会议培训佐证材料
*/
@ApiModelProperty(value = "个人填报- 考勤管理 - 会议培训佐证材料", hidden = true)
@Excel(name = "个人填报- 考勤管理 - 会议培训佐证材料")
private List<SysTeacherConferenceMeetingMaterials> conferenceMeetingMaterialsList;

View File

@@ -97,5 +97,20 @@ public class SysTeacherKpiFillingBusinessWork extends BaseEntity {
@Excel(name = "填报月份")
private String fillingMonth;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
/**
* 其他任务分数
*/
@ApiModelProperty("其他任务分数")
@TableField("other_task_scoring")
@Excel(name = "其他任务分数")
private BigDecimal otherTaskScoring;
}

View File

@@ -114,5 +114,12 @@ public class SysTeacherKpiFillingNegativeList extends BaseEntity {
@NotNull(message = "填报月份不能为空")
private String fillingMonth;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
}

View File

@@ -86,5 +86,12 @@ public class SysTeacherKpiFillingRewardsKpi extends BaseEntity {
@NotNull(message = "填报月份不能为空")
private String fillingMonth;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
}

View File

@@ -95,5 +95,12 @@ public class SysTeacherKpiFillingStuEmergency extends BaseEntity {
@NotNull(message = "填报月份不能为空")
private String fillingMonth;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
}

View File

@@ -112,6 +112,31 @@ public class SysTeacherKpiFillingStuMgt extends BaseEntity {
@Excel(name = "每周深入学生宿舍材料分数")
private BigDecimal visitDormitoryScoring;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
/**
* 教育分数
*/
@ApiModelProperty("教育分数")
@TableField("edg_scoring")
@Excel(name = "教育分数")
private BigDecimal edgScoring;
/**
* 其他任务分数
*/
@ApiModelProperty("通知分数分数")
@TableField("notice_scoring")
@Excel(name = "通知分数分数")
private BigDecimal noticeScoring;
/**
* 团干部会议佐证材料

View File

@@ -36,7 +36,7 @@ public interface SysTeacherKpiFillingAMgtMapper extends BaseMapper<SysTeacherKpi
* @param fdyName 辅导员名称主键
* @return 业绩考核-个人填报-考勤管理集合
*/
public List<SysTeacherKpiFillingAMgt> selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
public List<SysTeacherKpiFillingAMgt> selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**
* 新增业绩考核-个人填报-考勤管理

View File

@@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingBusinessWorkMapper extends BaseMapper<SysTe
* @param fdyName 辅导员名称主键
* @return 个人填报-业务工作集合
*/
public List<SysTeacherKpiFillingBusinessWork> selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
public List<SysTeacherKpiFillingBusinessWork> selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingNegativeListMapper extends BaseMapper<SysTe
* @param fdyName 辅导员名称
* @return 业绩考核-个人填报-负面清单集合
*/
List<SysTeacherKpiFillingNegativeList> selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
List<SysTeacherKpiFillingNegativeList> selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingRewardsKpiMapper extends BaseMapper<SysTeac
* @param fdyName 辅导员名称
* @return 业绩考核-个人填报-超工作量奖励绩效集合
*/
List<SysTeacherKpiFillingRewardsKpi> selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
List<SysTeacherKpiFillingRewardsKpi> selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingStuEmergencyMapper extends BaseMapper<SysTe
* @param fdyName 辅导员名称
* @return 业绩考核-个人填报-处理学生突发事件集合
*/
List<SysTeacherKpiFillingStuEmergency> selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
List<SysTeacherKpiFillingStuEmergency> selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingStuMgtMapper extends BaseMapper<SysTeacherK
* @param fdyName 业绩考核-个人填报-学生管理
* @return 业绩考核-个人填报-学生管理详细
*/
SysTeacherKpiFillingStuMgt selectSysTeacherKpiFillingStuMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
SysTeacherKpiFillingStuMgt selectSysTeacherKpiFillingStuMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**
* 查根据辅导员名称、年份 月份 学院 查询

View File

@@ -35,7 +35,7 @@ public interface ISysTeacherKpiFillingAMgtService extends IService<SysTeacherKpi
* @param fdyName 辅导员名称主键
* @return 业绩考核-个人填报-考勤管理集合
*/
public List<SysTeacherKpiFillingAMgt> selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
public List<SysTeacherKpiFillingAMgt> selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**
* 新增业绩考核-个人填报-考勤管理

View File

@@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingBusinessWorkService extends IService<SysTe
* @param fdyName 辅导员名称主键
* @return 个人填报-业务工作集合
*/
public List<SysTeacherKpiFillingBusinessWork> selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
public List<SysTeacherKpiFillingBusinessWork> selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingNegativeListService extends IService<SysTe
* @param fdyName 辅导员名称
* @return 业绩考核-个人填报-负面清单集合
*/
List<SysTeacherKpiFillingNegativeList> selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
List<SysTeacherKpiFillingNegativeList> selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingRewardsKpiService extends IService<SysTeac
* @param fdyName 辅导员名称
* @return 业绩考核-个人填报-超工作量奖励绩效集合
*/
List<SysTeacherKpiFillingRewardsKpi> selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
List<SysTeacherKpiFillingRewardsKpi> selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingStuEmergencyService extends IService<SysTe
* @param fdyName 辅导员名称
* @return 业绩考核-个人填报-处理学生突发事件集合
*/
List<SysTeacherKpiFillingStuEmergency> selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
List<SysTeacherKpiFillingStuEmergency> selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**

View File

@@ -27,7 +27,7 @@ public interface ISysTeacherKpiFillingStuMgtService extends IService<SysTeacherK
* @param fdyName 业绩考核-个人填报-学生管理
* @return 业绩考核-个人填报-学生管详细
*/
SysTeacherKpiFillingStuMgt selectSysTeacherKpiFillingStuMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
SysTeacherKpiFillingStuMgt selectSysTeacherKpiFillingStuMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType);
/**
* 查询业绩考核-个人填报-学生管理列表

View File

@@ -51,8 +51,8 @@ public class SysTeacherKpiFillingAMgtServiceImpl extends ServiceImpl<SysTeacherK
* @return 业绩考核-个人填报-考勤管理集合
*/
@Override
public List<SysTeacherKpiFillingAMgt> selectSysTeacherKpiFillingAMgtByFdyName(String fdyName, String fillingYear, String fillingMonth) {
return sysTeacherKpiFillingAMgtMapper.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth);
public List<SysTeacherKpiFillingAMgt> selectSysTeacherKpiFillingAMgtByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) {
return sysTeacherKpiFillingAMgtMapper.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth, classType);
}
/**

View File

@@ -53,8 +53,8 @@ public class SysTeacherKpiFillingBusinessWorkServiceImpl extends ServiceImpl<Sys
* @return 个人填报-业务工作集合
*/
@Override
public List<SysTeacherKpiFillingBusinessWork> selectSysTeacherKpiFillingBusinessWorkByFdyName(String fdyName, String fillingYear, String fillingMonth) {
return sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth);
public List<SysTeacherKpiFillingBusinessWork> selectSysTeacherKpiFillingBusinessWorkByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) {
return sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth, classType);
}
/**
@@ -82,7 +82,7 @@ public class SysTeacherKpiFillingBusinessWorkServiceImpl extends ServiceImpl<Sys
public int updateSysTeacherKpiFillingBusinessWork(SysTeacherKpiFillingBusinessWork sysTeacherKpiFillingBusinessWork) {
// sysTeacherKpiFillingBusinessWork.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
// 判断填报记录是否填报
List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth());
List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth(), sysTeacherKpiFillingBusinessWork.getClassType());
if (sysTeacherKpiFillingBusinessWorkList != null && !sysTeacherKpiFillingBusinessWorkList.isEmpty()) {
throw new ServiceException("已提交,请勿重复提交", 500);
}

View File

@@ -53,8 +53,8 @@ public class SysTeacherKpiFillingNegativeListServiceImpl extends ServiceImpl<Sys
* @return 业绩考核-个人填报-负面清单集合
*/
@Override
public List<SysTeacherKpiFillingNegativeList> selectSysTeacherKpiFillingNegativeListByFdyName(String fdyName, String fillingYear, String fillingMonth) {
return sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth);
public List<SysTeacherKpiFillingNegativeList> selectSysTeacherKpiFillingNegativeListByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) {
return sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth, classType);
}
/**
@@ -77,7 +77,7 @@ public class SysTeacherKpiFillingNegativeListServiceImpl extends ServiceImpl<Sys
@Override
public int updateSysTeacherKpiFillingNegativeList(SysTeacherKpiFillingNegativeList sysTeacherKpiFillingNegativeList) {
// 判断填报记录是否填报
List<SysTeacherKpiFillingNegativeList> sysTeacherKpiFillingNegativeLists = sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(sysTeacherKpiFillingNegativeList.getFdyName(), sysTeacherKpiFillingNegativeList.getFillingYear(), sysTeacherKpiFillingNegativeList.getFillingMonth());
List<SysTeacherKpiFillingNegativeList> sysTeacherKpiFillingNegativeLists = sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(sysTeacherKpiFillingNegativeList.getFdyName(), sysTeacherKpiFillingNegativeList.getFillingYear(), sysTeacherKpiFillingNegativeList.getFillingMonth(), sysTeacherKpiFillingNegativeList.getClassType());
if (sysTeacherKpiFillingNegativeLists != null && !sysTeacherKpiFillingNegativeLists.isEmpty()) {
throw new ServiceException("已提交,请勿重复提交", 500);
}

View File

@@ -51,8 +51,8 @@ public class SysTeacherKpiFillingRewardsKpiServiceImpl extends ServiceImpl<SysTe
* @return 业绩考核-个人填报-超工作量奖励绩效集合
*/
@Override
public List<SysTeacherKpiFillingRewardsKpi> selectSysTeacherKpiFillingRewardsKpiByFdyName(String fdyName, String fillingYear, String fillingMonth) {
return sysTeacherKpiFillingRewardsKpiMapper.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth);
public List<SysTeacherKpiFillingRewardsKpi> selectSysTeacherKpiFillingRewardsKpiByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) {
return sysTeacherKpiFillingRewardsKpiMapper.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth, classType);
}
/**

View File

@@ -51,8 +51,8 @@ public class SysTeacherKpiFillingStuEmergencyServiceImpl extends ServiceImpl<Sys
* @return 业绩考核-个人填报-处理学生突发事件集合
*/
@Override
public List<SysTeacherKpiFillingStuEmergency> selectSysTeacherKpiFillingStuEmergencyByFdyName(String fdyName, String fillingYear, String fillingMonth) {
return sysTeacherKpiFillingStuEmergencyMapper.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth);
public List<SysTeacherKpiFillingStuEmergency> selectSysTeacherKpiFillingStuEmergencyByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) {
return sysTeacherKpiFillingStuEmergencyMapper.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth, classType);
}
/**

View File

@@ -52,8 +52,8 @@ public class SysTeacherKpiFillingStuMgtServiceImpl extends ServiceImpl<SysTeache
* @return 业绩考核-个人填报-学生管理详细
*/
@Override
public SysTeacherKpiFillingStuMgt selectSysTeacherKpiFillingStuMgtByFdyName(String fdyName, String fillingYear, String fillingMonth) {
return sysTeacherKpiFillingStuMgtMapper.selectSysTeacherKpiFillingStuMgtByFdyName(fdyName, fillingYear, fillingMonth);
public SysTeacherKpiFillingStuMgt selectSysTeacherKpiFillingStuMgtByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) {
return sysTeacherKpiFillingStuMgtMapper.selectSysTeacherKpiFillingStuMgtByFdyName(fdyName, fillingYear, fillingMonth, classType);
}
/**