辅导员管理-添加班级类型参数支持按类型筛选
- 在多个服务接口中添加classType参数,包括考勤管理、业务工作、负面清单等服务 - 更新控制器方法以接收班级类型参数并传递给服务层 - 在实体类中添加classType字段,支持毕业班和非毕业班分类 - 修改数据访问层实现以支持按班级类型查询过滤 - 更新MyBatis映射文件中的SQL查询,添加classType条件判断 - 为业务工作模块添加其他任务分数字段和其他相关功能 - 在主表映射中添加班级类型字段,完善数据结构设计
This commit is contained in:
@@ -50,9 +50,9 @@ public class SysTeacherKpiFillingAMgtController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('teacher:kpiFillingAMgt:list')")
|
||||
@GetMapping(value = "/getByFdyNameAndYearAndMonth")
|
||||
@ApiOperation("根据名称年月查询业绩考核-个人填报-考勤管理列表")
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth, @RequestParam(required = false) String classType) {
|
||||
startPage();
|
||||
List<SysTeacherKpiFillingAMgt> sysTeacherKpiFillingAMgtList = sysTeacherKpiFillingAMgtService.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth);
|
||||
List<SysTeacherKpiFillingAMgt> sysTeacherKpiFillingAMgtList = sysTeacherKpiFillingAMgtService.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth, classType);
|
||||
return getDataTable(sysTeacherKpiFillingAMgtList);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,9 +50,9 @@ public class SysTeacherKpiFillingBusinessWorkController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('teacher:kpiFillingBusinessWork:list')")
|
||||
@GetMapping(value = "/getByFdyNameAndYearAndMonth")
|
||||
@ApiOperation("根据名称年月查询个人填报-业务工作列表")
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth, @RequestParam(required = false) String classType) {
|
||||
startPage();
|
||||
List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkService.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth);
|
||||
List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkService.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth, classType);
|
||||
return getDataTable(sysTeacherKpiFillingBusinessWorkList);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,9 +50,9 @@ public class SysTeacherKpiFillingNegativeListController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('teacher:kpiFillingNegativeList:list')")
|
||||
@GetMapping("/getByFdyNameAndYearAndMonth")
|
||||
@ApiOperation("根据名称年月查询业绩考核-个人填报-负面清单列表表")
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth, @RequestParam(required = false) String classType) {
|
||||
startPage();
|
||||
List<SysTeacherKpiFillingNegativeList> list = sysTeacherKpiFillingNegativeListService.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth);
|
||||
List<SysTeacherKpiFillingNegativeList> list = sysTeacherKpiFillingNegativeListService.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth, classType);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,9 +50,9 @@ public class SysTeacherKpiFillingRewardsKpiController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('teacher:kpiFillingRewardsKpi:list')")
|
||||
@GetMapping("/getByFdyNameAndYearAndMonth")
|
||||
@ApiOperation("根据名称年月查询业绩考核-个人填报-超工作量奖励绩效列表")
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth, @RequestParam(required = false) String classType) {
|
||||
startPage();
|
||||
List<SysTeacherKpiFillingRewardsKpi> list = sysTeacherKpiFillingRewardsKpiService.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth);
|
||||
List<SysTeacherKpiFillingRewardsKpi> list = sysTeacherKpiFillingRewardsKpiService.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth, classType);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,9 +50,9 @@ public class SysTeacherKpiFillingStuEmergencyController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('teacher:kpiFillingStuEmergency:list')")
|
||||
@GetMapping("/getByFdyNameAndYearAndMonth")
|
||||
@ApiOperation("根据名称年月查询业绩考核-个人填报-处理学生突发事件列表")
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
|
||||
public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth, @RequestParam(required = false) String classType) {
|
||||
startPage();
|
||||
List<SysTeacherKpiFillingStuEmergency> list = sysTeacherKpiFillingStuEmergencyService.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth);
|
||||
List<SysTeacherKpiFillingStuEmergency> list = sysTeacherKpiFillingStuEmergencyService.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth, classType);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@ public class SysTeacherKpiFillingStuMgtController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('teacher:teacherKpiFillingMgt:query')")
|
||||
@GetMapping("/getByFdyNameAndYearAndMonth")
|
||||
@ApiOperation("根据名称年月查询业绩考核-个人填报-学生管理详细信息")
|
||||
public AjaxResult getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
|
||||
return success(sysTeacherKpiFillingStuMgtService.selectSysTeacherKpiFillingStuMgtByFdyName(fdyName, fillingYear, fillingMonth));
|
||||
public AjaxResult getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth, @RequestParam(required = false) String classType) {
|
||||
return success(sysTeacherKpiFillingStuMgtService.selectSysTeacherKpiFillingStuMgtByFdyName(fdyName, fillingYear, fillingMonth, classType));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user