From f75c8a68340054e941afe9963b543a3b92e045f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwuzhen=E2=80=9D?= Date: Tue, 17 Nov 2026 14:48:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(xg):=20=E8=90=BD=E5=AE=9E=E6=95=99?= =?UTF-8?q?=E5=B8=88=E5=8F=8D=E9=A6=88=E4=B8=AD=E7=9A=84=E7=95=99=E5=AE=BF?= =?UTF-8?q?=E3=80=81=E7=82=B9=E5=90=8D=E3=80=81=E5=8D=AB=E7=94=9F=E5=92=8C?= =?UTF-8?q?=E5=A4=84=E5=88=86=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 留宿按次日早上8点结束,点名按校区分日共用批次,处分计入现有班级月扣分,开除学籍只登记不计分。 Co-authored-by: Cursor --- .../service/impl/FlwTaskServiceImpl.java | 10 +- .../controller/XgDormRollCallController.java | 12 +- .../controller/XgStudentLeaveController.java | 40 ++- .../xg/service/IXgDormRollCallService.java | 9 +- .../xg/service/IXgStudentLeaveService.java | 6 + .../impl/XgDormBedStudentServiceImpl.java | 15 + .../impl/XgDormRollCallServiceImpl.java | 21 +- .../impl/XgHolidayStayServiceImpl.java | 48 ++- .../impl/XgStudentLeaveServiceImpl.java | 27 ++ .../XskhDisciplineRecordController.java | 60 ++++ .../xskh/domain/XskhDisciplineRecord.java | 2 +- .../domain/bo/XskhDisciplineRecordBo.java | 19 +- .../domain/vo/XskhPunishmentExportVo.java | 46 +++ .../domain/vo/XskhPunishmentSummaryVo.java | 43 +++ .../mapper/XskhDisciplineRecordMapper.java | 2 + .../service/IXskhDisciplineRecordService.java | 10 + .../impl/XskhDisciplineRecordServiceImpl.java | 182 +++++++++- .../mapper/XskhDisciplineRecordMapper.xml | 10 + .../update_20261113_feedback_rectify.sql | 45 +++ docs/开发文档/API/20261113教师反馈整改说明.md | 39 +++ docs/开发文档/API/API文档总览.md | 1 + mobile/src/api/dormRollCall.js | 12 +- mobile/src/pages.json | 8 + mobile/src/pages/index/index.vue | 20 ++ mobile/src/pages/task/taskFinish.vue | 2 +- mobile/src/pages/task/taskWaiting.vue | 13 +- .../pages/xg/xsjcxx/xsqj/leaveEdit/index.vue | 13 +- mobile/src/pages/xgss/jqzs/apply.vue | 17 +- mobile/src/pages/xgss/jqzs/teacherList.vue | 18 +- .../ssdm/components/RoomRollCallPopup.vue | 65 +++- mobile/src/pages/xgss/ssdm/ssdm.vue | 107 +++++- mobile/src/pages/xgss/ssdm/ssdmCheck.vue | 19 +- .../xgss/wsjc/components/SingleRoomCheck.vue | 205 ++++++++---- .../wsjc/components/ViolationRecordDialog.vue | 104 ++++-- mobile/src/pages/xskh/punishment/index.vue | 255 ++++++++++++++ .../xgss/dormRollCall/dormRollCall/index.ts | 5 +- .../xskh/disciplineRecord/disciplineRecord.ts | 35 +- web/src/router/index.ts | 13 + web/src/views/workflow/task/taskFinish.vue | 2 +- .../DormHygieneCheckEditDialog.vue | 99 ++++-- .../DormHygieneCheckSingleDialog.vue | 102 ++++-- .../DisciplineDeductionMultiSelect.vue | 70 +++- .../components/ViolationRecordDialog.vue | 138 +++++--- .../dormRollCall/RoomRollCallPopup.vue | 61 +++- .../dormRollCall/rollCallCheck.vue | 18 +- .../xgss/holidayStay/holidayStay/index-sg.vue | 34 +- .../xg/xgss/holidayStay/holidayStay/index.vue | 34 +- web/src/views/xskh/disciplineRecord/index.vue | 7 + .../views/xskh/studentPunishment/index.vue | 316 ++++++++++++++++++ 49 files changed, 2163 insertions(+), 276 deletions(-) create mode 100644 backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentExportVo.java create mode 100644 backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentSummaryVo.java create mode 100644 backend/script/sql/update/update_20261113_feedback_rectify.sql create mode 100644 docs/开发文档/API/20261113教师反馈整改说明.md create mode 100644 mobile/src/pages/xskh/punishment/index.vue create mode 100644 web/src/views/xskh/studentPunishment/index.vue diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index e486701c..7668011f 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -386,7 +386,15 @@ public class FlwTaskServiceImpl implements IFlwTaskService { private QueryWrapper buildQueryWrapper(FlowTaskBo flowTaskBo) { QueryWrapper wrapper = Wrappers.query(); wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName()); - wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName()); + if (StringUtils.isNotBlank(flowTaskBo.getFlowName())) { + String keyword = flowTaskBo.getFlowName().trim(); + String likeKeyword = "%" + keyword + "%"; + wrapper.and(w -> w.like("t.flow_name", keyword) + .or() + .apply("exists (select 1 from xg_student_leave l where cast(l.id as char) = t.business_id and ifnull(l.deleted, 0) = 0 and (l.student_name like {0} or l.student_no like {0}))", likeKeyword) + .or() + .apply("exists (select 1 from xg_student_cancel_leave c where cast(c.id as char) = t.business_id and ifnull(c.deleted, 0) = 0 and (c.student_name like {0} or c.student_no like {0}))", likeKeyword)); + } wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); wrapper.in(CollUtil.isNotEmpty(flowTaskBo.getCreateByIds()), "t.create_by", flowTaskBo.getCreateByIds()); if (StringUtils.isNotBlank(flowTaskBo.getCategory())) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java index 19b9a16d..47d33cdb 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java @@ -41,19 +41,21 @@ public class XgDormRollCallController extends BaseController { /** * 当天点名人数汇总(总人数/已点名人数 + 请假/留宿/异常明细) * - * @param buildingId 可选;空=全校,有值=指定楼栋 + * @param buildingId 可选,指定楼栋 + * @param campusId 可选,指定校区。校区和楼栋都为空时不汇总,避免两个校区混在一起 */ @SaCheckPermission("dormRollCall:dormRollCall:list1") @GetMapping("/todaySummary") public R todaySummary( - @RequestParam(value = "buildingId", required = false) Long buildingId) { - return R.ok(xgDormRollCallService.queryTodaySummary(buildingId)); + @RequestParam(value = "buildingId", required = false) Long buildingId, + @RequestParam(value = "campusId", required = false) Long campusId) { + return R.ok(xgDormRollCallService.queryTodaySummary(buildingId, campusId)); } @SaCheckPermission("dormRollCall:dormRollCall:add") @GetMapping("/generateBatchNo") - public R generateBatchNo() { - return R.ok(xgDormRollCallService.generateBatchNo()); + public R generateBatchNo(@RequestParam(value = "campusId", required = false) Long campusId) { + return R.ok(xgDormRollCallService.generateBatchNo(campusId)); } @SaCheckPermission("dormRollCall:dormRollCall:list1") diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java index aea18aa6..e7eaae61 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java @@ -1,6 +1,7 @@ package org.dromara.xg.controller; import org.dromara.common.web.handler.GlobalExceptionHandler; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -9,6 +10,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -111,7 +113,14 @@ public class XgStudentLeaveController extends BaseController { * @param studentIds 学生ID列表(逗号分隔) * @param checkDate 检查日期 */ - @SaCheckPermission("studentLeave:studentLeave:query") + @SaCheckPermission(value = { + "studentLeave:studentLeave:query", + "dormHygieneCheck:dormHygieneCheck:list", + "dormHygieneCheck:dormHygieneCheck:query", + "dormHygieneCheck:dormHygieneCheck:add", + "dormRollCall:dormRollCall:list1", + "dormRollCall:dormRollCall:query" + }, mode = SaMode.OR) @GetMapping("/queryByCheckDate") public R> queryByCheckDate( @RequestParam("studentIds") String studentIds, @@ -130,4 +139,33 @@ public class XgStudentLeaveController extends BaseController { return R.fail("参数格式错误:" + GlobalExceptionHandler.safeMessage(e.getMessage())); } } + + /** + * 查询某一天内的有效请假(含白天临时请假、晚上晚归),供检查和点名只读查看。 + */ + @SaCheckPermission(value = { + "studentLeave:studentLeave:query", + "dormHygieneCheck:dormHygieneCheck:list", + "dormHygieneCheck:dormHygieneCheck:query", + "dormHygieneCheck:dormHygieneCheck:add", + "dormRollCall:dormRollCall:list1", + "dormRollCall:dormRollCall:query" + }, mode = SaMode.OR) + @GetMapping("/queryByCheckDay") + public R>> queryByCheckDay( + @RequestParam("studentIds") String studentIds, + @RequestParam("checkDate") String checkDate) { + try { + List studentIdList = List.of(studentIds.split(",")) + .stream() + .map(String::trim) + .filter(text -> !text.isEmpty()) + .map(Long::valueOf) + .toList(); + LocalDate day = LocalDateTime.parse(checkDate.replace(" ", "T")).toLocalDate(); + return R.ok(xgStudentLeaveService.queryStudentLeavesOverlappingDay(studentIdList, day)); + } catch (Exception e) { + return R.fail("参数格式错误:" + GlobalExceptionHandler.safeMessage(e.getMessage())); + } + } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormRollCallService.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormRollCallService.java index 8c6dd955..e1bd9ae9 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormRollCallService.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgDormRollCallService.java @@ -26,6 +26,11 @@ public interface IXgDormRollCallService { String generateBatchNo(); + /** + * 每个校区每个自然日一个批次,该校区所有寝室老师共用。 + */ + String generateBatchNo(Long campusId); + List getBuildingRoomsStatus(Long buildingId, String batchNo); XgDormRollCallVo submitRollCall(XgDormRollCallBo bo); @@ -36,7 +41,7 @@ public interface IXgDormRollCallService { * 当天点名人数汇总(总人数 / 已点名人数 + 请假/留宿/异常明细)。 *

* 总人数 = 有床位且在住学生数;已点名人数 = 本日点名明细有记录的去重学生数。 - * buildingId 为空时统计全校;有值时仅统计该楼。 + * 必须指定校区或楼栋,避免临安、西溪混在一起。 */ - DormRollCallTodaySummaryVo queryTodaySummary(Long buildingId); + DormRollCallTodaySummaryVo queryTodaySummary(Long buildingId, Long campusId); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentLeaveService.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentLeaveService.java index 20664fcd..b67c558b 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentLeaveService.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/IXgStudentLeaveService.java @@ -5,6 +5,7 @@ import org.dromara.xg.domain.bo.XgStudentLeaveBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Collection; import java.util.List; @@ -77,4 +78,9 @@ public interface IXgStudentLeaveService { * @return 学生ID -> 请假信息的映射 */ Map queryStudentLeavesByCheckDate(List studentIds, LocalDateTime checkDate); + + /** + * 查询与某一天有交集、且审批已结束的请假。用于教官查看白天临时请假和晚上晚归。 + */ + Map> queryStudentLeavesOverlappingDay(List studentIds, LocalDate day); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java index 0f44f9b8..3103c21e 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java @@ -2524,9 +2524,11 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService { LocalDateTime now = LocalDateTime.now(); Map leaveMap = Map.of(); + Map> todayLeaveMap = Map.of(); Map holidayStayMap = Map.of(); if (!studentIds.isEmpty()) { leaveMap = xgStudentLeaveService.queryStudentLeavesByCheckDate(studentIds, now); + todayLeaveMap = xgStudentLeaveService.queryStudentLeavesOverlappingDay(studentIds, now.toLocalDate()); IXgHolidayStayService holidayStayService = xgHolidayStayServiceProvider.getIfAvailable(); if (holidayStayService != null) { holidayStayMap = holidayStayService.queryStudentHolidayStaysByCheckDate(studentIds, now); @@ -2579,6 +2581,19 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService { leaveInfoMap.put("leaveEndTime", leaveInfo.getEndTime()); studentInfo.put("leaveInfo", leaveInfoMap); } + List todayLeaves = todayLeaveMap.get(studentIdValue); + if (todayLeaves != null && !todayLeaves.isEmpty()) { + List> todayLeaveList = new ArrayList<>(); + for (XgStudentLeaveVo todayLeave : todayLeaves) { + Map item = new LinkedHashMap<>(); + item.put("leaveId", todayLeave.getId()); + item.put("leaveTypeName", todayLeave.getLeaveTypeName()); + item.put("leaveStartTime", todayLeave.getStartTime()); + item.put("leaveEndTime", todayLeave.getEndTime()); + todayLeaveList.add(item); + } + studentInfo.put("todayLeaveList", todayLeaveList); + } // 请假与假期留宿可同时生效,一并返回供点名双状态展示 XgHolidayStayVo holidayStay = holidayStayMap.get(studentIdValue); if (holidayStay != null) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRollCallServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRollCallServiceImpl.java index fa337b8f..389e7132 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRollCallServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRollCallServiceImpl.java @@ -36,6 +36,7 @@ import org.dromara.xg.service.IXgDormRollCallService; import org.dromara.common.satoken.utils.LoginHelper; import cn.hutool.core.date.DateUtil; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -126,6 +127,15 @@ public class XgDormRollCallServiceImpl implements IXgDormRollCallService { @Override public String generateBatchNo() { + return generateBatchNo(null); + } + + @Override + public String generateBatchNo(Long campusId) { + if (campusId != null) { + String day = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); + return "RC" + day + "C" + campusId; + } String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); String random = String.format("%04x", ThreadLocalRandom.current().nextInt(0x10000)); return "RC" + timestamp + random; @@ -276,15 +286,19 @@ public class XgDormRollCallServiceImpl implements IXgDormRollCallService { } @Override - public DormRollCallTodaySummaryVo queryTodaySummary(Long buildingId) { + public DormRollCallTodaySummaryVo queryTodaySummary(Long buildingId, Long campusId) { DormRollCallTodaySummaryVo summary = new DormRollCallTodaySummaryVo(); + if (buildingId == null && campusId == null) { + return summary; + } - // 总人数:有床位且在住(status=0) + // 总人数:有床位且在住(status=0),按校区或楼栋分开统计 LambdaQueryWrapper totalLqw = Wrappers.lambdaQuery() .eq(XgDormBedStudent::getStatus, "0") .eq(XgDormBedStudent::getDeleted, "0") .isNotNull(XgDormBedStudent::getStudentId) .isNotNull(XgDormBedStudent::getBedId) + .eq(campusId != null, XgDormBedStudent::getCampusId, campusId) .eq(buildingId != null, XgDormBedStudent::getBuildingId, buildingId); Long totalStudents = bedStudentMapper.selectCount(totalLqw); summary.setTotalStudentCount(totalStudents == null ? 0 : totalStudents.intValue()); @@ -292,11 +306,11 @@ public class XgDormRollCallServiceImpl implements IXgDormRollCallService { Date dayBegin = DateUtil.beginOfDay(new Date()); Date dayEnd = DateUtil.endOfDay(new Date()); - // 全校或指定楼栋的当天点名主表 LambdaQueryWrapper rollLqw = Wrappers.lambdaQuery() .eq(XgDormRollCall::getStatus, "0") .ge(XgDormRollCall::getCheckDate, dayBegin) .le(XgDormRollCall::getCheckDate, dayEnd) + .eq(campusId != null, XgDormRollCall::getCampusId, campusId) .eq(buildingId != null, XgDormRollCall::getBuildingId, buildingId) .orderByDesc(XgDormRollCall::getCheckDate); List todayRecords = baseMapper.selectList(rollLqw); @@ -397,6 +411,7 @@ public class XgDormRollCallServiceImpl implements IXgDormRollCallService { private LambdaQueryWrapper buildQueryWrapper(XgDormRollCallBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getBatchNo()), XgDormRollCall::getBatchNo, bo.getBatchNo()); + lqw.eq(bo.getCampusId() != null, XgDormRollCall::getCampusId, bo.getCampusId()); lqw.eq(bo.getBuildingId() != null, XgDormRollCall::getBuildingId, bo.getBuildingId()); lqw.eq(bo.getRoomId() != null, XgDormRollCall::getRoomId, bo.getRoomId()); lqw.eq(bo.getCheckerId() != null, XgDormRollCall::getCheckerId, bo.getCheckerId()); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgHolidayStayServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgHolidayStayServiceImpl.java index 82f73095..321f5ab9 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgHolidayStayServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgHolidayStayServiceImpl.java @@ -98,7 +98,7 @@ public class XgHolidayStayServiceImpl implements IXgHolidayStayService { private LambdaQueryWrapper buildQueryWrapper(XgHolidayStayBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(XgHolidayStay::getId); + lqw.orderByAsc(XgHolidayStay::getApplyStartDate).orderByAsc(XgHolidayStay::getId); lqw.eq(bo.getDeleted() != null, XgHolidayStay::getDeleted, bo.getDeleted()); lqw.eq(bo.getStudentId() != null, XgHolidayStay::getStudentId, bo.getStudentId()); lqw.like(StringUtils.isNotBlank(bo.getStudentName()), XgHolidayStay::getStudentName, bo.getStudentName()); @@ -256,6 +256,51 @@ public class XgHolidayStayServiceImpl implements IXgHolidayStayService { if (StringUtils.isBlank(entity.getEmergencyPhone())) { throw new ServiceException("紧急联系电话不能为空"); } + normalizeStayWindow(entity); + } + + /** + * 学生只选日期。开始日 08:00,结束日的次日 08:00。 + * 结束时间已经是 08:00 且晚于开始日时视为已规范化,避免编辑时再加一天。 + */ + private void normalizeStayWindow(XgHolidayStay entity) { + if (entity.getApplyStartDate() == null || entity.getApplyEndDate() == null) { + throw new ServiceException("请选择留宿开始和结束日期"); + } + Calendar start = Calendar.getInstance(); + start.setTime(entity.getApplyStartDate()); + Calendar end = Calendar.getInstance(); + end.setTime(entity.getApplyEndDate()); + + Calendar startDay = (Calendar) start.clone(); + startDay.set(Calendar.HOUR_OF_DAY, 0); + startDay.set(Calendar.MINUTE, 0); + startDay.set(Calendar.SECOND, 0); + startDay.set(Calendar.MILLISECOND, 0); + + boolean endAlreadyMorning = end.get(Calendar.HOUR_OF_DAY) == 8 + && end.get(Calendar.MINUTE) == 0 + && end.get(Calendar.SECOND) == 0 + && end.after(startDay); + + start.set(Calendar.HOUR_OF_DAY, 8); + start.set(Calendar.MINUTE, 0); + start.set(Calendar.SECOND, 0); + start.set(Calendar.MILLISECOND, 0); + + if (!endAlreadyMorning) { + end.add(Calendar.DAY_OF_MONTH, 1); + } + end.set(Calendar.HOUR_OF_DAY, 8); + end.set(Calendar.MINUTE, 0); + end.set(Calendar.SECOND, 0); + end.set(Calendar.MILLISECOND, 0); + + if (!end.after(start)) { + throw new ServiceException("留宿结束日期不能早于开始日期"); + } + entity.setApplyStartDate(start.getTime()); + entity.setApplyEndDate(end.getTime()); } /** @@ -851,7 +896,6 @@ public class XgHolidayStayServiceImpl implements IXgHolidayStayService { if (bo.getClassId() == null) { lqw.in(XgHolidayStay::getClassId, classIds); } - lqw.orderByDesc(XgHolidayStay::getApplyTime).orderByDesc(XgHolidayStay::getId); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentLeaveServiceImpl.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentLeaveServiceImpl.java index 0805eef5..2360eef7 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentLeaveServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgStudentLeaveServiceImpl.java @@ -52,12 +52,14 @@ import org.dromara.xg.domain.XgStudentManager; import org.dromara.xg.domain.XgStudentManagerSource; import org.dromara.xg.domain.XgClassMsg; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Collection; import java.util.ArrayList; +import java.util.HashMap; import java.util.Objects; import java.util.Set; import java.util.HashSet; @@ -712,4 +714,29 @@ public class XgStudentLeaveServiceImpl implements IXgStudentLeaveService { )); } + @Override + public Map> queryStudentLeavesOverlappingDay(List studentIds, LocalDate day) { + if (studentIds == null || studentIds.isEmpty() || day == null) { + return Map.of(); + } + LocalDateTime dayStart = day.atStartOfDay(); + LocalDateTime dayEnd = day.atTime(23, 59, 59); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.in(XgStudentLeave::getStudentId, studentIds); + lqw.eq(XgStudentLeave::getApprovalStatus, BusinessStatusEnum.FINISH.getStatus()); + lqw.le(XgStudentLeave::getStartTime, dayEnd); + lqw.ge(XgStudentLeave::getEndTime, dayStart); + lqw.orderByAsc(XgStudentLeave::getStartTime); + List leaveList = baseMapper.selectList(lqw); + Map> grouped = new HashMap<>(); + for (XgStudentLeave leave : leaveList) { + if (leave.getStudentId() == null) { + continue; + } + grouped.computeIfAbsent(leave.getStudentId(), key -> new ArrayList<>()) + .add(MapstructUtils.convert(leave, XgStudentLeaveVo.class)); + } + return grouped; + } + } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java index fe7f6e44..e1b46dea 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java @@ -19,6 +19,8 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.xskh.domain.vo.XskhDisciplineRecordVo; +import org.dromara.xskh.domain.vo.XskhPunishmentExportVo; +import org.dromara.xskh.domain.vo.XskhPunishmentSummaryVo; import org.dromara.xskh.domain.bo.XskhDisciplineRecordBo; import org.dromara.xskh.domain.vo.XskhStudentOptionVo; import org.dromara.xskh.service.IXskhDisciplineRecordService; @@ -188,4 +190,62 @@ public class XskhDisciplineRecordController extends BaseController { PageQuery pageQuery) { return xskhDisciplineRecordService.queryMyCreatedPageList(bo, pageQuery); } + + /** + * 学生处分种类 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:query") + @GetMapping("/punishment/options") + public R>> punishmentOptions() { + return R.ok(xskhDisciplineRecordService.punishmentOptions()); + } + + /** + * 录入学生处分,分值计入班级月扣分。开除学籍不计分。 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:add") + @Log(title = "学生处分", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/punishment") + public R addPunishment(@RequestBody XskhDisciplineRecordBo bo) { + return toAjax(xskhDisciplineRecordService.insertPunishment(bo)); + } + + /** + * 学生处分汇总:按种类、按班级 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:list") + @GetMapping("/punishment/summary") + public R punishmentSummary(XskhDisciplineRecordBo bo) { + return R.ok(xskhDisciplineRecordService.summarizePunishment(bo)); + } + + /** + * 导出学生处分登记表 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:export") + @Log(title = "学生处分登记表", businessType = BusinessType.EXPORT) + @PostMapping("/punishment/export") + public void exportPunishment(XskhDisciplineRecordBo bo, HttpServletResponse response) { + List list = xskhDisciplineRecordService.listPunishmentExport(bo); + ExcelUtil.exportExcel(list, "学生处分登记表", XskhPunishmentExportVo.class, response); + } + + /** + * 导出学生处分汇总表 + */ + @SaCheckPermission("disciplineRecord:disciplineRecord:export") + @Log(title = "学生处分汇总表", businessType = BusinessType.EXPORT) + @PostMapping("/punishment/exportSummary") + public void exportPunishmentSummary(XskhDisciplineRecordBo bo, HttpServletResponse response) { + XskhPunishmentSummaryVo summary = xskhDisciplineRecordService.summarizePunishment(bo); + List rows = new java.util.ArrayList<>(); + if (summary.getByType() != null) { + rows.addAll(summary.getByType()); + } + if (summary.getByClass() != null) { + rows.addAll(summary.getByClass()); + } + ExcelUtil.exportExcel(rows, "学生处分汇总表", XskhPunishmentSummaryVo.Row.class, response); + } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java index cbf51b08..543274c6 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java @@ -111,7 +111,7 @@ public class XskhDisciplineRecord extends TenantEntity { private String status; /** - * 违纪来源(1-宿舍卫生检查 2-教学区违纪) + * 违纪来源(1-宿舍卫生检查 2-教学区违纪 3-学生处分) */ private String violationSource; diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineRecordBo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineRecordBo.java index eb567fa8..211bdab5 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineRecordBo.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineRecordBo.java @@ -129,10 +129,27 @@ public class XskhDisciplineRecordBo extends BaseEntity { private String status; /** - * 违纪来源(1-宿舍卫生检查 2-教学区违纪) + * 违纪来源(1-宿舍卫生检查 2-教学区违纪 3-学生处分) */ private String violationSource; + /** + * 处分编码(cf_warning 等),仅学生处分录入使用 + */ + private String punishmentCode; + + /** + * 查询开始日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate beginDisciplineDate; + + /** + * 查询结束日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endDisciplineDate; + /** * 附件OSS ID列表,逗号分隔 */ diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentExportVo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentExportVo.java new file mode 100644 index 00000000..68b207c8 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentExportVo.java @@ -0,0 +1,46 @@ +package org.dromara.xskh.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * 学生处分登记表导出行 + */ +@Data +public class XskhPunishmentExportVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ExcelProperty("学号") + private String studentNo; + + @ExcelProperty("姓名") + private String studentName; + + @ExcelProperty("学院") + private String collegeName; + + @ExcelProperty("班级") + private String className; + + @ExcelProperty("处分种类") + private String disciplineTypeName; + + @ExcelProperty("班级扣分") + private BigDecimal scoreDeduction; + + @ExcelProperty("处分日期") + private LocalDate disciplineDate; + + @ExcelProperty("原因") + private String disciplineReason; + + @ExcelProperty("备注") + private String disciplineContent; +} diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentSummaryVo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentSummaryVo.java new file mode 100644 index 00000000..f4537738 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhPunishmentSummaryVo.java @@ -0,0 +1,43 @@ +package org.dromara.xskh.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * 学生处分汇总 + */ +@Data +public class XskhPunishmentSummaryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private List byType = new ArrayList<>(); + + private List byClass = new ArrayList<>(); + + @Data + public static class Row implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @ExcelProperty("维度") + private String dimension; + + @ExcelProperty("名称") + private String name; + + @ExcelProperty("人次") + private Integer count; + + @ExcelProperty("班级扣分") + private BigDecimal score; + } +} diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java index b4c3a016..7196b867 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineRecordMapper.java @@ -31,6 +31,8 @@ public interface XskhDisciplineRecordMapper extends BaseMapperPlus queryMyCreatedPageList(XskhDisciplineRecordBo bo, PageQuery pageQuery); + + List> punishmentOptions(); + + Boolean insertPunishment(XskhDisciplineRecordBo bo); + + XskhPunishmentSummaryVo summarizePunishment(XskhDisciplineRecordBo bo); + + List listPunishmentExport(XskhDisciplineRecordBo bo); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java index d82b1194..21d1162b 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineRecordServiceImpl.java @@ -5,22 +5,31 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.xskh.domain.XskhDisciplineRecord; +import org.dromara.xskh.domain.XskhDisciplineType; import org.dromara.xskh.domain.bo.XskhDisciplineRecordBo; import org.dromara.xskh.domain.vo.XskhDisciplineRecordVo; +import org.dromara.xskh.domain.vo.XskhPunishmentExportVo; +import org.dromara.xskh.domain.vo.XskhPunishmentSummaryVo; import org.dromara.xskh.domain.vo.XskhStudentOptionVo; import org.dromara.xskh.mapper.XskhDisciplineRecordMapper; +import org.dromara.xskh.mapper.XskhDisciplineTypeMapper; import org.dromara.xskh.service.IXskhDisciplineRecordService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import lombok.extern.slf4j.Slf4j; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Arrays; @@ -37,7 +46,18 @@ import java.util.stream.Collectors; @Service public class XskhDisciplineRecordServiceImpl implements IXskhDisciplineRecordService { + private static final String PUNISHMENT_SOURCE = "3"; + + private static final List PUNISHMENT_LEVELS = List.of( + new PunishmentLevel("cf_warning", "警告", new BigDecimal("4")), + new PunishmentLevel("cf_serious_warning", "严重警告", new BigDecimal("5")), + new PunishmentLevel("cf_demerit", "记过", new BigDecimal("8")), + new PunishmentLevel("cf_probation", "留校察看", new BigDecimal("10")), + new PunishmentLevel("cf_expulsion", "开除学籍", BigDecimal.ZERO) + ); + private final XskhDisciplineRecordMapper baseMapper; + private final XskhDisciplineTypeMapper disciplineTypeMapper; /** * 查询学生违纪处分记录 @@ -81,8 +101,13 @@ public class XskhDisciplineRecordServiceImpl implements IXskhDisciplineRecordSer lqw.eq(bo.getClassId() != null, XskhDisciplineRecord::getClassId, bo.getClassId()); lqw.like(StringUtils.isNotBlank(bo.getClassName()), XskhDisciplineRecord::getClassName, bo.getClassName()); lqw.eq(bo.getDisciplineTypeId() != null, XskhDisciplineRecord::getDisciplineTypeId, bo.getDisciplineTypeId()); - lqw.like(StringUtils.isNotBlank(bo.getDisciplineTypeName()), XskhDisciplineRecord::getDisciplineTypeName, + if (PUNISHMENT_SOURCE.equals(bo.getViolationSource())) { + lqw.eq(StringUtils.isNotBlank(bo.getDisciplineTypeName()), XskhDisciplineRecord::getDisciplineTypeName, bo.getDisciplineTypeName()); + } else { + lqw.like(StringUtils.isNotBlank(bo.getDisciplineTypeName()), XskhDisciplineRecord::getDisciplineTypeName, + bo.getDisciplineTypeName()); + } lqw.eq(bo.getDisciplineDate() != null, XskhDisciplineRecord::getDisciplineDate, bo.getDisciplineDate()); lqw.like(StringUtils.isNotBlank(bo.getDisciplineReason()), XskhDisciplineRecord::getDisciplineReason, bo.getDisciplineReason()); @@ -90,6 +115,9 @@ public class XskhDisciplineRecordServiceImpl implements IXskhDisciplineRecordSer bo.getDisciplineContent()); lqw.eq(bo.getScoreDeduction() != null, XskhDisciplineRecord::getScoreDeduction, bo.getScoreDeduction()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XskhDisciplineRecord::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getViolationSource()), XskhDisciplineRecord::getViolationSource, bo.getViolationSource()); + lqw.ge(bo.getBeginDisciplineDate() != null, XskhDisciplineRecord::getDisciplineDate, bo.getBeginDisciplineDate()); + lqw.le(bo.getEndDisciplineDate() != null, XskhDisciplineRecord::getDisciplineDate, bo.getEndDisciplineDate()); lqw.orderByDesc(XskhDisciplineRecord::getCreateTime); return lqw; } @@ -339,4 +367,156 @@ public class XskhDisciplineRecordServiceImpl implements IXskhDisciplineRecordSer log.info("查询到 {} 条记录", result.getTotal()); return TableDataInfo.build(result); } + + @Override + public List> punishmentOptions() { + List> options = new ArrayList<>(); + for (PunishmentLevel level : PUNISHMENT_LEVELS) { + Map item = new LinkedHashMap<>(); + item.put("code", level.code); + item.put("name", level.name); + item.put("score", level.score); + item.put("countInClass", level.score.compareTo(BigDecimal.ZERO) > 0); + options.add(item); + } + return options; + } + + @Override + public Boolean insertPunishment(XskhDisciplineRecordBo bo) { + if (bo == null || bo.getStudentId() == null) { + throw new ServiceException("请选择学生"); + } + if (StringUtils.isBlank(bo.getDisciplineReason())) { + throw new ServiceException("请填写处分原因"); + } + PunishmentLevel level = findPunishmentLevel(bo.getPunishmentCode()); + XskhStudentOptionVo student = baseMapper.selectStudentById(bo.getStudentId()); + if (student == null) { + throw new ServiceException("未找到学生信息"); + } + if (student.getClassId() == null) { + throw new ServiceException("该学生未分配班级,无法把处分计入班级"); + } + XskhDisciplineType type = ensurePunishmentType(level); + XskhDisciplineRecord record = new XskhDisciplineRecord(); + record.setStudentId(student.getId()); + record.setStudentNo(student.getStudentNo()); + record.setStudentName(student.getName()); + record.setCollegeId(student.getCollegeId()); + record.setCollegeName(student.getCollegeName()); + record.setMajorId(student.getMajorId()); + record.setMajorName(student.getMajorName()); + record.setClassId(student.getClassId()); + record.setClassName(student.getClassName()); + record.setDisciplineTypeId(type.getId()); + record.setDisciplineTypeName(level.name); + record.setDisciplineDate(bo.getDisciplineDate() == null ? LocalDate.now() : bo.getDisciplineDate()); + record.setDisciplineReason(bo.getDisciplineReason().trim()); + record.setDisciplineContent(bo.getDisciplineContent()); + record.setScoreDeduction(level.score); + record.setStatus("1"); + record.setViolationSource(PUNISHMENT_SOURCE); + return baseMapper.insert(record) > 0; + } + + @Override + public XskhPunishmentSummaryVo summarizePunishment(XskhDisciplineRecordBo bo) { + List records = listPunishmentRecords(bo); + Map typeMap = new LinkedHashMap<>(); + for (PunishmentLevel level : PUNISHMENT_LEVELS) { + typeMap.put(level.name, summaryRow("处分种类", level.name)); + } + Map classMap = new LinkedHashMap<>(); + for (XskhDisciplineRecordVo record : records) { + String typeName = StringUtils.blankToDefault(record.getDisciplineTypeName(), "未分类"); + XskhPunishmentSummaryVo.Row typeRow = typeMap.computeIfAbsent(typeName, name -> summaryRow("处分种类", name)); + addSummary(typeRow, record.getScoreDeduction()); + String classKey = StringUtils.blankToDefault(record.getCollegeName(), "") + "/" + + StringUtils.blankToDefault(record.getClassName(), "未分班"); + XskhPunishmentSummaryVo.Row classRow = classMap.computeIfAbsent(classKey, + key -> summaryRow("班级", classKey)); + addSummary(classRow, record.getScoreDeduction()); + } + XskhPunishmentSummaryVo summary = new XskhPunishmentSummaryVo(); + summary.setByType(new ArrayList<>(typeMap.values())); + summary.setByClass(new ArrayList<>(classMap.values())); + return summary; + } + + @Override + public List listPunishmentExport(XskhDisciplineRecordBo bo) { + return listPunishmentRecords(bo).stream().map(record -> { + XskhPunishmentExportVo row = new XskhPunishmentExportVo(); + row.setStudentNo(record.getStudentNo()); + row.setStudentName(record.getStudentName()); + row.setCollegeName(record.getCollegeName()); + row.setClassName(record.getClassName()); + row.setDisciplineTypeName(record.getDisciplineTypeName()); + row.setScoreDeduction(record.getScoreDeduction()); + row.setDisciplineDate(record.getDisciplineDate()); + row.setDisciplineReason(record.getDisciplineReason()); + row.setDisciplineContent(record.getDisciplineContent()); + return row; + }).collect(Collectors.toList()); + } + + private List listPunishmentRecords(XskhDisciplineRecordBo bo) { + if (bo == null) { + bo = new XskhDisciplineRecordBo(); + } + bo.setViolationSource(PUNISHMENT_SOURCE); + return queryList(bo); + } + + private PunishmentLevel findPunishmentLevel(String code) { + if (StringUtils.isBlank(code)) { + throw new ServiceException("请选择处分种类"); + } + return PUNISHMENT_LEVELS.stream() + .filter(level -> level.code.equals(code)) + .findFirst() + .orElseThrow(() -> new ServiceException("处分种类不正确")); + } + + private XskhDisciplineType ensurePunishmentType(PunishmentLevel level) { + XskhDisciplineType existing = disciplineTypeMapper.selectOne(Wrappers.lambdaQuery() + .eq(XskhDisciplineType::getTypeCode, level.code) + .last("limit 1")); + if (existing != null) { + return existing; + } + XskhDisciplineType type = new XskhDisciplineType(); + type.setTypeCode(level.code); + type.setTypeName(level.name); + type.setTypeCategory("2"); + type.setAreaType("0"); + type.setMinScore(level.score); + type.setMaxScore(level.score); + type.setStatus("0"); + type.setIsEqualized("0"); + type.setSortOrder((long) (PUNISHMENT_LEVELS.indexOf(level) + 1)); + type.setRemark(level.score.compareTo(BigDecimal.ZERO) > 0 + ? "学生处分,计入班级月扣分" + : "开除学籍不计班级扣分"); + disciplineTypeMapper.insert(type); + return type; + } + + private XskhPunishmentSummaryVo.Row summaryRow(String dimension, String name) { + XskhPunishmentSummaryVo.Row row = new XskhPunishmentSummaryVo.Row(); + row.setDimension(dimension); + row.setName(name); + row.setCount(0); + row.setScore(BigDecimal.ZERO); + return row; + } + + private void addSummary(XskhPunishmentSummaryVo.Row row, BigDecimal score) { + row.setCount(row.getCount() + 1); + row.setScore(row.getScore().add(score == null ? BigDecimal.ZERO : score)); + } + + private record PunishmentLevel(String code, String name, BigDecimal score) { + } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml index b93f11bd..e40aad19 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/XskhDisciplineRecordMapper.xml @@ -49,6 +49,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, student_id, student_no, student_name, college_id, college_name, major_id, major_name, class_id, class_name, discipline_type_id, discipline_type_name, discipline_date, discipline_reason, discipline_content, score_deduction, status, violation_source, attachment_oss_ids, create_by, create_time, create_dept, update_by, update_time, deleted, tenant_id from xskh_discipline_record + +