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

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

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

4
srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingAMgtController.java
View File

@@ -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);
}

4
srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBusinessWorkController.java
View File

@@ -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);
}

4
srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingNegativeListController.java
View File

@@ -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);
}

4
srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingRewardsKpiController.java
View File

@@ -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);
}

4
srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuEmergencyController.java
View File

@@ -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);
}

4
srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuMgtController.java
View File

@@ -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));
}
/**

25
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFilling.java
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;
}

8
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingAMgt.java
View File

@@ -74,6 +74,14 @@ public class SysTeacherKpiFillingAMgt extends BaseEntity {
@Excel(name = "填报月份")
private String fillingMonth;
/**
* 班级类型 graduate-毕业班 ungraduate-非毕业班
*/
@ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班")
@TableField("class_type")
@Excel(name = "班级类型")
private String classType;
/**
* 个人填报 - 考勤管理 - 会议培训佐证材料
*/

15
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBusinessWork.java
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;
}

7
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingNegativeList.java
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;
}

7
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingRewardsKpi.java
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;
}

7
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuEmergency.java
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;
}

25
srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java
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;
/**
* 团干部会议佐证材料

2
srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingAMgtMapper.java
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);
/**
* 新增业绩考核-个人填报-考勤管理

2
srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBusinessWorkMapper.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingNegativeListMapper.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingRewardsKpiMapper.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuEmergencyMapper.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuMgtMapper.java
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);
/**
* 查根据辅导员名称、年份 月份 学院 查询

2
srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingAMgtService.java
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);
/**
* 新增业绩考核-个人填报-考勤管理

2
srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBusinessWorkService.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingNegativeListService.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingRewardsKpiService.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuEmergencyService.java
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);
/**

2
srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuMgtService.java
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);
/**
* 查询业绩考核-个人填报-学生管理列表

4
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingAMgtServiceImpl.java
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);
}
/**

6
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java
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);
}

6
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingNegativeListServiceImpl.java
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);
}

4
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingRewardsKpiServiceImpl.java
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);
}
/**

4
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuEmergencyServiceImpl.java
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);
}
/**

4
srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java
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);
}
/**

10
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingAMgtMapper.xml
View File

@@ -11,10 +11,11 @@
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
<result property="classType" column="class_type"/>
</resultMap>
<sql id="selectSysTeacherKpiFillingAMgtVo">
select id, duty_work_scoring, conference_scoring, fdy_name, filling_year, filling_month
select id, duty_work_scoring, conference_scoring, fdy_name, filling_year, filling_month, class_type
from sys_teacher_kpi_filling_a_mgt
</sql>
@@ -27,6 +28,7 @@
<if test="fdyName != null and fdyName != ''">and fdy_name like concat('%', #{fdyName}, '%')</if>
<if test="fillingYear != null and fillingYear != ''">and filling_year = #{fillingYear}</if>
<if test="fillingMonth != null and fillingMonth != ''">and filling_month = #{fillingMonth}</if>
<if test="classType != null and classType != ''">and class_type = #{classType}</if>
</where>
order by id desc
</select>
@@ -45,6 +47,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -63,6 +68,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name,</if>
<if test="fillingYear != null and fillingYear != ''">filling_year,</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -71,6 +77,7 @@
<if test="fdyName != null and fdyName != ''">#{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">#{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">#{fillingMonth},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -82,6 +89,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name = #{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">filling_year = #{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month = #{fillingMonth},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>

17
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBusinessWorkMapper.xml
View File

@@ -11,9 +11,11 @@
<result property="stuBasicDataScoring" column="stu_basic_data_scoring"/>
<result property="stuDisciplinaryViolationScoring" column="stu_disciplinary_violation_scoring"/>
<result property="handleEventsScoring" column="handle_events_scoring"/>
<result property="otherTaskScoring" column="other_task_scoring"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
<result property="classType" column="class_type"/>
</resultMap>
<sql id="selectSysTeacherKpiFillingBusinessWorkVo">
@@ -23,9 +25,11 @@
stu_basic_data_scoring,
stu_disciplinary_violation_scoring,
handle_events_scoring,
other_task_scoring,
fdy_name,
filling_year,
filling_month
filling_month,
class_type
from sys_teacher_kpi_filling_business_work
</sql>
@@ -43,9 +47,11 @@
#{stuDisciplinaryViolationScoring}
</if>
<if test="handleEventsScoring != null ">and handle_events_scoring = #{handleEventsScoring}</if>
<if test="otherTaskScoring != null ">and other_task_scoring = #{otherTaskScoring}</if>
<if test="fdyName != null and fdyName != ''">and fdy_name like concat('%', #{fdyName}, '%')</if>
<if test="fillingYear != null and fillingYear != ''">and filling_year = #{fillingYear}</if>
<if test="fillingMonth != null and fillingMonth != ''">and filling_month = #{fillingMonth}</if>
<if test="classType != null and classType != ''">and class_type = #{classType}</if>
</where>
order by id desc
</select>
@@ -70,6 +76,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -83,9 +92,11 @@
<if test="stuBasicDataScoring != null">stu_basic_data_scoring,</if>
<if test="stuDisciplinaryViolationScoring != null">stu_disciplinary_violation_scoring,</if>
<if test="handleEventsScoring != null">handle_events_scoring,</if>
<if test="otherTaskScoring != null">other_task_scoring,</if>
<if test="fdyName != null and fdyName != ''">fdy_name,</if>
<if test="fillingYear != null and fillingYear != ''">filling_year,</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -94,9 +105,11 @@
<if test="stuBasicDataScoring != null">#{stuBasicDataScoring},</if>
<if test="stuDisciplinaryViolationScoring != null">#{stuDisciplinaryViolationScoring},</if>
<if test="handleEventsScoring != null">#{handleEventsScoring},</if>
<if test="otherTaskScoring != null">#{otherTaskScoring},</if>
<if test="fdyName != null and fdyName != ''">#{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">#{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">#{fillingMonth},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -112,9 +125,11 @@
#{stuDisciplinaryViolationScoring},
</if>
<if test="handleEventsScoring != null">handle_events_scoring = #{handleEventsScoring},</if>
<if test="otherTaskScoring != null">other_task_scoring = #{otherTaskScoring},</if>
<if test="fdyName != null and fdyName != ''">fdy_name = #{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">filling_year = #{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month = #{fillingMonth},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>

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

@@ -22,30 +22,39 @@
<result property="xgczOpinion" column="xgcz_opinion"/>
<result property="auditProgress" column="audit_progress"/>
<result property="jobNumber" column="job_number"/>
<!--个人填报-学生管理子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<result property="classType" column="class_type"/>
<!--个人填报-学生管理子表的集合 -->
<collection property="kpiFillingStuMgtList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingStuMgtById"/>
<!--个人填报-业务工作子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<!--个人填报-业务工作子表的集合 -->
<collection property="kpiFillingBusinessWorksList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingBusinessWorksById"/>
<!--个人填报-考勤管理子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<!--个人填报-考勤管理子表的集合 -->
<collection property="kpiFillingAMgtList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingAMgtById"/>
<!--个人填报-负面清单子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<!--个人填报-负面清单子表的集合 -->
<collection property="kpiFillingNegativeLists"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="KpiFillingNegativeListById"/>
<!--个人填报-超工作量奖励绩效子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<!--个人填报-超工作量奖励绩效子表的集合 -->
<collection property="kpiFillingRewardsKpiList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingRewardsKpiById"/>
<!--个人填报-处理学生突发事件子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<!--个人填报-处理学生突发事件子表的集合 -->
<collection property="kpiFillingStuEmergencyList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingStuEmergencyById"/>
<!--个人填报-加分项子表的集合 -->
<collection property="kpiFillingBonusPointsList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingBonusPointsById"/>
<!--个人填报-就业指导工作子表的集合 -->
<collection property="kpiFillingGraduationGuidanceList"
column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month, classType = class_type}"
javaType="java.util.ArrayList" select="selectKpiFillingGraduationGuidanceById"/>
</resultMap>
<!--个人填报-学生管理子表的映射 -->
@@ -147,6 +156,27 @@
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--个人填报-加分项子表的映射 -->
<resultMap type="SysTeacherKpiFillingBonusPoints" id="SysTeacherKpiFillingBonusPointsResult">
<result property="id" column="id"/>
<result property="bonusType" column="bonus_type"/>
<result property="bonusScoring" column="bonus_scoring"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--个人填报-就业指导工作子表的映射 -->
<resultMap type="SysTeacherKpiFillingGraduationGuidance" id="SysTeacherKpiFillingGraduationGuidanceResult">
<result property="id" column="id"/>
<result property="gradFormAuditScoring" column="grad_form_audit_scoring"/>
<result property="stuCareerConsultScoring" column="stu_career_consult_scoring"/>
<result property="gradFormGuidanceScoring" column="grad_form_guidance_scoring"/>
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
</resultMap>
<!--个人填报-学生管理子表的数据-->
<select id="selectKpiFillingStuMgtById" resultMap="SysTeacherKpiFillingStuMgtResult">
select *
@@ -161,6 +191,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
</select>
<!--个人填报-业务工作子表的数据-->
@@ -177,6 +210,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
</select>
@@ -194,6 +230,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
</select>
@@ -211,6 +250,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
</select>
@@ -228,6 +270,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -246,8 +291,50 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
</select>
<!--个人填报-加分项子表的数据-->
<select id="selectKpiFillingBonusPointsById" resultMap="SysTeacherKpiFillingBonusPointsResult">
select *
from sys_teacher_kpi_filling_bonus_points
<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>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
</select>
<!--个人填报-就业指导工作子表的数据-->
<select id="selectKpiFillingGraduationGuidanceById" resultMap="SysTeacherKpiFillingGraduationGuidanceResult">
select *
from sys_teacher_kpi_filling_graduation_guidance
<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>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
<!--个人填报-学生管理-干部会议佐证材料子子表的映射 -->
@@ -461,7 +548,8 @@
ks_opinion,
xgcz_opinion,
audit_progress,
job_number
job_number,
class_type
from sys_teacher_kpi_filling
</sql>
@@ -522,6 +610,7 @@
<if test="xgczOpinion != null">xgcz_opinion,</if>
<if test="auditProgress != null">audit_progress,</if>
<if test="jobNumber != null">job_number,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fdyName != null and fdyName != ''">#{fdyName},</if>
@@ -540,6 +629,7 @@
<if test="xgczOpinion != null">#{xgczOpinion},</if>
<if test="auditProgress != null">#{auditProgress},</if>
<if test="jobNumber != null">#{jobNumber},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -562,6 +652,7 @@
<if test="xgczOpinion != null">xgcz_opinion = #{xgczOpinion},</if>
<if test="auditProgress != null">audit_progress = #{auditProgress},</if>
<if test="jobNumber != null">job_number = #{jobNumber},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>

11
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingNegativeListMapper.xml
View File

@@ -16,6 +16,7 @@
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
<result property="classType" column="class_type"/>
</resultMap>
<sql id="selectSysTeacherKpiFillingNegativeListVo">
@@ -29,7 +30,8 @@
practice_fraud,
fdy_name,
filling_year,
filling_month
filling_month,
class_type
from sys_teacher_kpi_filling_negative_list
</sql>
@@ -47,6 +49,7 @@
<if test="fdyName != null and fdyName != ''">and fdy_name like concat('%', #{fdyName}, '%')</if>
<if test="fillingYear != null and fillingYear != ''">and filling_year = #{fillingYear}</if>
<if test="fillingMonth != null and fillingMonth != ''">and filling_month = #{fillingMonth}</if>
<if test="classType != null and classType != ''">and class_type = #{classType}</if>
</where>
order by id desc
</select>
@@ -65,6 +68,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -89,6 +95,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name,</if>
<if test="fillingYear != null and fillingYear != ''">filling_year,</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="moralityAndBehavior != null">#{moralityAndBehavior},</if>
@@ -101,6 +108,7 @@
<if test="fdyName != null and fdyName != ''">#{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">#{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">#{fillingMonth},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -117,6 +125,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name = #{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">filling_year = #{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month = #{fillingMonth},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>

10
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingRewardsKpiMapper.xml
View File

@@ -12,10 +12,11 @@
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
<result property="classType" column="class_type"/>
</resultMap>
<sql id="selectSysTeacherKpiFillingRewardsKpiVo">
select id, duty_description, duty_time, duty_user_name, fdy_name, filling_year, filling_month
select id, duty_description, duty_time, duty_user_name, fdy_name, filling_year, filling_month, class_type
from sys_teacher_kpi_filling_rewards_kpi
</sql>
@@ -31,6 +32,7 @@
<if test="fdyName != null and fdyName != ''">and fdy_name like concat('%', #{fdyName}, '%')</if>
<if test="fillingYear != null and fillingYear != ''">and filling_year = #{fillingYear}</if>
<if test="fillingMonth != null and fillingMonth != ''">and filling_month = #{fillingMonth}</if>
<if test="classType != null and classType != ''">and class_type = #{classType}</if>
</where>
order by id desc
</select>
@@ -55,6 +57,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -69,6 +74,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name,</if>
<if test="fillingYear != null and fillingYear != ''">filling_year,</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dutyDescription != null and dutyDescription != ''">#{dutyDescription},</if>
@@ -77,6 +83,7 @@
<if test="fdyName != null and fdyName != ''">#{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">#{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">#{fillingMonth},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -89,6 +96,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name = #{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">filling_year = #{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month = #{fillingMonth},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>

11
srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuEmergencyMapper.xml
View File

@@ -13,6 +13,7 @@
<result property="fdyName" column="fdy_name"/>
<result property="fillingYear" column="filling_year"/>
<result property="fillingMonth" column="filling_month"/>
<result property="classType" column="class_type"/>
</resultMap>
<sql id="selectSysTeacherKpiFillingStuEmergencyVo">
@@ -23,7 +24,8 @@
event_level,
fdy_name,
filling_year,
filling_month
filling_month,
class_type
from sys_teacher_kpi_filling_stu_emergency
</sql>
@@ -40,6 +42,7 @@
<if test="fdyName != null and fdyName != ''">and fdy_name like concat('%', #{fdyName}, '%')</if>
<if test="fillingYear != null and fillingYear != ''">and filling_year = #{fillingYear}</if>
<if test="fillingMonth != null and fillingMonth != ''">and filling_month = #{fillingMonth}</if>
<if test="classType != null and classType != ''">and class_type = #{classType}</if>
</where>
order by id desc
</select>
@@ -64,6 +67,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -79,6 +85,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name,</if>
<if test="fillingYear != null and fillingYear != ''">filling_year,</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="eventDescription != null and eventDescription != ''">#{eventDescription},</if>
@@ -88,6 +95,7 @@
<if test="fdyName != null and fdyName != ''">#{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">#{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">#{fillingMonth},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -101,6 +109,7 @@
<if test="fdyName != null and fdyName != ''">fdy_name = #{fdyName},</if>
<if test="fillingYear != null and fillingYear != ''">filling_year = #{fillingYear},</if>
<if test="fillingMonth != null and fillingMonth != ''">filling_month = #{fillingMonth},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>

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

@@ -16,6 +16,9 @@
<result property="stuActivityScoring" column="stu_activity_scoring"/>
<result property="stuTalkScoring" column="stu_talk_scoring"/>
<result property="visitDormitoryScoring" column="visit_dormitory_scoring"/>
<result property="edgScoring" column="edg_scoring"/>
<result property="noticeScoring" column="notice_scoring"/>
<result property="classType" column="class_type"/>
<!--干部会议佐证材料子表的集合 （多条件查询column里传入了多条件【{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}】javaType里面写了list表明你有多条件 fdyName属性 fdy_name字段）-->
<collection property="cadreMeetingMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectCadreMeetingMaterialsById"/>
<!--班会会议佐证材料子表的集合 -->
@@ -184,7 +187,10 @@
cadre_scoring,
stu_activity_scoring,
stu_talk_scoring,
visit_dormitory_scoring
visit_dormitory_scoring,
edg_scoring,
notice_scoring,
class_type
from sys_teacher_kpi_filling_stu_mgt
</sql>
@@ -221,6 +227,9 @@
<if test="fillingMonth != null and fillingMonth != ''">
and filling_month = #{fillingMonth}
</if>
<if test="classType != null and classType != ''">
and class_type = #{classType}
</if>
</where>
order by id desc
</select>
@@ -263,6 +272,9 @@
<if test="stuActivityScoring != null">stu_activity_scoring,</if>
<if test="stuTalkScoring != null">stu_talk_scoring,</if>
<if test="visitDormitoryScoring != null">visit_dormitory_scoring,</if>
<if test="edgScoring != null">edg_scoring,</if>
<if test="noticeScoring != null">notice_scoring,</if>
<if test="classType != null and classType != ''">class_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -275,6 +287,9 @@
<if test="stuActivityScoring != null">#{stuActivityScoring},</if>
<if test="stuTalkScoring != null">#{stuTalkScoring},</if>
<if test="visitDormitoryScoring != null">#{visitDormitoryScoring},</if>
<if test="edgScoring != null">#{edgScoring},</if>
<if test="noticeScoring != null">#{noticeScoring},</if>
<if test="classType != null and classType != ''">#{classType},</if>
</trim>
</insert>
@@ -290,6 +305,9 @@
<if test="stuActivityScoring != null">stu_activity_scoring = #{stuActivityScoring},</if>
<if test="stuTalkScoring != null">stu_talk_scoring = #{stuTalkScoring},</if>
<if test="visitDormitoryScoring != null">visit_dormitory_scoring = #{visitDormitoryScoring},</if>
<if test="edgScoring != null">edg_scoring = #{edgScoring},</if>
<if test="noticeScoring != null">notice_scoring = #{noticeScoring},</if>
<if test="classType != null and classType != ''">class_type = #{classType},</if>
</trim>
where id = #{id}
</update>