From 6d6814efa718128d66218105d3023abfa6bb32a8 Mon Sep 17 00:00:00 2001 From: Stickman <2048979561@qq.com> Date: Fri, 13 Mar 2026 15:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8F=AD=E7=BA=A7=E7=B1=BB=E5=9E=8B=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=AF=E6=8C=81=E6=8C=89=E7=B1=BB=E5=9E=8B=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个服务接口中添加classType参数，包括考勤管理、业务工作、负面清单等服务 - 更新控制器方法以接收班级类型参数并传递给服务层 - 在实体类中添加classType字段，支持毕业班和非毕业班分类 - 修改数据访问层实现以支持按班级类型查询过滤 - 更新MyBatis映射文件中的SQL查询，添加classType条件判断 - 为业务工作模块添加其他任务分数字段和其他相关功能 - 在主表映射中添加班级类型字段，完善数据结构设计 --- .../SysTeacherKpiFillingAMgtController.java | 4 +- ...acherKpiFillingBusinessWorkController.java | 4 +- ...acherKpiFillingNegativeListController.java | 4 +- ...TeacherKpiFillingRewardsKpiController.java | 4 +- ...acherKpiFillingStuEmergencyController.java | 4 +- .../SysTeacherKpiFillingStuMgtController.java | 4 +- .../teacher/domain/SysTeacherKpiFilling.java | 25 ++++ .../domain/SysTeacherKpiFillingAMgt.java | 16 ++- .../SysTeacherKpiFillingBusinessWork.java | 15 +++ .../SysTeacherKpiFillingNegativeList.java | 7 ++ .../SysTeacherKpiFillingRewardsKpi.java | 7 ++ .../SysTeacherKpiFillingStuEmergency.java | 7 ++ .../domain/SysTeacherKpiFillingStuMgt.java | 25 ++++ .../SysTeacherKpiFillingAMgtMapper.java | 2 +- ...ysTeacherKpiFillingBusinessWorkMapper.java | 2 +- ...ysTeacherKpiFillingNegativeListMapper.java | 2 +- .../SysTeacherKpiFillingRewardsKpiMapper.java | 2 +- ...ysTeacherKpiFillingStuEmergencyMapper.java | 2 +- .../SysTeacherKpiFillingStuMgtMapper.java | 2 +- .../ISysTeacherKpiFillingAMgtService.java | 2 +- ...sTeacherKpiFillingBusinessWorkService.java | 2 +- ...sTeacherKpiFillingNegativeListService.java | 2 +- ...SysTeacherKpiFillingRewardsKpiService.java | 2 +- ...sTeacherKpiFillingStuEmergencyService.java | 2 +- .../ISysTeacherKpiFillingStuMgtService.java | 2 +- .../SysTeacherKpiFillingAMgtServiceImpl.java | 4 +- ...cherKpiFillingBusinessWorkServiceImpl.java | 6 +- ...cherKpiFillingNegativeListServiceImpl.java | 6 +- ...eacherKpiFillingRewardsKpiServiceImpl.java | 4 +- ...cherKpiFillingStuEmergencyServiceImpl.java | 4 +- ...SysTeacherKpiFillingStuMgtServiceImpl.java | 4 +- .../SysTeacherKpiFillingAMgtMapper.xml | 10 +- ...SysTeacherKpiFillingBusinessWorkMapper.xml | 17 ++- .../teacher/SysTeacherKpiFillingMapper.xml | 119 +++++++++++++++--- ...SysTeacherKpiFillingNegativeListMapper.xml | 11 +- .../SysTeacherKpiFillingRewardsKpiMapper.xml | 10 +- ...SysTeacherKpiFillingStuEmergencyMapper.xml | 11 +- .../SysTeacherKpiFillingStuMgtMapper.xml | 20 ++- 38 files changed, 314 insertions(+), 62 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingAMgtController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingAMgtController.java index a8c7891..992d7f7 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingAMgtController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingAMgtController.java @@ -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 sysTeacherKpiFillingAMgtList = sysTeacherKpiFillingAMgtService.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth); + List sysTeacherKpiFillingAMgtList = sysTeacherKpiFillingAMgtService.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth, classType); return getDataTable(sysTeacherKpiFillingAMgtList); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBusinessWorkController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBusinessWorkController.java index b425cac..27ca6bc 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBusinessWorkController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBusinessWorkController.java @@ -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 sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkService.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth); + List sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkService.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth, classType); return getDataTable(sysTeacherKpiFillingBusinessWorkList); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingNegativeListController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingNegativeListController.java index 81001c6..48a7d41 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingNegativeListController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingNegativeListController.java @@ -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 list = sysTeacherKpiFillingNegativeListService.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth); + List list = sysTeacherKpiFillingNegativeListService.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth, classType); return getDataTable(list); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingRewardsKpiController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingRewardsKpiController.java index f4f7d0d..504579a 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingRewardsKpiController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingRewardsKpiController.java @@ -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 list = sysTeacherKpiFillingRewardsKpiService.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth); + List list = sysTeacherKpiFillingRewardsKpiService.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth, classType); return getDataTable(list); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuEmergencyController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuEmergencyController.java index 76d0a3a..2f4637b 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuEmergencyController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuEmergencyController.java @@ -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 list = sysTeacherKpiFillingStuEmergencyService.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth); + List list = sysTeacherKpiFillingStuEmergencyService.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth, classType); return getDataTable(list); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuMgtController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuMgtController.java index 6a68c39..ab12af8 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuMgtController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingStuMgtController.java @@ -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)); } /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFilling.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFilling.java index adb502b..c17ff02 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFilling.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFilling.java @@ -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 kpiFillingStuEmergencyList; + + /** + * 个人填报-加分项 + */ + @ApiModelProperty(value = "个人填报-加分项", hidden = true) + @Excel(name = "个人填报-加分项") + private List kpiFillingBonusPointsList; + + /** + * 个人填报-就业指导工作 + */ + @ApiModelProperty(value = "个人填报-就业指导工作", hidden = true) + @Excel(name = "个人填报-就业指导工作") + private List kpiFillingGraduationGuidanceList; } diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingAMgt.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingAMgt.java index cec8740..f4dd482 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingAMgt.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingAMgt.java @@ -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 conferenceMeetingMaterialsList; diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBusinessWork.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBusinessWork.java index b7218bd..5b686d6 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBusinessWork.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBusinessWork.java @@ -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; } diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingNegativeList.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingNegativeList.java index d78067f..73e10cb 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingNegativeList.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingNegativeList.java @@ -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; } diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingRewardsKpi.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingRewardsKpi.java index f9a6f10..f98aaa4 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingRewardsKpi.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingRewardsKpi.java @@ -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; } diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuEmergency.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuEmergency.java index 112a255..4507b6d 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuEmergency.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuEmergency.java @@ -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; } diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java index 7647103..7694a73 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java @@ -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; + /** * 团干部会议佐证材料 diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingAMgtMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingAMgtMapper.java index 8a89588..ce55597 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingAMgtMapper.java +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingAMgtMapper.java @@ -36,7 +36,7 @@ public interface SysTeacherKpiFillingAMgtMapper extends BaseMapper selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + public List selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** * 新增业绩考核-个人填报-考勤管理 diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBusinessWorkMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBusinessWorkMapper.java index 1d7dcc6..653554f 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBusinessWorkMapper.java +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBusinessWorkMapper.java @@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingBusinessWorkMapper extends BaseMapper selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + public List selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingNegativeListMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingNegativeListMapper.java index 725714c..ba064ec 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingNegativeListMapper.java +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingNegativeListMapper.java @@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingNegativeListMapper extends BaseMapper selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + List selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingRewardsKpiMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingRewardsKpiMapper.java index 518e71e..95a5214 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingRewardsKpiMapper.java +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingRewardsKpiMapper.java @@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingRewardsKpiMapper extends BaseMapper selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + List selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuEmergencyMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuEmergencyMapper.java index 4852456..9a9259a 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuEmergencyMapper.java +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuEmergencyMapper.java @@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingStuEmergencyMapper extends BaseMapper selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + List selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuMgtMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuMgtMapper.java index 82a35d5..982100d 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuMgtMapper.java +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingStuMgtMapper.java @@ -35,7 +35,7 @@ public interface SysTeacherKpiFillingStuMgtMapper extends BaseMapper selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + public List selectSysTeacherKpiFillingAMgtByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** * 新增业绩考核-个人填报-考勤管理 diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBusinessWorkService.java b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBusinessWorkService.java index 5cf16d1..7001d98 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBusinessWorkService.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBusinessWorkService.java @@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingBusinessWorkService extends IService selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + public List selectSysTeacherKpiFillingBusinessWorkByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingNegativeListService.java b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingNegativeListService.java index 2e95a80..cb9670a 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingNegativeListService.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingNegativeListService.java @@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingNegativeListService extends IService selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + List selectSysTeacherKpiFillingNegativeListByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingRewardsKpiService.java b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingRewardsKpiService.java index f443583..a1ca0ff 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingRewardsKpiService.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingRewardsKpiService.java @@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingRewardsKpiService extends IService selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + List selectSysTeacherKpiFillingRewardsKpiByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuEmergencyService.java b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuEmergencyService.java index 6895d6e..d62930c 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuEmergencyService.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuEmergencyService.java @@ -36,7 +36,7 @@ public interface ISysTeacherKpiFillingStuEmergencyService extends IService selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth); + List selectSysTeacherKpiFillingStuEmergencyByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth, @Param("classType") String classType); /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuMgtService.java b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuMgtService.java index a7f2991..d8bed91 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuMgtService.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingStuMgtService.java @@ -27,7 +27,7 @@ public interface ISysTeacherKpiFillingStuMgtService extends IService selectSysTeacherKpiFillingAMgtByFdyName(String fdyName, String fillingYear, String fillingMonth) { - return sysTeacherKpiFillingAMgtMapper.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth); + public List selectSysTeacherKpiFillingAMgtByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) { + return sysTeacherKpiFillingAMgtMapper.selectSysTeacherKpiFillingAMgtByFdyName(fdyName, fillingYear, fillingMonth, classType); } /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java index ca98f83..d605d71 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java @@ -53,8 +53,8 @@ public class SysTeacherKpiFillingBusinessWorkServiceImpl extends ServiceImpl selectSysTeacherKpiFillingBusinessWorkByFdyName(String fdyName, String fillingYear, String fillingMonth) { - return sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(fdyName, fillingYear, fillingMonth); + public List 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 sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth()); + List sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth(), sysTeacherKpiFillingBusinessWork.getClassType()); if (sysTeacherKpiFillingBusinessWorkList != null && !sysTeacherKpiFillingBusinessWorkList.isEmpty()) { throw new ServiceException("已提交，请勿重复提交", 500); } diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingNegativeListServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingNegativeListServiceImpl.java index 12abf80..c09c73b 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingNegativeListServiceImpl.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingNegativeListServiceImpl.java @@ -53,8 +53,8 @@ public class SysTeacherKpiFillingNegativeListServiceImpl extends ServiceImpl selectSysTeacherKpiFillingNegativeListByFdyName(String fdyName, String fillingYear, String fillingMonth) { - return sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(fdyName, fillingYear, fillingMonth); + public List 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 sysTeacherKpiFillingNegativeLists = sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(sysTeacherKpiFillingNegativeList.getFdyName(), sysTeacherKpiFillingNegativeList.getFillingYear(), sysTeacherKpiFillingNegativeList.getFillingMonth()); + List sysTeacherKpiFillingNegativeLists = sysTeacherKpiFillingNegativeListMapper.selectSysTeacherKpiFillingNegativeListByFdyName(sysTeacherKpiFillingNegativeList.getFdyName(), sysTeacherKpiFillingNegativeList.getFillingYear(), sysTeacherKpiFillingNegativeList.getFillingMonth(), sysTeacherKpiFillingNegativeList.getClassType()); if (sysTeacherKpiFillingNegativeLists != null && !sysTeacherKpiFillingNegativeLists.isEmpty()) { throw new ServiceException("已提交，请勿重复提交", 500); } diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingRewardsKpiServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingRewardsKpiServiceImpl.java index 2699fdd..da8d197 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingRewardsKpiServiceImpl.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingRewardsKpiServiceImpl.java @@ -51,8 +51,8 @@ public class SysTeacherKpiFillingRewardsKpiServiceImpl extends ServiceImpl selectSysTeacherKpiFillingRewardsKpiByFdyName(String fdyName, String fillingYear, String fillingMonth) { - return sysTeacherKpiFillingRewardsKpiMapper.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth); + public List selectSysTeacherKpiFillingRewardsKpiByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) { + return sysTeacherKpiFillingRewardsKpiMapper.selectSysTeacherKpiFillingRewardsKpiByFdyName(fdyName, fillingYear, fillingMonth, classType); } /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuEmergencyServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuEmergencyServiceImpl.java index 7f608c4..2e20203 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuEmergencyServiceImpl.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuEmergencyServiceImpl.java @@ -51,8 +51,8 @@ public class SysTeacherKpiFillingStuEmergencyServiceImpl extends ServiceImpl selectSysTeacherKpiFillingStuEmergencyByFdyName(String fdyName, String fillingYear, String fillingMonth) { - return sysTeacherKpiFillingStuEmergencyMapper.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth); + public List selectSysTeacherKpiFillingStuEmergencyByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType) { + return sysTeacherKpiFillingStuEmergencyMapper.selectSysTeacherKpiFillingStuEmergencyByFdyName(fdyName, fillingYear, fillingMonth, classType); } /** diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java index 31ced1d..e81f155 100644 --- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java +++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java @@ -52,8 +52,8 @@ public class SysTeacherKpiFillingStuMgtServiceImpl extends ServiceImpl + - 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 @@ -27,6 +28,7 @@ and fdy_name like concat('%', #{fdyName}, '%') and filling_year = #{fillingYear} and filling_month = #{fillingMonth} + and class_type = #{classType} order by id desc @@ -45,6 +47,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -63,6 +68,7 @@ fdy_name, filling_year, filling_month, + class_type, #{id}, @@ -71,6 +77,7 @@ #{fdyName}, #{fillingYear}, #{fillingMonth}, + #{classType}, @@ -82,6 +89,7 @@ fdy_name = #{fdyName}, filling_year = #{fillingYear}, filling_month = #{fillingMonth}, + class_type = #{classType}, where id = #{id} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBusinessWorkMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBusinessWorkMapper.xml index dda9fd9..23f3a0e 100644 --- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBusinessWorkMapper.xml +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBusinessWorkMapper.xml @@ -11,9 +11,11 @@ + + @@ -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 @@ -43,9 +47,11 @@ #{stuDisciplinaryViolationScoring} and handle_events_scoring = #{handleEventsScoring} + and other_task_scoring = #{otherTaskScoring} and fdy_name like concat('%', #{fdyName}, '%') and filling_year = #{fillingYear} and filling_month = #{fillingMonth} + and class_type = #{classType} order by id desc @@ -70,6 +76,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -83,9 +92,11 @@ stu_basic_data_scoring, stu_disciplinary_violation_scoring, handle_events_scoring, + other_task_scoring, fdy_name, filling_year, filling_month, + class_type, #{id}, @@ -94,9 +105,11 @@ #{stuBasicDataScoring}, #{stuDisciplinaryViolationScoring}, #{handleEventsScoring}, + #{otherTaskScoring}, #{fdyName}, #{fillingYear}, #{fillingMonth}, + #{classType}, @@ -112,9 +125,11 @@ #{stuDisciplinaryViolationScoring}, handle_events_scoring = #{handleEventsScoring}, + other_task_scoring = #{otherTaskScoring}, fdy_name = #{fdyName}, filling_year = #{fillingYear}, filling_month = #{fillingMonth}, + class_type = #{classType}, where id = #{id} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml index 6865f46..a756a50 100644 --- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml @@ -22,30 +22,39 @@ - + + - + - + - + - + - + + + + + @@ -147,6 +156,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -177,6 +210,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + @@ -194,6 +230,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + @@ -211,6 +250,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + @@ -228,6 +270,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -246,8 +291,50 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + + + + + + + + + @@ -461,7 +548,8 @@ ks_opinion, xgcz_opinion, audit_progress, - job_number + job_number, + class_type from sys_teacher_kpi_filling @@ -522,6 +610,7 @@ xgcz_opinion, audit_progress, job_number, + class_type, #{fdyName}, @@ -540,6 +629,7 @@ #{xgczOpinion}, #{auditProgress}, #{jobNumber}, + #{classType}, @@ -562,6 +652,7 @@ xgcz_opinion = #{xgczOpinion}, audit_progress = #{auditProgress}, job_number = #{jobNumber}, + class_type = #{classType}, where id = #{id} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingNegativeListMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingNegativeListMapper.xml index 87e89aa..1da43dd 100644 --- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingNegativeListMapper.xml +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingNegativeListMapper.xml @@ -16,6 +16,7 @@ + @@ -29,7 +30,8 @@ practice_fraud, fdy_name, filling_year, - filling_month + filling_month, + class_type from sys_teacher_kpi_filling_negative_list @@ -47,6 +49,7 @@ and fdy_name like concat('%', #{fdyName}, '%') and filling_year = #{fillingYear} and filling_month = #{fillingMonth} + and class_type = #{classType} order by id desc @@ -65,6 +68,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -89,6 +95,7 @@ fdy_name, filling_year, filling_month, + class_type, #{moralityAndBehavior}, @@ -101,6 +108,7 @@ #{fdyName}, #{fillingYear}, #{fillingMonth}, + #{classType}, @@ -117,6 +125,7 @@ fdy_name = #{fdyName}, filling_year = #{fillingYear}, filling_month = #{fillingMonth}, + class_type = #{classType}, where id = #{id} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingRewardsKpiMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingRewardsKpiMapper.xml index 0ec856c..272c8e9 100644 --- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingRewardsKpiMapper.xml +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingRewardsKpiMapper.xml @@ -12,10 +12,11 @@ + - 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 @@ -31,6 +32,7 @@ and fdy_name like concat('%', #{fdyName}, '%') and filling_year = #{fillingYear} and filling_month = #{fillingMonth} + and class_type = #{classType} order by id desc @@ -55,6 +57,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -69,6 +74,7 @@ fdy_name, filling_year, filling_month, + class_type, #{dutyDescription}, @@ -77,6 +83,7 @@ #{fdyName}, #{fillingYear}, #{fillingMonth}, + #{classType}, @@ -89,6 +96,7 @@ fdy_name = #{fdyName}, filling_year = #{fillingYear}, filling_month = #{fillingMonth}, + class_type = #{classType}, where id = #{id} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuEmergencyMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuEmergencyMapper.xml index 0d93c52..2f68c5f 100644 --- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuEmergencyMapper.xml +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuEmergencyMapper.xml @@ -13,6 +13,7 @@ + @@ -23,7 +24,8 @@ event_level, fdy_name, filling_year, - filling_month + filling_month, + class_type from sys_teacher_kpi_filling_stu_emergency @@ -40,6 +42,7 @@ and fdy_name like concat('%', #{fdyName}, '%') and filling_year = #{fillingYear} and filling_month = #{fillingMonth} + and class_type = #{classType} order by id desc @@ -64,6 +67,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -79,6 +85,7 @@ fdy_name, filling_year, filling_month, + class_type, #{eventDescription}, @@ -88,6 +95,7 @@ #{fdyName}, #{fillingYear}, #{fillingMonth}, + #{classType}, @@ -101,6 +109,7 @@ fdy_name = #{fdyName}, filling_year = #{fillingYear}, filling_month = #{fillingMonth}, + class_type = #{classType}, where id = #{id} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml index 40167d7..b9d42ab 100644 --- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml @@ -16,6 +16,9 @@ + + + @@ -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 @@ -221,6 +227,9 @@ and filling_month = #{fillingMonth} + + and class_type = #{classType} + order by id desc @@ -263,6 +272,9 @@ stu_activity_scoring, stu_talk_scoring, visit_dormitory_scoring, + edg_scoring, + notice_scoring, + class_type, #{id}, @@ -275,6 +287,9 @@ #{stuActivityScoring}, #{stuTalkScoring}, #{visitDormitoryScoring}, + #{edgScoring}, + #{noticeScoring}, + #{classType}, @@ -290,6 +305,9 @@ stu_activity_scoring = #{stuActivityScoring}, stu_talk_scoring = #{stuTalkScoring}, visit_dormitory_scoring = #{visitDormitoryScoring}, + edg_scoring = #{edgScoring}, + notice_scoring = #{noticeScoring}, + class_type = #{classType}, where id = #{id}